Changeset 921 for trunk

trunk/Configure

-              r884
+              r921
+#
 # $Id: Configure,v 1.107 2008/11/14 15:14:46 bmorgan Exp $
+#
 # Generated on Fri Nov 14 15:14:32 GMT 2008 [metaconfig 3.0 PL70]
+# $Id: Configure,v 1.110 2008/12/03 15:34:57 bmorgan Exp $
+#
+# Generated on Wed Dec  3 15:33:49 GMT 2008 [metaconfig 3.0 PL70]
 cat >/tmp/c1$$ <<EOF
 …
 awk
 cat
+echo
 expr
 grep
 …
             \`ls -dr /System/Library/Frameworks/QtCore.framework/Headers 2>/dev/null\`
             /usr/include/QtCore
+            \`ls -dr /usr/include/qt*/QtCore 2>/dev/null\`
+            \`ls -dr /usr/include/qt*/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/include/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt*/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/qt*/include/QtCore 2>/dev/null\`
             \`ls -dr /opt/qt*/include/QtCore 2>/dev/null\`
             \`ls -dr /usr/qt*/include/QtCore 2>/dev/null\`
 …
             /usr/include
             \`ls -dr /usr/include/qt* 2>/dev/null\`
+            \`ls -dr /usr/local/include 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt* 2>/dev/null\`
+            \`ls -dr /usr/local/qt*/include 2>/dev/null\`
             \`ls -dr /opt/qt*/include 2>/dev/null\`
             \`ls -dr /usr/qt*/include 2>/dev/null\`
 …
             \`ls -dr /sw/qt/*/include 2>/dev/null\`
             /usr/include/Qt
+            \`ls -dr /usr/include/qt*/Qt 2>/dev/null\`
+            \`ls -dr /usr/include/qt*/Qt 2>/dev/null\`
+            \`ls -dr /usr/local/include/Qt 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt*/Qt 2>/dev/null\`
             \`ls -dr /opt/qt*/include/Qt 2>/dev/null\`
             \`ls -dr /usr/qt*/include/Qt 2>/dev/null\`
 …
 fi #END TEST "x\$g4_qt_is_configured" = "x"
-echo ""
-echo "DEBUG#####"
-echo "g4_qt_cxxflags    = \$g4_qt_cxxflags"
-echo "g4_qt_gl_cxxflags = \$g4_qt_gl_cxxflags"
-echo "g4_qt_libs        = \$g4_qt_libs"
-echo "g4_qt_gl_libs     = \$g4_qt_gl_libs"
-echo "g4_qt_moc         = \$g4_qt_moc"
-echo "..."
-echo "g4_havegoodqt       = \$g4_havegoodqt"
-echo "g4_qt_is_configured = \$g4_qt_is_configured"
-echo "##########"
 EOSC
 : decide how portable to be
 …
 done
+g4data_photonevaporation_version='PhotonEvaporation2.0'
+g4data_radioactivedecay_version='RadioactiveDecay3.2'
+g4data_g4emlow_version='G4EMLOW6.2'
+g4data_g4ndl_version='G4NDL3.13'
+g4data_g4abla_version='G4ABLA3.0'
+#END GEANT4 DATA OPTIONS
 echo " "
+#
+# Set defaults for data paths - here, because we depend on g4install
+#
 case "$g4data" in
 '')
 …
 case "$g4levelgammadata" in
 '')
         g4levelgammadata=$g4data/PhotonEvaporation2.0
+        g4levelgammadata=$g4data/$g4data_photonevaporation_version
         ;;
 esac
 …
 case "$g4radioactivedata" in
 '')
         g4radioactivedata=$g4data/RadioactiveDecay3.2
+        g4radioactivedata=$g4data/$g4data_radioactivedecay_version
         ;;
 esac
 …
 case "$g4ledata" in
 '')
         g4ledata=$g4data/G4EMLOW6.1
+        g4ledata=$g4data/$g4data_g4emlow_version
         ;;
 esac
 …
 case "$g4neutronhpcrosssections" in
 '')
         g4neutronhpcrosssections=$g4data/G4NDL3.12
+        g4neutronhpcrosssections=$g4data/$g4data_g4ndl_version
         ;;
 esac
 …
 case "$g4abladata" in
 '')
+        g4abladata=$g4data/G4ABLA3.0
+        ;;
+esac
+#case "$g4elasticdata" in
+#'')
+#       g4elasticdata=$g4data/G4ELASTIC1.1
+#       ;;
+#esac
+#########################################################################
+# while test 1 = 1  ; do
+g4message=`cat << EOM
+Please, specify default directory where ALL the Geant4 data is installed:
+ G4LEVELGAMMADATA:              $g4levelgammadata
+ G4RADIOACTIVEDATA:             $g4radioactivedata
+ G4LEDATA:                      $g4ledata
+ G4NEUTRONHPDATA:               $g4neutronhpcrosssections
+ G4ABLADATA:                    $g4abladata
+You will be asked about customizing these next.
+EOM`
+#dflt="NO DEFAULT ANSWER"
+        g4abladata=$g4data/$g4data_g4abla_version
+        ;;
+esac
+#
+# Now we have defaults, prompt user to see if this is where they want to use
+#
+g4data_alllibs="$g4data_photonevaporation_version $g4data_radioactivedecay_version $g4data_g4emlow_version $g4data_g4ndl_version $g4data_g4abla_version"
+g4message=`cat <<EOM
+Specify the path where are the Geant4 data libraries
+$g4data_alllibs
+are installed. For now, a flat directory structure is assumed, and this can
+be customized at the next step if needed.
+EOM`
 dflt=$g4data
-#fn='d~'
-rp=$g4message
-#. ./myread
-gans=$ans
-                dflt=$g4data
-                fn='d~'
-                . ./getfile
-                if [ X$g4data != X$ans ] ; then
-                g4data=$ans
-                g4levelgammadata=$g4data/PhotonEvaporation2.0
-                g4radioactivedata=$g4data/RadioactiveDecay3.2
-                g4ledata=$g4data/G4EMLOW6.1
-                g4neutronhpcrosssections=$g4data/G4NDL3.12
-                g4abladata=$g4data/G4ABLA3.0
-#               g4elasticdata=$g4data/G4ELASTIC1.1
-                fi
-# done
-###################################################################
-while test 1 = 1  ; do
-g4message=`cat << EOM
-Please, specify default directory where the Geant4 data is installed:
-) G4LEVELGAMMADATA:            $g4levelgammadata
-) G4RADIOACTIVEDATA:           $g4radioactivedata
-) G4LEDATA:                    $g4ledata
-) G4NEUTRONHPDATA:             $g4neutronhpcrosssections
-) G4ABLADATA:                  $g4abladata
-To modify default settings, select number above (e.g. 2)
-EOM`
-#dflt="NO DEFAULT ANSWER"
-dflt="Press [Enter] for default settings"
-#fn='d~'
 rp=$g4message
 . ./myread
+gans=$ans
+g4data=$ans
+#
+# Using this, we can now check that the libs exist, but only on a directory
+# level
+#
+g4data_foundall='yes'
+promptend="no"
+g4data_customize="no"
+while test "x$promptend" = "xno" ; do
+        ### PhotonEvaporation
+        $echo $n "checking for $g4data_photonevaporation_version... $c"
+        if test -d "$g4data/$g4data_photonevaporation_version" ; then
+                $echo "yes"
+                g4levelgammadata=$g4data/$g4data_photonevaporation_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+        ### RadioactiveDecay
+        $echo $n "checking for $g4data_radioactivedecay_version... $c"
+        if test -d "$g4data/$g4data_radioactivedecay_version" ; then
+                $echo "yes"
+                g4radioactivedata=$g4data/$g4data_radioactivedecay_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+        ### G4EMLOW
+        $echo $n "checking for $g4data_g4emlow_version... $c"
+        if test -d "$g4data/$g4data_g4emlow_version" ; then
+                $echo "yes"
+                g4ledata=$g4data/$g4data_emlow_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+        ### G4NDL
+        $echo $n "checking for $g4data_g4ndl_version... $c"
+        if test -d "$g4data/$g4data_g4ndl_version" ; then
+                $echo "yes"
+                g4neutronhpcrosssections=$g4data/$g4data_g4ndl_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+        ### G4ABLA
+        $echo $n "checking for $g4data_g4abla_version... $c"
+        if test -d "$g4data/$g4data_g4abla_version" ; then
+                $echo "yes"
+                g4levelgammadata=$g4data/$g4data_g4abla_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+        #
+        # If we haven't found all the data, query the user as to whether they
+        # want to
+        # 1) try again with a different path
+        # 2) use the path they input
+        # 3) customize paths
+        #
+        if test "x$g4data_foundall" = "xyes" ; then
+                promptend=yes
+        else
+                g4message=`cat << EOM
+Failed to locate one or more of the Geant4 data libraries in
+$g4data
+Please enter
+) Another path to search in
+) 'f' to force the use of the path you entered previously (the data libraries
+   are not needed to build Geant4, but are needed to run applications later).
+) 'c' to customize the data paths, e.g. if you have the data libraries
+   installed in different locations.
+EOM`
+                dflt="f"
+                rp=$g4message
+                . ./myread
+                gans=$ans
+                if test "x$gans" = "xf" ; then
+                        # Force paths
+                        promptend="yes"
+                        g4levelgammadata="$g4data/$g4data_photonevaporation_version"
+                        g4radioactivedata="$g4data/$g4data_radioactivedecay_version"
+                        g4ledata="$g4data/$g4data_g4emlow_version"
+                        g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version"
+                        g4abladata="$g4data/$g4data_g4abla_version"
+                elif test "x$gans" = "xc" ; then
+                        # enable customization - we use input g4data to set
+                        # defaults
+                        promptend="yes"
+                        g4data_customize="yes"
+                        g4levelgammadata="$g4data/$g4data_photonevaporation_version"
+                        g4radioactivedata="$g4data/$g4data_radioactivedecay_version"
+                        g4ledata="$g4data/$g4data_g4emlow_version"
+                        g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version"
+                        g4abladata="$g4data/$g4data_g4abla_version"
+                else
+                        #try again
+                        g4data=$gans
+                fi
+        fi
+done
+#
+# Now customize paths if required
+#
+if test "x$g4data_customize" = "xyes" ; then
+while test "x" = "x" ; do
+        g4message=`cat <<EOM
+You have chosen to customize the Geant4 data library paths.
+) $g4data_photonevaporation_version:
+        $g4levelgammadata
+) $g4data_radioactivedecay_version:
+        $g4radioactivedata
+) $g4data_g4emlow_version:
+        $g4ledata
+) $g4data_g4ndl_version:
+        $g4neutronhpcrosssections
+) $g4data_g4abla_version:
+        $g4abladata
+Choose a number from the list above to customize that path (e.g. 2)
+EOM`
+        dflt="Press [Enter] to exit customization with paths as above"
+        rp=$g4message
+        . ./myread
+        gans=$ans
         case $gans in
 )
+        "1")
                 dflt=$g4levelgammadata
                 fn='d~'
                 rp="Where is Geant4 PhotonEvaporation2.0 data installed?"
+                rp="Custom path to $g4data_photonevaporation_version?"
                 . ./getfile
                 g4levelgammadata=$ans
                 ;;
+)
+        "2")
                 dflt=$g4radioactivedata
                 fn='d~'
                 rp="Where is Geant4 RadioactiveDecay3.2 data installed?"
+                rp="Custom path to $g4data_radioactivedecay_version?"
                 . ./getfile
                 g4radioactivedata=$ans
                 ;;
+)
+        "3")
                 dflt=$g4ledata
                 fn='d~'
                 rp="Where is G4EMLOW6.1 data installed ?"
+                rp="Custom path to $g4data_g4emlow_version?"
                 . ./getfile
                 g4ledata=$ans
                 ;;
+)
+        "4")
                 dflt=$g4neutronhpcrosssections
                 fn='d~'
                 rp="Where is G4NDL3.12 data installed?"
+                rp="Custom path to $g4data_g4ndl_version?"
                 . ./getfile
                 g4neutronhpcrosssections=$ans
                 ;;
 )
+        "5")
                 dflt=$g4abladata
                 fn='d~'
                 rp="Where is G4ABLA3.0 data installed?"
+                rp="Custom path to $g4data_g4abla_version?"
                 . ./getfile
                 g4abladata=$ans
                 ;;
+#       5)
+#               dflt=$g4elasticdata
+#               fn='d~'
+#               rp="Where is G4ELASTIC1.1 data installed?"
+#               . ./getfile
+#               g4elasticdata=$ans
+#               ;;
+#       [eE])
+#               break
+#               ;;
+        *)
+        *)
                 break
+#               echo " "
+                ;;
+                ;;
         esac
 done
+fi
 …
 if test "X$g4osname" = "XLinux" ; then
+g4ui_xawflags=" -I$g4ui_xawhome/include "
+        if test "X$g4ui_xawhome" = "X/usr/X11R6" ; then
+        if test "X$g4ui_xawhome" = "X" ; then
+                g4ui_xawflags=""
+        else
+                g4ui_xawflags=" -I$g4ui_xawhome/include "
+        fi
+        if test "X$g4ui_xawhome" = "X/usr/X11R6" -o "X$g4ui_xawhome" = "X" ; then
                 g4ui_xawlibs=" -lXaw "
         else
+                g4ui_xawlibs=" -L$g4ui_xawhome/lib -lXaw "
+                if test -d "$g4ui_xawhome/lib64" ; then
+                        g4ui_xawlibs=" -L$g4ui_xawhome/lib64 -lXaw "
+                else
+                        g4ui_xawlibs=" -L$g4ui_xawhome/lib -lXaw "
+                fi
         fi
 fi
 …
 if test "X$g4osname" = "XLinux"; then
+if test "X$g4vis_xmhome" = "X/usr" -o "X$g4vis_xmhome" = "X/usr/local" ; then
+g4vis_xmhome=""
+fi
+        if test "X$g4vis_xmhome" = "X/usr" -o "X$g4vis_xmhome" = "X/usr/local" ; then
+                g4vis_xmhome=""
+        fi
 fi
 fi # g4vis_build_opheglxm_driver
 …
 if test "X$g4osname" = "XLinux" ; then
+g4vis_xmflags=" -I$g4vis_xmhome/include "
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
+        if test "X$g4vis_xmhome" = "X" ; then
+                g4vis_xmflags=""
+        else
+                g4vis_xmflags=" -I$g4vis_xmhome/include "
+        fi
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" -o "X$g4vis_xmhome" = "X" ; then
                 g4vis_xmlibs=" -lXm -lXpm "
         else
+                g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                if test -d "$g4vis_xmhome/lib64" ; then
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib64 -lXm -lXpm "
+                else
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                fi
         fi
 fi
 …
 if test "X$g4osname" = "XLinux" ; then
+g4vis_xmflags=" -I$g4vis_xmhome/include "
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
+        if test "X$g4vis_xmhome" = "X" ; then
+                g4vis_xmflags=""
+        else
+                g4vis_xmflags=" -I$g4vis_xmhome/include "
+        fi
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" -o "X$g4vis_xmhome" = "X" ; then
                 g4vis_xmlibs=" -lXm -lXpm "
         else
+                g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                if test -d "$g4vis_xmhome/lib64" ; then
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib64 -lXm -lXpm "
+                else
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                fi
         fi
 fi

trunk/Doxyfile

-              r885
+              r921
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
+EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 …
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = /Users/garnier/Work/Geant4-QtDriver/trunk/source/visualization
+INPUT                  = /Users/garnier/Work/Geant4-QtDriver/trunk/source/interfaces
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \

trunk/config/G4VIS_USE.gmk

-              r790
+              r921
   INC_GL    = 1
   LOAD_GL   = 1
+  LOAD_GL2PS= 1
 endif
 …
   INC_IV    = 1
   LOAD_IV   = 1
+  LOAD_GL2PS= 1
 endif

trunk/config/History

-              r893
+              r921
 $Id: History,v 1.336 2008/11/26 16:48:14 gcosmo Exp $
+$Id: History,v 1.340 2008/12/04 14:59:44 lgarnier Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+th December 2008 : Laurent Garnier
+- Darwin.gmk: Fix a mistake in GLlibs for Leopard.
+th December 2008  Gabriele Cosmo, Ben Morgan (config-V09-01-14)
+- Linux-g++.gmk: implemented temporary workaround to allow for automatic
+  detection of location in non-POSIX paths for X11 and GL libraries depending
+  on 32/64 bits architectures.
+rd December 2008  Gabriele Cosmo (config-V09-01-13)
+- Define $FIND, $SORT, $TOUCH variables to be customised with absolute
+  path in WIN32-VC in order to pick up correct Cygwin toolset.
+st December 2008  Ben Morgan (config-V09-01-12)
+- Darwin-g++.gmk, Linux-g++.gmk: corrected definition of temporary QT3_MT
+  by adding missing protection.
 th November 2008  Laurent Garnier (config-V09-01-11)

trunk/config/binmake.gmk

-              r886
+              r921
 # Verify the existance of granular shared libraries (Unix) or global DLLs (Windows)
+#
-ifndef SHAREDLIBS
-  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
-endif
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
   SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
 …
 # (why?) the user is not supposed to be able to define...
+#
 LDLIBS4 += $(LOADLIBS)
+LDLIBS5 += $(LOADLIBS)
 # Finally assemble libraries...
 …
 else
 # Again, do not use := or +=.  See note on LDLIBS2 above.
   LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
 # Version leaving out EXTRALIBS
   LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
 endif
 LDLIBS_PREFINAL += $(LDLIBS4)
 LDLIBS_KERNEL   += $(LDLIBS4)
+  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
+endif
+LDLIBS_PREFINAL += $(LDLIBS5)
+LDLIBS_KERNEL   += $(LDLIBS5)
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
 …
 ifdef CPPVERBOSE
         $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
           $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)  \
           $(LDLIBS)
 else
         @echo Linking $(G4TARGET) ...
         @$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
           $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)\
           $(LDLIBS)
         @if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \

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

-              r893
+              r921
     ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
       # the following lines are for building on MacOSX 10.5 "Leopard"
       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+      OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     else
       OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
 …
     ifeq ($(QT_VERSION),3)
       QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
       QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l )
+      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
       ifneq ($(QT3_MT),0)
         QTLIBS  += -lqt-mt
 …
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
+    libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
      $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module  -lgcov -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) *.o
   endef
 …
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMP)/$(G4SYSTEM); \
      $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module  -lgcov -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
   endef

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

-              r893
+              r921
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
+  ECHO    := /bin/echo -e
+  SHEXT   := so
+  ECHO   := /bin/echo -e
+  SHEXT  := so
+  ARCH   := $(shell uname -m | cut -s -d "_" -f 2)
   ifndef X11FLAGS
     X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   endif
   ifndef X11LIBS
     X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+    X11LIBS   := -L/usr/X11R6/lib$(ARCH)  -lXmu -lXt -lXext -lX11 -lSM -lICE
   endif
   ifndef XMFLAGS
 …
   ifndef XMLIBS
     XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
   endif
 …
     QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
     ifeq ($(QT_VERSION),3)
       QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l )
+      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
       ifneq ($(QT3_MT),0)
         QTLIBS  += -lqt-mt
 …
 #----------------------------------------------------------------------------
-  ifndef XAWFLAGS
-    XAWFLAGS   := -I/usr/X11R6/include
-  endif
-  ifndef XAWLIBS
-    XAWLIBS    := -lXaw
-  endif
-  DLDLIBS   := -ldl
-  ifndef OGLFLAGS
-    OGLFLAGS  := -I$(OGLHOME)/include
-  endif
-  ifndef OGLLIBS
-    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \

trunk/config/sys/WIN32-VC.gmk

-              r893
+              r921
   CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
   CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
   LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
+  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll /VERBOSE:lib
   SHEXT := dll
   AR := LIB
   ECHO := /usr/bin/echo -e
+  FIND := /usr/bin/find
+  SORT := /usr/bin/sort
   GREP := /usr/bin/grep
   SED  := /usr/bin/sed
   CAT  := /usr/bin/cat
   CUT  := /usr/bin/cut
+  TOUCH := /usr/bin/touch
   FC := g77
 …
   ifndef GLQTLIBS
     ifeq ($(QT_VERSION),QT3)
       QTLIBS   := -L$(QTHOME)/lib -lqt-mt
+      GLQTLIBS   := -L$(QTHOME)/lib -lqt-mt
     else
       QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
+      GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
     endif
   endif

trunk/documents/UserDoc/DocBookUsersGuides/ChangesHistory/ChangesHistory.html

-              r904
+              r921
 <br /><br /><br /><br />
+<!-- ============================================== Section -->
+<HR ALIGN="Center">
+<font COLOR="#238E23">
+<h2>Version: Geant4 9.2 (December 2008) </h2>
+</font>
+<HR ALIGN="Center">
+<br />
+<p>
+<b><u>User's Guide: For Application Developers</u></b>
+</p>
+<ul>
+<b>- Newly Added Chapters/Sections</b>
+  <ul>
+    <li>4.1.14. Importing ASCII Text Models
+    <li>Appendix Python Interface
+  </ul>
+<br />
+<b>- Modified Chapters/Sections</b>
+  <ul>
+    <li>2.1. How to Define the main() Program
+    <li>2.4. How to Specify Particles
+    <li>2.10. How to Visualize the Detector and Events
+    <li>2.8. How to Set Up an Interactive Session
+    <li>3.1. Class Categories and Domains
+    <li>4.1.2. Solids
+    <li>4.1.3. Logical Volumes
+    <li>4.1.6. Creating an Assembly of Volumes
+    <li>4.1.8. The Geometry Navigator
+    <li>4.1.9. A Simple Geometry Editor
+    <li>4.1.10. Converting Geometries from Geant3.21
+    <li>4.1.13. Importing XML Models Using GDML
+    <li>4.7. Parallel Geometries
+    <li>4.6. Object Persistency
+    <li>5.2. Physics Processes
+    <li>5.3.2 Definition of a particle
+    <li>5.6. Physics Table
+    <li>8.1. Introduction to Visualization
+    <li>8.2. Adding Visualization to Your Executable
+    <li>8.4. Controlling Visualization from Commands
+    <li>8.10. Making a Movie
+    <li>9.3. Advanced Examples
+    <li>Appendix CLHEP Foundation Library
+    <li>Appendix Development and debug tools
+    <li>Appendix Makefiles and Environment Variables
+    <li>Appendix Tips for Program Compilation
+  </ul>
+</ul>
+<p>
+<b><u>User's Guide: For Toolkit Developers</u></b>
+</p>
+<ul>
+<b>- Newly Added Chapters/Sections</b>
+  <ul>
+    <li>3.3. Particles
+  </ul>
+</ul>
+<p>
+<b><u>Installation Guide</u></b>
+</p>
+<ul>
+<b>- Modified Chapters/Sections</b>
+  <ul>
+    <li>1. Installation Introduction
+    <li>2. Installation Procedures
+  </ul>
+</ul>
+<p>
+<b><u>Physics Reference Manual</u></b>
+</p>
+<ul>
+<b>- Modified Chapters/Sections</b>
+  <ul>
+    <li>5.1 The Interaction Length or Mean Free Path
+    <li>6.1 Introduction
+    <li>7.2 Energy loss fluctuations
+    <li>7.4 Conversion from range cut to kinetic energy cut
+    <li>7.5 Multiple Scattering
+    <li>8.1 Ionization
+  </ul>
+</ul>
 <!-- ============================================== Section -->

trunk/documents/UserDoc/DocBookUsersGuides/FAQ/xml/BookFAQ.xml

-              r904
+              r921
   </authorgroup>
   <pubdate>14 December, 2007</pubdate>
   <releaseinfo>Version: geant4 9.1</releaseinfo>
+  <pubdate>19 December, 2008</pubdate>
+  <releaseinfo>Version: geant4 9.2</releaseinfo>
 </bookinfo>

trunk/documents/UserDoc/DocBookUsersGuides/FAQ/xml/XSLCustomizationLayer/G4XSLCustomFO.xsl

r904	r921
10	10	<!-- Import the FO stylesheet -->
11	11	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
12		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/fo/docbook.xsl"~~/>
	12	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl" />
13	13
14	14	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/FAQ/xml/XSLCustomizationLayer/G4XSLCustomHTML.xsl

r904	r921
9	9	<!-- Import the stylesheet to chunk the html output -->
10	10	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
11		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/~~html/chunk.xsl" />
	11	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl" />
12	12
13	13	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/output.html

-              r904
+              r921
 </a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.OpenGL">
 OpenGL
+</a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.Qt">
+Qt
 </a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.OpenInv">
 OpenInventor
 …
 </a></span></dt><dd><dl><dt><span class="sect2"><a href="#sect.MkMovie.OGLX">
 OGLX
+</a></span></dt><dt><span class="sect2"><a href="#sect.MkMovie.Qt">
+Qt
 </a></span></dt><dt><span class="sect2"><a href="#sect.MkMovie.DAWNFILE">
 DAWNFILE
 …
 </a></dt><dt>9.3. <a href="#table.ExmpNvc_3">
 The ``item chart'' for novice level example N07.
 </a></dt><dt>9.4. <a href="#id626437">
+</a></dt><dt>9.4. <a href="#id627358">
   TestEm by theme
 </a></dt></dl></div><div class="list-of-examples"><p><b>List of Examples</b></p><dl><dt>2.1. <a href="#programlist_HowToDefMain_1">
 …
 </a></dt><dt>4.16. <a href="#programlist_Hits_3">
 An example of accessing to G4THitsMap objects.
 </a></dt><dt>4.17. <a href="#id509332">
+</a></dt><dt>4.17. <a href="#id509333">
 An example header file of a concrete user parallel world class.
 </a></dt><dt>4.18. <a href="#id509408">
 …
 Typical implementation in the main() to define a parallel
 world.
 </a></dt><dt>4.20. <a href="#id509581">
+</a></dt><dt>4.20. <a href="#id509582">
 Define G4ParallelWorldScoringProcess.
 </a></dt><dt>4.21. <a href="#id510221">
+</a></dt><dt>4.21. <a href="#id510222">
 A user main() to use the command-based scoring
 </a></dt><dt>4.22. <a href="#id510346">
+</a></dt><dt>4.22. <a href="#id510347">
 UI commands to define a scoring mesh and scorers
 </a></dt><dt>5.1. <a href="#programlist_PhysProc_1">
 …
 supports a diverse family of graphics systems. Some of these
 graphics systems use a graphics library compiled with Geant4, such
 as OpenGL, while others involve a separate application, such as
+as OpenGL, Qt or OpenInventor, while others involve a separate application, such as
 WIRED or DAWN.
 </p><p>
 …
 without an argument, and then execute the commands below in the
 "Idle&gt;" state. Explanation of each command will be described
 later. (Note that the OpenGL-Xlib driver and the DAWNFILE driver
+later. (Note that the OpenGL-Xlib driver, Qt driver and the DAWNFILE driver
 are incorporated into the executable, and that Fukui Renderer DAWN
 is installed in your machine. )
 …
                   graphics functionality had been implemented already by the
                   alpha-release. The OO design of the visualization component allowed
                   us to develop several drivers independently, such as for OpenGL and
+                  us to develop several drivers independently, such as for OpenGL, Qt and
                   OpenInventor (for X11 and Windows), DAWN, Postscript (via DAWN) and
                   VRML.
 …
 time. Weight roulette is applied in order to solve this
 problem.
 </p><h4><a name="id447108"></a>
+</p><h4><a name="id447109"></a>
 The weight roulette concept
 </h4><p>
 …
 and their sections, Cones and their sections, Spheres, Wedges, and
 Toruses.
 </p><h4><a name="id456924"></a>
+</p><h4><a name="id456925"></a>
 Box:
 </h4><p>
 …
    G4Box* aBox = new G4Box("BoxA", 1.0*cm, 3.0*cm, 5.0*cm);
 </pre></div><p>
 </p><h4><a name="id457159"></a>
+</p><h4><a name="id457160"></a>
 Cylindrical Section or Tube:
 </h4><p>
 …
     the angle of the segment in radians
   </td><td class="auto-generated"> </td><td class="auto-generated"> </td></tr></tbody></table></div><p>
 </p><h4><a name="id457632"></a>
+</p><h4><a name="id457633"></a>
 Parallelepiped:
 </h4><p>
 …
     -dz and +dz in z
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id457835"></a>
+</p><h4><a name="id457836"></a>
 Trapezoid:
 </h4><p>
 …
 two angles have to be the
 same due to the planarity condition.
 </p><h4><a name="id458502"></a>
+</p><h4><a name="id458503"></a>
 Sphere or Spherical Shell Section:
 </h4><p>
 …
     Outer radius
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id458877"></a>
+</p><h4><a name="id458878"></a>
 Torus:
 </h4><p>
 …
 documentation contains a detailed EXPRESS description of each CSG
 solid.
 </p><h3><a name="id459080"></a>
+</p><h3><a name="id459081"></a>
 Specific CSG Solids
 </h3><h4><a name="id459089"></a>
 …
     z coordinate of corners
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id459319"></a>
+</p><h4><a name="id459320"></a>
 Polyhedra (PGON):
 </h4><p>
 …
     z coordinate of corners
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id459601"></a>
+</p><h4><a name="id459602"></a>
 Tube with an elliptical cross section:
 </h4><p>
 …
     Half length Z
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id459767"></a>
+</p><h4><a name="id459768"></a>
 General Ellipsoid:
 </h4><p>
 …
     upper cut plane level, z
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id459970"></a>
+</p><h4><a name="id459971"></a>
 Cone with Elliptical Cross Section:
 </h4><p>
 …
 <tt class="literal">u</tt> between <tt class="literal">0</tt> and
 <tt class="literal">h</tt> respectively.
 </p><h4><a name="id460207"></a>
+</p><h4><a name="id460208"></a>
 Paraboloid, a solid with parabolic profile:
 </h4><p>
 …
     Radius at +Dz greater than R1
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id460383"></a>
+</p><h4><a name="id460384"></a>
 Tube with Hyperbolic Profile:
 </h4><p>
 …
     Half length in Z
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id460629"></a>
+</p><h4><a name="id460630"></a>
 Tetrahedra:
 </h4><p>
 …
     Flag indicating degeneracy of points
   </td></tr><tr><td> </td><td> </td></tr></tbody></table></div><p>
 </p><h4><a name="id460841"></a>
+</p><h4><a name="id460842"></a>
 Extruded Polygon:
 </h4><p>
 …
     Scale of the side in -hz and +hz respectively
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id461068"></a>
+</p><h4><a name="id461069"></a>
 Box Twisted:
 </h4><p>
 …
     Half z length
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id461264"></a>
+</p><h4><a name="id461265"></a>
 Trapezoid Twisted along One Axis:
 </h4><p>
 …
     Angle with respect to the y axis from the centre of the side
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id461620"></a>
+</p><h4><a name="id461621"></a>
 Twisted Trapezoid with <tt class="literal">x</tt> and <tt class="literal">y</tt> dimensions
 varying along <tt class="literal">z</tt>:
 …
 </p><h4><a name="id462405"></a>
+</p><h4><a name="id462406"></a>
 Specific BREP Solids:
 </h4><p>
 …
     outside.
   </td></tr></tbody></table></div><p>
 </p><h4><a name="id463182"></a>
+</p><h4><a name="id463183"></a>
 Importing CAD models as tessellated shapes
 </h4><p>
 …
 cylindrical coordinate. The Repeated Volumes technique is available
 for volumes described by CSG solids.
 </p><h4><a name="id471309"></a>
+</p><h4><a name="id471310"></a>
 Replicas:
 </h4><p>
 …
 </p><h4><a name="id472458"></a>
+</p><h4><a name="id472459"></a>
 Advanced parameterisations for 'nested' parameterised volumes
 </h4><p>
 …
 alternative <tt class="literal">G4Navigator</tt> object (which can then be assigned
 to the world-volume), or access the information through the step.
 </p><h4><a name="id478744"></a>
+</p><h4><a name="id478745"></a>
 Using the 'step' to retrieve geometrical information
 </h4><p>
 …
                 GetTopTransform().TransformPoint(worldPosition);
 </pre></div><p>
 </p><h4><a name="id478789"></a>
+</p><h4><a name="id478790"></a>
 Using an alternative navigator to locate points
 </h4><p>
 …
 be inside one of the voxels and it will be only necessary to calculate
 the distance to the walls of the current voxel.
 </p><h4><a name="id479038"></a>
+</p><h4><a name="id479039"></a>
 Skipping borders of voxels with same material
 </h4><p>
 …
   G4RegularParameterisation::SetSkipEqualMaterials( G4bool skip );
 </pre></div><p>
 </p><h4><a name="id479066"></a>
+</p><h4><a name="id479067"></a>
 Example
 </h4><p>
 …
 or any combination of the above.
 </p><h4><a name="id503322"></a>
+</p><h4><a name="id503323"></a>
 G4VHit
 </h4><p>
 …
 Polylines, Markers and Text
 &#8221;</a>.
 </p><h4><a name="id503369"></a>
+</p><h4><a name="id503370"></a>
 G4THitsCollection
 </h4><p>
 …
 object, that is a container class of collections of hits. Hit collections are
 stored by their pointers, whose type is that of the base class.
 </p><h4><a name="id503430"></a>
+</p><h4><a name="id503431"></a>
 An example of a concrete hit class
 </h4><p>
 …
 base class for a customized trajectory class, since
 <span class="emphasis"><em>G4Trajectory</em></span> uses <span class="emphasis"><em>G4Allocator</em></span>.
 </p><h4><a name="id503527"></a>
+</p><h4><a name="id503528"></a>
 G4THitsMap
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.Hits.SensDet"></a>
 Sensitive detector
 </h3></div></div><div></div></div><h4><a name="id503618"></a>
+</h3></div></div><div></div></div><h4><a name="id503619"></a>
 G4VSensitiveDetector
 </h4><p>
 …
 sensitive detector object, it is perfectly possible to have several
 Readout geometries in parallel.
 </p><h4><a name="id503994"></a>
+</p><h4><a name="id503995"></a>
 Definition of a virtual geometry setup
 </h4><p>
 …
 <span class="emphasis"><em>G4SDManager</em></span> is the singleton manager class for sensitive
 detectors.
 </p><h4><a name="id504228"></a>
+</p><h4><a name="id504229"></a>
 Activation/inactivation of sensitive detectors
 </h4><p>
 …
 will inactivate all detectors belonging to the <tt class="literal">myCal</tt>
 category.
 </p><h4><a name="id504291"></a>
+</p><h4><a name="id504292"></a>
 Access to the hit collections
 </h4><p>Hit collections are accessed for various cases.
 …
       <span class="emphasis"><em>Weighted()</em></span> method of this class object is invoked.
     </p></dd></dl></div><p>
 </p><h4><a name="id504731"></a>
+</p><h4><a name="id504732"></a>
 <span class="bold"><b>Deposited energy scorers</b></span>
 </h4><p>
 …
       weight is multiplied at each step.
     </p></dd></dl></div><p>
 </p><h4><a name="id504792"></a>
+</p><h4><a name="id504793"></a>
 <span class="bold"><b>Current and flux scorers</b></span>
 </h4><p>
 …
       calculation.
     </p></dd></dl></div><p>
 </p><h4><a name="id504927"></a>
+</p><h4><a name="id504928"></a>
 <span class="bold"><b>Other scorers</b></span>
 </h4><p>
 …
     simulate pile up
   </p></li></ul></div><p>
 </p><h4><a name="id507873"></a>
+</p><h4><a name="id507874"></a>
 G4VDigi
 </h4><p>
 …
 class should be defined by yourself. <span class="emphasis"><em>G4VDigi</em></span> has two virtual
 methods, <tt class="literal">Draw()</tt> and <tt class="literal">Print()</tt>.
 </p><h4><a name="id507908"></a>
+</p><h4><a name="id507909"></a>
 G4TDigiCollection
 </h4><p>
 …
 collection(s) should be associated with the <span class="emphasis"><em>G4DCofThisEvent</em></span>
 object.
 </p><h4><a name="id508024"></a>
+</p><h4><a name="id508025"></a>
 G4DigiManager
 </h4><p>
 …
      MyDigitizer * myDM = fDM-&gt;Digitize( "/myDet/myCal/myEMdigiMod" );
 </pre></div><p>
 </p><h4><a name="id508099"></a>
+</p><h4><a name="id508100"></a>
 How to get hitsCollection and/or digiCollection
 </h4><p>
 …
 class <span class="emphasis"><em>G4VUserParallelWorld</em></span>.
 </p><div class="example"><a name="id509332"></a><p class="title"><b>Example 4.17.
+</p><div class="example"><a name="id509333"></a><p class="title"><b>Example 4.17.
 An example header file of a concrete user parallel world class.
 </b></p><pre class="programlisting">
 …
 respectively and registered to the particles.
 </p><div class="example"><a name="id509581"></a><p class="title"><b>Example 4.20.
+</p><div class="example"><a name="id509582"></a><p class="title"><b>Example 4.20.
 Define <tt class="literal">G4ParallelWorldScoringProcess</tt>.
 </b></p><pre class="programlisting">
 …
 the instantiation of <tt class="literal">G4RunManager</tt>.
 </p><div class="example"><a name="id510221"></a><p class="title"><b>Example 4.21.
+</p><div class="example"><a name="id510222"></a><p class="title"><b>Example 4.21.
 A user <tt class="literal">main()</tt> to use the command-based scoring
 </b></p><pre class="programlisting">
 …
 size of which is 2 m * 2 m * 2 m, and sliced into 30 cells along each axes. For each cell energy deposition,
 number of steps of gamma, number of steps of electron and number of steps of positron are scored.
 </p><div class="example"><a name="id510346"></a><p class="title"><b>Example 4.22.
+</p><div class="example"><a name="id510347"></a><p class="title"><b>Example 4.22.
 UI commands to define a scoring mesh and scorers
 </b></p><pre class="programlisting">
 …
 </h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.Track.Basic"></a>
 Basic Concepts
 </h3></div></div><div></div></div><h4><a name="id531457"></a>
+</h3></div></div><div></div></div><h4><a name="id531458"></a>
 Philosophy of Tracking
 </h4><p>
 …
     One step completed.
   </p></li></ol></div><p>
 </p><h4><a name="id531704"></a>
+</p><h4><a name="id531705"></a>
 What is a Step?
 </h4><p>
 …
 properties, such as energy and momentum, are updated as the various
 active processes are invoked.
 </p><h4><a name="id531740"></a>
+</p><h4><a name="id531741"></a>
 What is a Track?
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.Track.Traj"></a>
 Trajectory and Trajectory Point
 </h3></div></div><div></div></div><h4><a name="id532497"></a>
+</h3></div></div><div></div></div><h4><a name="id532498"></a>
 G4Trajectory and G4TrajectoryPoint
 </h4><p>
 …
 cross a geometrical boundary. Thus a drawn trajectory may not be
 circular.
 </p></div><h4><a name="id532700"></a>
+</p></div><h4><a name="id532701"></a>
 Customizing trajectory and trajectory point
 </h4><p>
 …
 <a href="#brhead.PhysProc.PrtChng">
 Particle Change</a>).
 </p><h4><a name="id534490"></a>
+</p><h4><a name="id534491"></a>
 G4VProcess
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id534809"></a>
+</p><h4><a name="id534810"></a>
 Other base classes for processes
 </h4><p>
 …
 These processes apply to electrons, protons, hydrogen, alpha particles and
 their charge states.
 </p><h4><a name="id536540"></a>
+</p><h4><a name="id536541"></a>
  Electron processes
 </h4><p>
 …
       </p></li></ul></div><p>
   </p></li></ul></div><p>
 </p><h4><a name="id536626"></a>
+</p><h4><a name="id536627"></a>
  Proton processes
 </h4><p>
 …
       </p></li></ul></div><p>
   </p></li></ul></div><p>
 </p><h4><a name="id536793"></a>
+</p><h4><a name="id536794"></a>
  Helium (neutral) processes
 </h4><p>
 …
       </p></li></ul></div><p>
   </p></li></ul></div><p>
 </p><h4><a name="id536876"></a>
+</p><h4><a name="id536877"></a>
  Helium+ (ionized once) processes
 </h4><p>
 …
       </p></li></ul></div><p>
   </p></li></ul></div><p>
 </p><h4><a name="id536980"></a>
+</p><h4><a name="id536981"></a>
  Helium++ (ionised twice) processes
 </h4><p>
 …
 </p><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="sect.PhysProc.Had.TreatCross"></a>
 Treatment of Cross Sections
 </h4></div></div><div></div></div><h4><a name="id537151"></a>
+</h4></div></div><div></div></div><h4><a name="id537152"></a>
 Cross section data sets
 </h4><p>
 …
 internal database and/or other state information, for the given
 particle type, to the standard output stream.
 </p><h4><a name="id537268"></a>
+</p><h4><a name="id537269"></a>
 Cross section data store
 </h4><p>
 …
 This method may be used to request the data store to invoke the
 <tt class="literal">DumpPhysicsTable</tt> method of each of its data sets.
 </p><h4><a name="id537438"></a>
+</p><h4><a name="id537439"></a>
 Default cross sections
 </h4><p>
 …
 of the respective mean free paths of a given particle in a given
 material.
 </p><h4><a name="id537583"></a>
+</p><h4><a name="id537584"></a>
 Cross-sections for low energy neutron transport
 </h4><p>
 …
 </p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="sect.PhysProc.Had.AtRest"></a>
 Hadrons at Rest
 </h4></div></div><div></div></div><h4><a name="id537653"></a>
+</h4></div></div><div></div></div><h4><a name="id537654"></a>
 List of implemented "Hadron at Rest" processes
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id537842"></a>
+</p><h4><a name="id537843"></a>
 Example of how to use a hadron at rest process
 </h4><p>
 …
       n, n-bar
     </td></tr></tbody></table></div><p>
 </p><h4><a name="id538098"></a>
+</p><h4><a name="id538099"></a>
 How to register Models
 </h4><p>
 …
  void SetMaxEnergy( const G4double anEnergy )
 </pre></div><p>
 </p><h4><a name="id538373"></a>
+</p><h4><a name="id538374"></a>
 Which models are there, and what are the defaults
 </h4><p>
 …
 </p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="sect.PhysProc.Photo.Track"></a>
 Tracking of Photons in <tt class="literal">processes/optical</tt>
 </h4></div></div><div></div></div><h4><a name="id539603"></a>
+</h4></div></div><div></div></div><h4><a name="id539604"></a>
 Absorption
 </h4><p>
 …
 the medium; i.e. it is the mean free path returned by the
 <tt class="literal">GetMeanFreePath</tt> method.
 </p><h4><a name="id539651"></a>
+</p><h4><a name="id539652"></a>
 Rayleigh Scattering
 </h4><p>
 …
 <tt class="literal">RayleighAttenuationLengthGenerator</tt>
 which calculates it for 10 degrees Celsius liquid water.
 </p><h4><a name="id539782"></a>
+</p><h4><a name="id539783"></a>
 Boundary Process
 </h4><p>
 …
 </p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="sect.PhysProc.Param.FastSimModel"></a>
 The <tt class="literal">G4VFastSimulationModel</tt> Abstract Class
 </h4></div></div><div></div></div><h4><a name="id540461"></a>
+</h4></div></div><div></div></div><h4><a name="id540462"></a>
 Constructors:
 </h4><p>
 …
       placed, you can set the boolean value to "true".
     </p></dd></dl></div><p>
 </p><h4><a name="id540549"></a>
+</p><h4><a name="id540550"></a>
 Virtual methods:
 </h4><p>
 …
 Parameterisation Using Ghost Geometries
 &#8221;</a>.
 </p><h4><a name="id540756"></a>
+</p><h4><a name="id540757"></a>
 Constructor:
 </h4><p>
 …
       G4Region* and G4bool values of the model constructor.
     </p></dd></dl></div><p>
 </p><h4><a name="id540798"></a>
+</p><h4><a name="id540799"></a>
 G4VFastSimulationModel object management:
 </h4><p>
 …
     G4VFastSimulationModel*)</b></span></tt>
   </p></li></ul></div><p>
 </p><h4><a name="id540850"></a>
+</p><h4><a name="id540851"></a>
 Interface with the G4FastSimulationManagerProcess:
 </h4><p>
 …
 same as those in your Geant4 application (as far as you do not
 change source codes).
 </p><h4><a name="id549268"></a>
+</p><h4><a name="id549269"></a>
 Categories
 </h4><p>
 …
 to define the detector, specify the physics to be used, and
 describe how initial particles are to be generated.
 </p><h4><a name="id571045"></a>
+</p><h4><a name="id571046"></a>
 <tt class="literal">G4VUserDetectorConstruction</tt>
 </h4><p>
 …
      };
 </pre></div><p>
 </p><h4><a name="id571088"></a>
+</p><h4><a name="id571089"></a>
 <tt class="literal">G4VUserPhysicsList</tt>
 </h4><p>
 …
 methods. Objects of user action classes must be registered with
 <tt class="literal">G4RunManager</tt>.
 </p><h4><a name="id571684"></a>
+</p><h4><a name="id571685"></a>
 <tt class="literal">G4UserRunAction</tt>
 </h4><p>
 …
      };
 </pre></div><p>
 </p><h4><a name="id571829"></a>
+</p><h4><a name="id571830"></a>
 <tt class="literal">G4UserEventAction</tt>
 </h4><p>
 …
      };
 </pre></div><p>
 </p><h4><a name="id571950"></a>
+</p><h4><a name="id571951"></a>
 <tt class="literal">G4UserStackingAction</tt>
 </h4><p>
 …
      };
 </pre></div><p>
 </p><h4><a name="id572283"></a>
+</p><h4><a name="id572284"></a>
 <tt class="literal">G4UserTrackingAction</tt>
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.UIDefNew.DervCls"></a>
 G4UIcommand and its derived classes
 </h3></div></div><div></div></div><h4><a name="id575729"></a>
+</h3></div></div><div></div></div><h4><a name="id575730"></a>
 Methods available for all derived classes
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id575848"></a>
+</p><h4><a name="id575849"></a>
 G4UIdirectory
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id575891"></a>
+</p><h4><a name="id575892"></a>
 G4UIcmdWithoutParameter
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id575929"></a>
+</p><h4><a name="id575930"></a>
 G4UIcmdWithABool
 </h4><p>
 …
     </p><p>
 </p></li></ul></div><p>
 </p><h4><a name="id576168"></a>
+</p><h4><a name="id576169"></a>
 G4UIcmdWithADouble
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id576287"></a>
+</p><h4><a name="id576288"></a>
 G4UIcmdWithAString
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id576374"></a>
+</p><h4><a name="id576375"></a>
 G4UIcmdWith3Vector
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id576770"></a>
+</p><h4><a name="id576771"></a>
 G4UIcmdWithADoubleAndUnit
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id576980"></a>
+</p><h4><a name="id576981"></a>
 G4UIcmdWith3VectorAndUnit
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id577195"></a>
+</p><h4><a name="id577196"></a>
 Additional comments on the <tt class="literal">SetParameterName()</tt> method
 </h4><p>
 …
 </a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.OpenGL">
 OpenGL
+</a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.Qt">
+Qt
 </a></span></dt><dt><span class="sect2"><a href="#sect.VisDrv.OpenInv">
 OpenInventor
 …
 </a></span></dt><dd><dl><dt><span class="sect2"><a href="#sect.MkMovie.OGLX">
 OGLX
+</a></span></dt><dt><span class="sect2"><a href="#sect.MkMovie.Qt">
+Qt
 </a></span></dt><dt><span class="sect2"><a href="#sect.MkMovie.DAWNFILE">
 DAWNFILE
 …
 supports a diverse family of graphics systems. Some of these
 graphics systems use a graphics library compiled with Geant4, such
 as OpenGL, while others involve a separate application, such as
+as OpenGL, Qt, while others involve a separate application, such as
 WIRED or DAWN.
 </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.VisIntro.What"></a>
 …
       </p></li><li><p>
         Limited printing ability (pixel graphics, not vector graphics)
+      </p></li></ul></div><p>
+  </p></li><li><p>
+    Qt
+    </p><div class="itemizedlist"><ul type="circle" compact><li><p>
+        View directly from Geant4
+      </p></li><li><p>
+        Uses Qt and GL libraries that are already included on most Linux
+        systems (plus some Windows availability)
+      </p></li><li><p>
+        Rendered, photorealistic image
+      </p></li><li><p>
+        Many interactive features
+      </p></li><li><p>
+        zoom, rotate, translate
+      </p></li><li><p>
+        Fast response (can usually exploit full potential of graphics
+        hardware)
+      </p></li><li><p>
+        Expanded printing ability (vector and pixel graphics)
+      </p></li><li><p>
+        Make movies interactively
       </p></li></ul></div><p>
   </p></li><li><p>
 …
       </p></li></ul></div><p>
   </p></li><li><p>
+    If you want GUI control, very responsive photorealistic graphics plus more
+    interactivity (and have the Qt libraries installed).
+    </p><div class="itemizedlist"><ul type="circle" compact><li><p>
+        Qt is a good solution
+      </p></li></ul></div><p>
+  </p></li><li><p>
     If you want GUI control, want to be able to pick on items to
     inquire about them (identity, momentum, etc.), perhaps want to
 …
     </p><div class="itemizedlist"><ul type="circle" compact><li><p>
         OpenGL
+      </p></li><li><p>
+        Qt
       </p></li><li><p>
         OpenInventor
 …
 GAGTree.
 </p><p>
 The OpenGL, OpenInventor and RayTracerX drivers are not
+The OpenGL, Qt, OpenInventor and RayTracerX drivers are not
 incorporated by default. Nor are the DAWN-Network and VRML-Network
 drivers, because they require the network setting of the installed
 …
      setenv G4VIS_BUILD_OPENGLX_DRIVER      1  # OpenGL-Xlib driver
      setenv G4VIS_BUILD_OPENGLXM_DRIVER     1  # OpenGL-Motif driver
+     setenv G4VIS_BUILD_OPENGLQT_DRIVER     1  # Qt driver
      setenv G4VIS_BUILD_OIX_DRIVER          1  # OpenInventor-Xlib driver
      setenv G4VIS_BUILD_RAYTRACERX_DRIVER   1  # RayTracer-XLib driver
 …
 By default, you get the DAWNFILE, HepRepFile, RayTracer,
 VRML1FILE, VRML2FILE, ATree and GAGTree drivers. Additionally, you
 may choose from the OpenGL-Xlib, OpenGL-Motif, OpenInventor,
+may choose from the OpenGL-Xlib, OpenGL-Motif, Qt, OpenInventor,
 RayTracerX, DAWN-Network and VRML-Network drivers, each of which
 can be selected by setting the proper environment variable:
 …
      setenv G4VIS_USE_OPENGLX      1
      setenv G4VIS_USE_OPENGLXM     1
+     setenv G4VIS_USE_OPENGLQT     1
      setenv G4VIS_USE_OIX          1
      setenv G4VIS_USE_RAYTRACERX   1
 …
 &#8221;</a>
     OpenGL
+  </p></li><li><p>
+    <a href="#sect.VisDrv.Qt" title="
+Qt
+">the section called &#8220;
+Qt
+&#8221;</a>
+    Qt
   </p></li><li><p>
     <a href="#sect.VisDrv.OpenInv" title="
 …
     </td><td>
       Windows
+    </td></tr><tr><td>
+      Qt
+    </td><td>
+      Qt, OpenGL
+    </td><td>
+      Linux, Unix, Mac, Windows
     </td></tr><tr><td>
       OpenInventor-X
 …
     using the OpenGL Graphics System
   </p></li></ul></div><p>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.VisDrv.Qt"></a>
+Qt
+</h3></div></div><div></div></div><p>
+This driver have been developed by Laurent Garnier (IN2P3, LAL Orsay).
+It is an interface to the powerful toolkit Qt, now free on lot of
+platforms. This driver needs OpenGL library to be install. 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. All OpenGL
+features are implements in Qt driver . In addition, mouse events control
+are used to rotation/move/zoom volume, you can save your scene in lots
+of formats (vector or not), make movies...
+</p><p>
+There is only one session of Qt driver for all available platform.
+Two display modes are available: immediate mode and stored mode.
+The former has no limitation on data size, and the latter is fast
+for visualizing large data repetitively, and so is suitable for
+animation.
+</p><p>
+To see the visualization window :
+</p><div class="informalexample"><pre class="programlisting">
+     /vis/open OGLSQt
+</pre></div><p>
+</p><p>
+<span class="bold"><b>Further information (Qt):</b></span>
+</p><div class="itemizedlist"><ul type="disc" compact><li><p>
+    <a href="http://trolltech.com/" target="_top">
+    Qt
+    </a>
+  </p></li><li><p>
+    <a href="http://geant4.slac.stanford.edu/Presentations/vis/G4OpenGLTutorial/G4OpenGLTutorial.html" target="_top">
+    Geant4 Visualization Tutorial
+    </a>
+    using the Qt Driver
+  </p></li></ul></div><p>
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.VisDrv.OpenInv"></a>
 OpenInventor
 …
 Its default value is <tt class="literal">NONE</tt>, which means that no viewer
 is invoked and only the file <tt class="literal">g4.wrl</tt> is generated.
 </p><h4><a name="id586905"></a>
+</p><h4><a name="id587160"></a>
 Remote Visualization with the VRML-Network Driver
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.VisCntCmmd.CutVw"></a>
 Cut view
 </h3></div></div><div></div></div><h4><a name="id592187"></a>
+</h3></div></div><div></div></div><h4><a name="id592547"></a>
 Sectioning
 </h4><p>
 …
      Idle&gt; /vis/viewer/set/sectionPlane  on  2.0  0.0  0.0  cm  1.0  0.0  0.0
 </pre></div><p>
 </p><h4><a name="id592229"></a>
+</p><h4><a name="id592589"></a>
 Cutting away
 </h4><p>
 …
     </p><p>
     Time development of an electrmagnetic shower.
+    </p><p>
+  </p></li><li><p>
+    <a href="./Visualization/visTutor/exN03Vis14_mac.html" target="_top">
+    exN03Vis14.mac:</a>
+    </p><p>
+    A basic macro for visualization of detector geometry and events
+    using Qt in Stored mode.
+    </p><p>
+  </p></li><li><p>
+    <a href="./Visualization/visTutor/exN03Vis15_mac.html" target="_top">
+    exN03Vis15.mac:</a>
+    </p><p>
+    A basic macro for visualization of detector geometry and events
+    using Qt.
     </p><p>
   </p></li><li><p>
 …
 user. The models are described briefly below, followed by some
 example configuration commands.
 </p><h4><a name="id599896"></a>
+</p><h4><a name="id600320"></a>
 G4TrajectoryGenericDrawer
 </h4><p>
 This model simply draws all trajectories in the same style, with
 the properties provided by the context.
 </p><h4><a name="id599910"></a>
+</p><h4><a name="id600334"></a>
 G4TrajectoryDrawByCharge
 </h4><p>
 …
                Green
 </pre></div><p>
 </p><h4><a name="id599938"></a>
+</p><h4><a name="id600362"></a>
 G4TrajectoryDrawByParticleID
 </h4><p>
 …
 By default, all trajectories are coloured grey. Chosen particle
 types can be highlighted with specified colours.
 </p><h4><a name="id599954"></a>
+</p><h4><a name="id600378"></a>
 G4TrajectoryDrawByOriginVolume
 </h4><p>
 …
 physical volume. Physical volume takes precedence over logical
 volume. All trajectories are coloured grey by default.
 </p><h4><a name="id599970"></a>
+</p><h4><a name="id600394"></a>
 G4TrajectoryDrawByAttribute
 </h4><p>
 …
 mode. The above models are described briefly below, followed by
 some example configuration commands.
 </p><h4><a name="id601482"></a>
+</p><h4><a name="id601906"></a>
 G4TrajectoryChargeFilter
 </h4><p>
 …
 running mode, only trajectories with charges matching those
 registered with the model will pass the filter.
 </p><h4><a name="id601497"></a>
+</p><h4><a name="id601921"></a>
 G4TrajectoryParticleFilter
 </h4><p>
 …
 standard running mode, only trajectories with particle types
 matching those registered with the model will pass the filter.
 </p><h4><a name="id601512"></a>
+</p><h4><a name="id601936"></a>
 G4TrajectoryOriginVolumeFilter
 </h4><p>
 …
 volumes matching those registered with the model will pass the
 filter.
 </p><h4><a name="id601528"></a>
+</p><h4><a name="id601952"></a>
 G4TrajectoryAttributeFilter
 </h4><p>
 …
 </h3></div></div><div></div></div><p>
 Here we explain how to use 3D markers in Geant4 Visualization.
 </p><h4><a name="id602320"></a>
+</p><h4><a name="id602744"></a>
 What are Markers?
 </h4><p>
 …
 </p><p>
 Access functions of class <span class="emphasis"><em>G4VMarker</em></span> are summarized below.
 </p><h4><a name="id602446"></a>
+</p><h4><a name="id602870"></a>
 Access functions of markers
 </h4><p>
 …
 screen images and we would be happy to hear about them. Graphics
 drivers currently capable of producing picture files are:
+<a href="http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html" target="_top">More informations about MPEG encoder</a>
 </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><tbody><tr><td><span class="bold"><b>Driver</b></span></td><td><span class="bold"><b>File type</b></span></td></tr><tr><td>
 …
         eps
       </td></tr><tr><td>
+        Qt
+      </td><td>
+        jpeg, eps, ppm, ...
+      </td></tr><tr><td>
         RayTracer
       </td><td>
 …
 </p><p>
 Then, on Mac, for example:
+</p><div class="informalexample"><pre class="programlisting">
+open G4OpenGL.mpg
+</pre></div><p>
+opens a QuickTime player.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.MkMovie.Qt"></a>
+Qt
+</h3></div></div><div></div></div><p>
+Make a movie with Qt driver is the easyest way. A function is already define to
+store all changes on OpenGL frame from viewer in a movie format. You can then use
+loops (as defined in OGLX section) or even move/rotate/zoom you scene in real time
+with your mouse.
+</p><p>
+All the work of OGLX section to store files, convert them, and make a movie is
+hidden by Qt driver. But as for previous section, you have to install mpeg_encoder.
+</p><p>
+To make a movie :
+</p><div class="itemizedlist"><ul type="disc" compact><li><p>
+   Right clic will display a context menu, "Action"-&gt;"Movie parameters".
+  </p></li><li><p>
+   Select MPEG encoder path is it was not found
+  </p></li><li><p>
+   Select the name of the output movie.
+  </p></li><li><p>
+   Let go! Hit SPACE to Start/Pause recording, RETURN to STOP
+  </p></li></ul></div><p>
+</p><p>
+Then, open your movies (on Mac, for example):
 </p><div class="informalexample"><pre class="programlisting">
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp01"></a>
 Example N01
 </h3></div></div><div></div></div><h4><a name="id617332"></a>
+</h3></div></div><div></div></div><h4><a name="id618253"></a>
 Basic concepts
 </h4><div class="itemizedlist"><ul type="disc" compact><li><p>
    minimal set for geantino transportation
   </p></li></ul></div><h4><a name="id617351"></a>
+  </p></li></ul></div><h4><a name="id618273"></a>
 Classes
 </h4><p>
 …
     Hard coded UI command application
   </p></li></ul></div><p>
 </p><h4><a name="id617431"></a>
+</p><h4><a name="id618353"></a>
 ExN01DetectorConstruction
 </h4><p>
 …
     <span class="emphasis"><em>G4PVPlacement</em></span> without rotation
   </p></li></ul></div><p>
 </p><h4><a name="id617487"></a>
+</p><h4><a name="id618408"></a>
 ExN01PhysicsList
 </h4><p>
 …
     assignment of transportation process
   </p></li></ul></div><p>
 </p><h4><a name="id617537"></a>
+</p><h4><a name="id618458"></a>
 ExN01PrimaryGeneratorAction
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp02"></a>
 Example N02
 </h3></div></div><div></div></div><h4><a name="id617606"></a>
+</h3></div></div><div></div></div><h4><a name="id618527"></a>
 Basic concepts
 </h4><p>
 …
     Hits: tracker type hits
   </p></li></ul></div><p>
 </p><h4><a name="id617638"></a>
+</p><h4><a name="id618559"></a>
 Classes
 </h4><p>
 …
     construction and set of mandatory user classes
   </p></li></ul></div><p>
 </p><h4><a name="id617706"></a>
+</p><h4><a name="id618627"></a>
 ExN02DetectorConstruction
 </h4><p>
 …
       </p></li></ul></div><p>
   </p></li></ul></div><p>
 </p><h4><a name="id617795"></a>
+</p><h4><a name="id618716"></a>
 ExN02MagneticField
 </h4><p>
 …
     Uniform field. <span class="emphasis"><em>ExN02MagneticField</em></span>
   </p></li></ul></div><p>
 </p><h4><a name="id617843"></a>
+</p><h4><a name="id618765"></a>
 ExN02PhysicsList
 </h4><p>
 …
     Interactivity: chooses processes interactively (=&gt; messenger class)
   </p></li></ul></div><p>
 </p><h4><a name="id617901"></a>
+</p><h4><a name="id618822"></a>
 ExN02PrimaryGeneratorAction
 </h4><p>
 …
     primary event generation via particle gun
   </p></li></ul></div><p>
 </p><h4><a name="id617955"></a>
+</p><h4><a name="id618876"></a>
 ExN02RunAction
 </h4><p>
 …
     draw detector
   </p></li></ul></div><p>
 </p><h4><a name="id618000"></a>
+</p><h4><a name="id618921"></a>
 ExN02EventAction
 </h4><p>
 …
     print time information
   </p></li></ul></div><p>
 </p><h4><a name="id618045"></a>
+</p><h4><a name="id618966"></a>
 ExN02TrackerSD
 </h4><p>
 …
     tracker-type hit generation
   </p></li></ul></div><p>
 </p><h4><a name="id618090"></a>
+</p><h4><a name="id619012"></a>
 ExN02TrackerHit
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp03"></a>
 Example N03
 </h3></div></div><div></div></div><h4><a name="id618149"></a>
+</h3></div></div><div></div></div><h4><a name="id619071"></a>
 Basic concepts
 </h4><p>
 …
     Tracking: collect energy deposition, total track length
   </p></li></ul></div><p>
 </p><h4><a name="id618187"></a>
+</p><h4><a name="id619108"></a>
 Classes
 </h4><p>
 …
     macro file
   </p></li></ul></div><p>
 </p><h4><a name="id618256"></a>
+</p><h4><a name="id619177"></a>
 ExN03DetectorConstruction
 </h4><p>
 …
     visualization
   </p></li></ul></div><p>
 </p><h4><a name="id618327"></a>
+</p><h4><a name="id619249"></a>
 ExN03PhysicsList
 </h4><p>
 …
     class)
   </p></li></ul></div><p>
 </p><h4><a name="id618389"></a>
+</p><h4><a name="id619310"></a>
 ExN03PrimaryGeneratorAction
 </h4><p>
 …
     class)
   </p></li></ul></div><p>
 </p><h4><a name="id618450"></a>
+</p><h4><a name="id619372"></a>
 ExN03RunAction
 </h4><p>
 …
     Interactivity: change detector size, material, magnetic field.
   </p></li></ul></div><p>
 </p><h4><a name="id618509"></a>
+</p><h4><a name="id619431"></a>
 ExN03EventAction
 </h4><p>
 …
     print end of event information (energy deposited, etc.)
   </p></li></ul></div><p>
 </p><h4><a name="id618560"></a>
+</p><h4><a name="id619481"></a>
 ExN03SteppingAction
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp04"></a>
 Example N04
 </h3></div></div><div></div></div><h4><a name="id618619"></a>
+</h3></div></div><div></div></div><h4><a name="id619541"></a>
 Basic concepts
 </h4><p>
 …
     Full hits/digits/trigger
   </p></li></ul></div><p>
 </p><h4><a name="id618647"></a>
+</p><h4><a name="id619568"></a>
 Classes
 </h4><p>
 …
     construction and set of user classes
   </p></li></ul></div><p>
 </p><h4><a name="id618699"></a>
+</p><h4><a name="id619620"></a>
 ExN04DetectorConstruction
 </h4><p>
 …
   </p></li><li><p>
     calorimeter -- replica</p></li></ul></div><p>
 </p><h4><a name="id618774"></a>
+</p><h4><a name="id619695"></a>
 ExN04TrackerParametrisation
 </h4><p>
 …
     parametrised sizes
   </p></li></ul></div><p>
 </p><h4><a name="id618819"></a>
+</p><h4><a name="id619741"></a>
 ExN04CalorimeterParametrisation
 </h4><p>
 …
     parametrized position/rotation
   </p></li></ul></div><p>
 </p><h4><a name="id618865"></a>
+</p><h4><a name="id619787"></a>
 ExN04MagneticField
 </h4><p>
 …
     solenoid and toroidal fields
   </p></li></ul></div><p>
 </p><h4><a name="id618910"></a>
+</p><h4><a name="id619832"></a>
 ExN04TrackerSD
 </h4><p>
 …
     tracker-type hit generation
   </p></li></ul></div><p>
 </p><h4><a name="id618956"></a>
+</p><h4><a name="id619877"></a>
 ExN04TrackerHit
 </h4><p>
 …
     draw hit point
   </p></li></ul></div><p>
 </p><h4><a name="id619001"></a>
+</p><h4><a name="id619922"></a>
 ExN04CalorimeterSD
 </h4><p>
 …
     calorimeter-type hit generation
   </p></li></ul></div><p>
 </p><h4><a name="id619046"></a>
+</p><h4><a name="id619967"></a>
 ExN04CalorimeterHit
 </h4><p>
 …
     draw physical volume with variable color
   </p></li></ul></div><p>
 </p><h4><a name="id619091"></a>
+</p><h4><a name="id620013"></a>
 ExN04MuonSD
 </h4><p>
 …
     Scintillator-type hit generation
   </p></li></ul></div><p>
 </p><h4><a name="id619136"></a>
+</p><h4><a name="id620058"></a>
 ExN04MuonHit
 </h4><p>
 …
     draw physical volume with variable color
   </p></li></ul></div><p>
 </p><h4><a name="id619181"></a>
+</p><h4><a name="id620103"></a>
 ExN04PrimaryGeneratorAction
 </h4><p>
 …
     primary event generation with PYTHIA event
   </p></li></ul></div><p>
 </p><h4><a name="id619236"></a>
+</p><h4><a name="id620157"></a>
 ExN04EventAction
 </h4><p>
 …
     store the initial seeds
   </p></li></ul></div><p>
 </p><h4><a name="id619273"></a>
+</p><h4><a name="id620194"></a>
 ExN04StackingAction
 </h4><p>
 …
     event abortion
   </p></li></ul></div><p>
 </p><h4><a name="id619323"></a>
+</p><h4><a name="id620244"></a>
 ExN04StackingActionMessenger
 </h4><p>
 …
     define abortion conditions
   </p></li></ul></div><p>
 </p><h4><a name="id619368"></a>
+</p><h4><a name="id620290"></a>
 ExN04TrackingAction
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp05"></a>
 Example N05
 </h3></div></div><div></div></div><h4><a name="id619432"></a>
+</h3></div></div><div></div></div><h4><a name="id620354"></a>
 Basic concepts
 </h4><p>
 …
     (calorimeter type hits ?)
   </p></li></ul></div><p>
 </p><h4><a name="id619487"></a>
+</p><h4><a name="id620409"></a>
 Classes
 </h4><p>
 …
     construction EM physics shower fast simulation model
   </p></li></ul></div><p>
 </p><h4><a name="id619570"></a>
+</p><h4><a name="id620492"></a>
 ExN05EMShowerModel
 </h4><p>
 …
     energy deposition in sensitive detector
   </p></li></ul></div><p>
 </p><h4><a name="id619616"></a>
+</p><h4><a name="id620537"></a>
 ExN05PionShowerModel
 </h4><p>
 …
     energy deposition in sensitive detector
   </p></li></ul></div><p>
 </p><h4><a name="id619661"></a>
+</p><h4><a name="id620582"></a>
 ExN05DetectorConstruction
 </h4><p>
 …
     <span class="emphasis"><em>G4PVPlacement</em></span>
   </p></li></ul></div><p>
 </p><h4><a name="id619720"></a>
+</p><h4><a name="id620641"></a>
 ExN05PhysicsList
 </h4><p>
 …
     assignment of <span class="emphasis"><em>G4FastSimulationManagerProcess</em></span>
   </p></li></ul></div><p>
 </p><h4><a name="id619769"></a>
+</p><h4><a name="id620690"></a>
 ExN05PrimaryGeneratorAction
 </h4><p>
 …
     primary event generation via particle gun
   </p></li></ul></div><p>
 </p><h4><a name="id619823"></a>
+</p><h4><a name="id620744"></a>
 ExN05RunAction
 </h4><p>
 …
     (activation/deactivation of parameterisation ?)
   </p></li></ul></div><p>
 </p><h4><a name="id619873"></a>
+</p><h4><a name="id620795"></a>
 ExN05EventAction
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp06"></a>
 Example N06
 </h3></div></div><div></div></div><h4><a name="id619933"></a>
+</h3></div></div><div></div></div><h4><a name="id620854"></a>
 Basic concepts
 </h4><div class="itemizedlist"><ul type="disc" compact><li><p>
 …
   </p></li><li><p>
     Visualization : geometry, optical photon trajectories.
   </p></li></ul></div><h4><a name="id619991"></a>
+  </p></li></ul></div><h4><a name="id620913"></a>
 Classes
 </h4><p>
 …
     hard coded <tt class="literal">beamOn</tt>
   </p></li></ul></div><p>
 </p><h4><a name="id620061"></a>
+</p><h4><a name="id620982"></a>
 ExN06DetectorConstruction
 </h4><p>
 …
     visualization
   </p></li></ul></div><p>
 </p><h4><a name="id620140"></a>
+</p><h4><a name="id621062"></a>
 ExN06PhysicsList
 </h4><p>
 …
     modify/augment optical process parameters
   </p></li></ul></div><p>
 </p><h4><a name="id620198"></a>
+</p><h4><a name="id621119"></a>
 ExN06PrimaryGeneratorAction
 </h4><p>
 …
     primary event generation via particle gun
   </p></li></ul></div><p>
 </p><h4><a name="id620252"></a>
+</p><h4><a name="id621173"></a>
 ExN06RunAction
 </h4><p>
 …
 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sect.ExmpNvc.Exmp07"></a>
 Example N07
 </h3></div></div><div></div></div><h4><a name="id620311"></a>
+</h3></div></div><div></div></div><h4><a name="id621232"></a>
 Basic concepts
 </h4><p>
 …
     classes without implementing sensitive detector class.
   </p></li></ul></div><p>
 </p><h4><a name="id620354"></a>
+</p><h4><a name="id621275"></a>
 Classes
 </h4><p>
 …
     construction and set of <span class="emphasis"><em>ExN07RunAction</em></span>
   </p></li></ul></div><p>
 </p><h4><a name="id620429"></a>
+</p><h4><a name="id621350"></a>
 ExN07DetectorConstruction
 </h4><p>
 …
     visualization
   </p></li></ul></div><p>
 </p><h4><a name="id620520"></a>
+</p><h4><a name="id621442"></a>
 ExN07DetectorMessenger
 </h4><p>
 …
     definition of example-specific geometry commands
   </p></li></ul></div><p>
 </p><h4><a name="id620566"></a>
+</p><h4><a name="id621487"></a>
 ExN07PhysicsList
 </h4><p>
 …
     production thresholds for each region
   </p></li></ul></div><p>
 </p><h4><a name="id620621"></a>
+</p><h4><a name="id621543"></a>
 ExN07PrimaryGeneratorAction
 </h4><p>
 …
     primary event generation via particle gun
   </p></li></ul></div><p>
 </p><h4><a name="id620676"></a>
+</p><h4><a name="id621597"></a>
 ExN07RunAction
 </h4><p>
 …
     print out a run summary with <span class="emphasis"><em>ExN07Run</em></span> class object
   </p></li></ul></div><p>
 </p><h4><a name="id620734"></a>
+</p><h4><a name="id621655"></a>
 ExN07Run
 </h4><p>
 …
   </p></li></ul></div><p>
 </p><p>
 </p><div class="table"><a name="id626437"></a><p class="title"><b>Table 9.4.
+</p><div class="table"><a name="id627358"></a><p class="title"><b>Table 9.4.
   TestEm by theme
 </b></p><table summary="
 …
   Has Geant4 been installed properly ? What to do to solve this error ?
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.UpkTar"></a><a name="id638151"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.UpkTar"></a><a name="id639073"></a><b>Q:</b></td><td align="left" valign="top"><p>
   When I download the source from the web, and unpack the tar file,
   some files unpack into the top level directory.
 …
   file for your system, and that you use the correct unpacking tool.
   Note that for Linux you must download the gtar.gz file.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.NoCLHEP"></a><a name="id638178"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.NoCLHEP"></a><a name="id639100"></a><b>Q:</b></td><td align="left" valign="top"><p>
   I cannot find CLHEP files or library and I have it installed in my system.
 </p></td></tr><tr class="answer"><td align="left" valign="top"><b>A:</b></td><td align="left" valign="top"><p>
 …
   just the name is required (i.e. <tt class="literal">CLHEP</tt> for
   <tt class="literal">libCLHEP.a</tt>).
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.noCERNLib"></a><a name="id638280"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.noCERNLib"></a><a name="id639201"></a><b>Q:</b></td><td align="left" valign="top"><p>
   While installing the Geant4 libraries I get the following message printed:
 …
   tool, it's harmless. The cernlib script (and the needed cernlib libraries)
   are available from: http://cern.ch/cernlib.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.FileDepend"></a><a name="id638324"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Installation.FileDepend"></a><a name="id639246"></a><b>Q:</b></td><td align="left" valign="top"><p>
   Trying building the Geant4 libraries I see several of these errors appearing
   and my installation fails:
 …
   length  and this number is afterwards multiplied by a number greater
   than 1.
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.SegFltInExmp"></a><a name="id638724"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.SegFltInExmp"></a><a name="id639645"></a><b>Q:</b></td><td align="left" valign="top"><p>
   On Linux, I get a segmentation fault as soon as I run one of the official
   examples.
 …
   Red-Hat 7.X is not fully compatible with binaries running on RH 9.X or
   higher, due to different libc used in the two configurations.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.ErrShareLib"></a><a name="id638750"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.ErrShareLib"></a><a name="id639672"></a><b>Q:</b></td><td align="left" valign="top"><p>
   I installed Geant4 libraries and built my application, when I try to run
   it I get:
 …
        setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$CLHEP_BASE_DIR/lib
   </pre></div><p>
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.errFPE"></a><a name="id638797"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.RunTimeProb.errFPE"></a><a name="id639718"></a><b>Q:</b></td><td align="left" valign="top"><p>
   On my system I get a Floating Point Exception (FPE) since some physics
   processes sometimes return <tt class="literal">DBL_MAX</tt> as interaction
 …
   geometry during tracking and how can I convert it to coordinates local
   to the current volume ?
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.GenPnt"></a><a name="id639004"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.GenPnt"></a><a name="id639925"></a><b>Q:</b></td><td align="left" valign="top"><p>
   I have a generic point and I would like to know in which physical
   volume I'm located in my detector geometry.
 …
     specified in the FAQ for tracking and steps.
   </p></div><p>
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.DghtVol"></a><a name="id639060"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.DghtVol"></a><a name="id639982"></a><b>Q:</b></td><td align="left" valign="top"><p>
   How can I access the daughter volumes of a specific physical volume?
 </p></td></tr><tr class="answer"><td align="left" valign="top"><b>A:</b></td><td align="left" valign="top"><p>
 …
         myPVolume = myLVolume-&gt;GetDaughter(i);
   </pre></div><p>
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.CpyNum"></a><a name="id639088"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.CpyNum"></a><a name="id640009"></a><b>Q:</b></td><td align="left" valign="top"><p>
   How can I identify the exact copy-number of a specific physical volume
   in my mass geometry? I tried with GetCopyNo()  from my physical volume
 …
   The method <tt class="literal">GetCopyNo()</tt> is meant to return only the
   serial number of placements not duplicated in the geometry tree.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.ConvGtoL"></a><a name="id639155"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.Geometry.ConvGtoL"></a><a name="id640076"></a><b>Q:</b></td><td align="left" valign="top"><p>
   How can I determine the exact position in global coordinates in my mass
   geometry during tracking and how can I convert it to coordinates local
 …
   How can I access the track information through the step object and
   what information am I allowed to access ?
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.TrackSteps.AccssTrkInfo"></a><a name="id639488"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.TrackSteps.AccssTrkInfo"></a><a name="id640409"></a><b>Q:</b></td><td align="left" valign="top"><p>
   How can I access the track information through the step object and
   what information am I allowed to access ?
 …
   in energy for the given material and the distance to the next boundary
   is smaller than the cut in range, is the particle killed ?
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.PhysicsCuts.HowProdCuts"></a><a name="id640256"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.PhysicsCuts.HowProdCuts"></a><a name="id641178"></a><b>Q:</b></td><td align="left" valign="top"><p>
   How do production cuts (in range) work in Geant4 ? Are they also used
   in tracking ? If a particle has an energy lower than the converted cut
 …
   I have set G4VIS... environmental variables but visualization does not
   appear to be enabled.
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Vis.NoVisAppr"></a><a name="id640427"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.Vis.NoVisAppr"></a><a name="id641348"></a><b>Q:</b></td><td align="left" valign="top"><p>
   I have set G4VIS... environmental variables but visualization does not
   appear to be enabled.
 …
   Where can I find solutions to particular problems as well as general user
   support?
 </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.FirstAid"></a><a name="id640652"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.FirstAid"></a><a name="id641573"></a><b>Q:</b></td><td align="left" valign="top"><p>
   If I need to discuss technical matters specific to my simulation
   application or ask for first-aid help, who can I contact?
 …
   Geant4 HyperNews Forum</a>.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.FindBug"></a><a name="id640692"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.FindBug"></a><a name="id641614"></a><b>Q:</b></td><td align="left" valign="top"><p>
   If I find a bug or other problem with the code, who should be informed?
 </p></td></tr><tr class="answer"><td align="left" valign="top"><b>A:</b></td><td align="left" valign="top"><p>
 …
    fixed and showing their status. An acknowledgement of the bug report
    will be sent.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PropFix"></a><a name="id640725"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PropFix"></a><a name="id641646"></a><b>Q:</b></td><td align="left" valign="top"><p>
   If I propose a fix, who is responsible for approving it?
 </p></td></tr><tr class="answer"><td align="left" valign="top"><b>A:</b></td><td align="left" valign="top"><p>
 …
   If the fix affects more than one domain, the matter will be addressed by
   the TSB.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PropImprv"></a><a name="id640749"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PropImprv"></a><a name="id641670"></a><b>Q:</b></td><td align="left" valign="top"><p>
   To whom should I send a proposal for an improvement in Geant4
   functionality?
 …
   agreed upon by the TSB, which is charged with ensuring the consistency
   of the entire toolkit.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.RegMeet"></a><a name="id640769"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.RegMeet"></a><a name="id641691"></a><b>Q:</b></td><td align="left" valign="top"><p>
   Is there a regular user meeting which I should attend?
 </p></td></tr><tr class="answer"><td align="left" valign="top"><b>A:</b></td><td align="left" valign="top"><p>
 …
   institutes in the Geant4 collaboration organize their own regular and/or
   special Geant4 user workshops.
 </p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PrtcProb"></a><a name="id640792"></a><b>Q:</b></td><td align="left" valign="top"><p>
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="qanda.UserSupPolicy.PrtcProb"></a><a name="id641713"></a><b>Q:</b></td><td align="left" valign="top"><p>
   Where can I find solutions to particular problems as well as general user
   support?
 …
 </a>
  are available.
 </p><h4><a name="id643730"></a>
+</p><h4><a name="id644652"></a>
 Origin and current situation of CLHEP
 </h4><p>
 …
 this package, including several contributions made by developers in
 the Geant4 Collaboration.
 </p><h4><a name="id643748"></a>
+</p><h4><a name="id644669"></a>
 Geant4 and CLHEP
 </h4><p>
 …
 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sect.CppStdTL"></a>
 C++ Standard Template Library
 </h2></div></div><div></div></div><h4><a name="id643913"></a>
+</h2></div></div><div></div></div><h4><a name="id644834"></a>
 Overview
 </h4><p>
 …
     , this is the basis of the native egcs STL implementation.
   </p></li></ul></div><p>
 </p><h4><a name="id644022"></a>
+</p><h4><a name="id644944"></a>
 STL in Geant4
 </h4><p>
 …
     </p><p>
   </p></li></ul></div><p>
 </p><h4><a name="id644513"></a>
+</p><h4><a name="id645434"></a>
 <tt class="literal">lib/ bin/</tt> and <tt class="literal">tmp/</tt> directories
 </h4><p>
 …
 accident). They are already set and used internally in the default
 setup !</b></span>
 </p><h4><a name="id644624"></a>
+</p><h4><a name="id645545"></a>
 System configuration
 </h4><p>
 …
       <tt class="literal">env.[c]sh</tt>.
       </p></dd></dl></div><p>
 </p><h4><a name="id644690"></a>
+</p><h4><a name="id645611"></a>
 Installation paths
 </h4><p>
 …
       <tt class="literal">$G4LIB</tt> can be overridden.
     </dd></dl></div><p>
 </p><h4><a name="id644936"></a>
+</p><h4><a name="id645857"></a>
 Build specific
 </h4><p>
 …
     </span></dt><dd></dd></dl></div><p>
 </p><h4><a name="id645202"></a>
+</p><h4><a name="id646124"></a>
 UI specific
 </h4><p>
 …
       its own UI system.
     </dd></dl></div><p>
 </p><h4><a name="id645353"></a>
+</p><h4><a name="id646274"></a>
 Visualization specific
 </h4><p>
 …
       If specified, no visualization drivers will be built or used.
     </dd></dl></div><p>
 </p><h4><a name="id645630"></a>
+</p><h4><a name="id646822"></a>
 Hadronic physics specific
 </h4><p>
 …
       Sets neglecting doppler broadening mode for boosting performance.
     </dd></dl></div><p>
 </p><h4><a name="id645686"></a>
+</p><h4><a name="id646878"></a>
 <tt class="literal">GDML</tt>, <tt class="literal">zlib</tt> and <tt class="literal">g3tog4</tt> modules
 </h4><p>
 …
       library has been already installed.
     </dd></dl></div><p>
 </p><h4><a name="id645846"></a>
+</p><h4><a name="id647039"></a>
 Analysis specific
 </h4><p>
 …
       of the specific analysis tools for details.
     </dd></dl></div><p>
 </p><h4><a name="id645905"></a>
+</p><h4><a name="id647097"></a>
 Directory paths to Physics Data
 </h4><p>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Appendix/Appendix.xml

r904	r921
25	25	&appbuildFile;
26	26	&appdevelopmentDebugTools;
	27	&apppythonInterface;
27	28	&appmaterialNames;
28	29

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Appendix/AppendixEntityDef.dtd

r904	r921
19	19	<!ENTITY appmakeFile SYSTEM "./makeFile.xml">
20	20	<!ENTITY appbuildFile SYSTEM "./buildFile.xml">
	21	<!ENTITY apppythonInterface SYSTEM "./pythonInterface.xml">
21	22	<!ENTITY appdevelopmentDebugTools SYSTEM "./developmentDebugTools.xml">
22	23

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/BookForAppliDev.xml

-              r904
+              r921
 <!ENTITY % bookForAppliDevEntityDef SYSTEM "./BookForAppliDevEntityDef.dtd">
 %bookForAppliDevEntityDef;
 ]>
 …
   </authorgroup>
   <pubdate>14 December, 2007</pubdate>
   <releaseinfo>Version: geant4 9.1</releaseinfo>
+  <pubdate>19 December, 2008</pubdate>
+  <releaseinfo>Version: geant4 9.2</releaseinfo>
 </bookinfo>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Fundamentals/biasing.xml

-              r904
+              r921
 <mediaobject>
  <imageobject role="fo">
     <imagedata fileref="./AllResources/Fundamentals/wwconcept.gif"
                format="GIF" contentwidth="9.0cm" align="center" />
+    <imagedata fileref="./AllResources/Fundamentals/wwconcept.jpg"
+               format="JPG" contentwidth="9.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/Fundamentals/wwconcept.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/Fundamentals/wwconcept.jpg"
+               format="JPG" align="center" />
   </imageobject>
   <textobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Fundamentals/classCategory.xml

-              r905
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/Fundamentals/classCategory.gif"
                format="GIF" contentwidth="7.0cm" align="center" />
+    <imagedata fileref="./AllResources/Fundamentals/classCategory.jpg"
+               format="JPG" contentwidth="7.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/Fundamentals/classCategory.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/Fundamentals/classCategory.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/GettingStarted/graphicalUserInterface.xml

-              r904
+              r921
 The "intercoms" category
 provides an expandable command interpreter. It is the key mechanism
 of Geant4 to realize user interactions of all categories without
+of Geant4 to realize secure user interactions of all categories without
 being annoyed by the dependencies among categories. The direct use
 of Geant4 classes in a C++ program offers a first ground level of
 …
 hard-coded in the program.
 </para>
 </sect3>
 …
 the interfaces category. This interfacing strategy opens an
 important door towards various user interface tools and allows
 Geant4 to utilize the state-of-the-art GUI tools such as Motif and
 Java, etc..The richness of the collaboration has permitted for
 different groups to offer various user interfaces to the Geant4
+Geant4 to utilize the state-of-the-art GUI tools such as Motif, Qt,
+and Java etc..The richness of the collaboration has permitted for
+developers to offer various user interfaces to the Geant4
 command system. Currently available are the following;
 …
   </para></listitem>
   <listitem><para>
   GAG, a fully Graphical User Interface and its extension
+  GAG, a fully Graphical User Interface and its network extension
   GainServer of the client/server type.
   </para></listitem>
 …
 Full implementation of the character
 terminals (1 and 2) is included in the standard Geant4 distribution
+in the <literal>source/interfaces/basic</literal> directory. As for GAG
+with rich GUI functionalities, its front-end classes are included
+in the Geant4 distribution in the source/interfaces/GAG directory.
+The corresponding GUI package is available either from the author's
+Web pages (see URL below) or in the distributed package under the
+<literal>environments/MOMO</literal> directory.
+in the <literal>source/interfaces/basic</literal> directory. As for GAG,
+the front-end class is included
+in the Geant4 distribution in the source/interfaces/GAG directory,
+while its partner GUI package MOMO.jar is available in the standard Geant4 distribution
+under the
+<literal>environments/MOMO</literal> directory. MOMO.jar, Java archive file, contains
+not only GAG, but also GGE and other helper packages.
+Supplementary information is available
+from the author's Webpage(see URL below).
 </para>
 <para>
 GAG, GainServer's client GUI Gain:
 <ulink url="http://erpc1.naruto-u.ac.jp/~geant4">
 http://erpc1.naruto-u.ac.jp/~geant4
+<ulink url="http://www-geant4.kek.jp/~yoshidah">
+http://www-geant4.kek.jp/~yoshidah
 </ulink>
 </para>
 …
 A command box is at disposal for entering or recalling Geant4 commands.
 Command completion by typing &amp;ldquo;TAB&amp;rdquo; key is
 available on the command line. The shellcommands "exit, cont,
+available on the command line. The shell commands "exit, cont,
 help, ls, cd..." are also supported. A menu bar could be customized
 through the <emphasis>AddMenu</emphasis> and
 …
 <para>
 They are the front-end classes of Geant4 which interface with their
 respective graphical user interfaces, GAG (Geant4 Adaptive GUI) and Gain
 (Geant4 adaptive interface for network). While GAG must run on the same
+They are the front-end classes of Geant4 which make connection with their
+respective graphical user interfaces, GAG (Geant4 Adaptive GUI) via pipe, and Gain
+(Geant4 adaptive interface for network) via sockets. While GAG must run on the same
 system (Windows or Unixen) as a Geant4 application, Gain can run on a
 remote system (Windows, Linux, etc.) to which JVM (Java Virtual
 Machine) is installed. A Geant4 application is invoked on a Unix
+remote system (Windows, Linux, etc.) in which JRE (Java Runtime
+Environment) is installed. A Geant4 application is invoked on a Unix
 (Linux) system and behaves as a network server. It opens a port,
 waiting the connection from the Gain. Gain is capable to connect to
 …
 <para>
+Client GUI, GAG and Gain have almost similar look-and-feel. So,
+GAG's functionalities are briefly introduced here. Please refer to
+the above URL for details and to download the client GUIs.
+</para>
+<para>
+GAG is a Graphical User Interface tool with which user
+can set parameters and execute commands. It is adaptive, since GAG
+reflects the internal states of Geant4 that is a state machine. GAG
+is based on the server-client model; GAG is the server, while
+Geant4 executables are clients. Hence, GAG does nothing by itself
+and it must invoke an executable simulation program. Geant4's
+Client GUIs, GAG and Gain have almost similar look-and-feel. So,
+GAG's functionalities are briefly explained here. Please refer to
+the above URL for details.
+</para>
+<para>
+Using GAG, user
+can select a command, set its parameters and execute it. It is adaptive, in the sense that it
+reflects the internal states of Geant4 that is a state machine. So, GAG  always provides users with
+the Geant4 commands which may be added, deleted, enabled or disabled during a session. GAG does nothing by itself but to play an intermediate between user and
+ an executable simulation program via pipes. Geant4's
 front-end class <emphasis>G4UIGAG</emphasis> must be instantiated to
+communicate with GAG. This runs on Linux and Windows 2000.
+GAG is written in Java and
+its Jar (Java Archive) file is available from the above URL. See
+the same pages to know how to install and run Java programs.
+</para>
+communicate with GAG. GAG runs on Linux and Windows. If MOMO.jar is in your
+CLASSPATH, it can be run by a command;
+</para>
+<informalexample>
+<programlisting>
+   %java -jar MOMO.jar
+</programlisting>
+</informalexample>
 <para>
 …
     a GEANT4 process and to exit GAG. Upon the normal exit or an
     unexpected death of the Geant4 process, GAG window are
     automatically reset to accept another GEANT4 executable.
+    automatically reset to run another GEANT4 executable.
     </listitem>
   </varlistentry>
 …
     <term>GEANT4 Command tree:</term>
     <listitem>
     Upon the establishment of the pipe with the GEANT4 process, GAG displays
     the command menu tree whose look and feel is quite similar to
     Windows' file browser. Disabled commands are shown opaque. GAG
+    Upon the establishment of the pipe connection with the GEANT4 process, GAG displays
+    the command menu, using expandable tree browser whose look and feel is similar to
+    a file browser. Disabled commands are shown in opaque. GAG
     doesn &amp;rsquo;t display commands that are just below the root of
     the command hierarchy. Direct type-in field is available for such
 …
     Log can be redirected to the terminal (xterm or cygwin
     window) from which GAG is invoked. It can be interrupted as will,
     in the middle of long session of execution. Log can be saved to a
+    in the middle of a long session of execution. Log can be saved to a
     file independent of the above redirection . GAG displays warning or
     error messages from GEANT4 in a pop-up warning widget.
 …
 <para>
+The libraries that don't depend on external packages are made by default.
+The libraries that don't depend on external packages are created by default, using
+Geant4 configure scripts.
 They include <emphasis>G4UIterminal</emphasis>, <emphasis>G4UItcsh</emphasis>
 and <emphasis>G4UIGAG</emphasis> in libraries <emphasis>libG4UIbasic.a/so</emphasis> and
 …
 <emphasis role="bold">G4UI_BUILD_XAW_SESSION</emphasis> or
 <emphasis role="bold">G4UI_BUILD_WIN32_SESSION</emphasis> must be set
 explicitly.
+explicitly before creating libraries.
 </para>
 …
 <para>
 Build scheme of the user interface libraries is
+The scheme of building the user interface libraries is
 specified in "$G4INSTALL/config/G4UI_BUILD.gmk" makefile and the
 dependencies on the external packages are specified in
 …
 <sect2 id="sect.HowToSetUpInter.HowToUseInter">
 <title>
 How to Use the Interface
+How to Use the Interface in Your Application
 </title>
 …
 To use a given interface
 (<literal>G4UIxxx</literal> where <literal>xxx = terminal,Xm, Xaw, Win32,
 GAG, GainServer</literal>) in a user's program, he has the following
 lines in his main program;
+GAG, GainServer</literal>) in your program, you have  following
+lines in your main program;
 <informalexample>
 <programlisting>
 // to include the class definition in his main program:
+// to include the class definition in the main program:
    #include "G4Uixxx.hh"
 // to instantiate a session of his choice and start the session
+// to instantiate a session of your choice and start the session
    G4UIsession* session = new G4UIxxx;
    session-&gt;SessionStart();
 // the line next to the "SessionStart" is usually to finish the session
+// the line next to the "SessionStart" is necessary to finish the session
    delete session;
 </programlisting>
 …
 <para>
 Again, environment variable selects a given interface. But for your
 convenience, some of them are set defaults.
+Again, environment variable must be preset to select a given interface. But for your
+convenience, some of them are set by defaults.
 <itemizedlist spacing="compact">
 …
    <emphasis>G4UIterminal</emphasis>, <emphasis>G4UItcsh</emphasis>,
    <emphasis>G4UIGAG</emphasis> and <emphasis>G4UIGainServer</emphasis>
    can be used without any environment
+   can be used without setting any environment
    variables. Sessions not needing external packages or libraries are
    always built (see "G4UI_BUILD.gmk") and linked, so the user can
 …
    <listitem><para>
    If the environment variable <emphasis role="bold">G4UI_NONE</emphasis> is
    set, no externa ibraries are selected. Also, for your convenience, if any
+   set, no external libraries are selected. Also, for your convenience, if any
    <emphasis role="bold">G4UI_USE_XXX</emphasis> environment variable is set,
    then the corresponding C-pre-processor flag is also set. However, if the

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/GettingStarted/visualization.xml

-              r905
+              r921
 <!--                                                          -->
 <!--  [History]                                               -->
+<!--    Update HepRApp reference: Joseph Perl, Dec-2008       -->
 <!--    Converted to DocBook: Katsuya Amako, Aug-2006         -->
 <!--    Changed by: Katsuya Amako, 30-Nov-1998                -->
 …
 graphics systems use a graphics library compiled with Geant4, such
 as OpenGL, Qt or OpenInventor, while others involve a separate application, such as
 WIRED or DAWN.
+HepRApp or DAWN.
 </para>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/TrackingAndPhysics/physicsProcess.xml

-              r904
+              r921
 <para>
+This section summarizes the electromagnetic physics processes which
+are installed in Geant4. For details on the implementation of these
+This section summarizes the electromagnetic (EM) physics processes which
+are provided with Geant4. Extended information are avalable at EM web
+<ulink url="http://geant4.web.cern.ch/geant4/collaboration/EMindex.shtml">
+<emphasis role="bold">pages</emphasis></ulink>.
+For details on the implementation of these
 processes please refer to the
 <ulink url="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/PhysicsReferenceManual/html/PhysicsReferenceManual.html">
 …
       </para></listitem>
       <listitem><para>
+        Multiple scattering (class name <emphasis>G4eMultipleScattering</emphasis>)
+      </para></listitem>
+      <listitem><para>
         Positron annihilation into two gammas (class name
         <emphasis>G4eplusAnnihilation</emphasis>)
 …
     <itemizedlist spacing="compact">
       <listitem><para>
+        Bremsstrahlung (class name <emphasis>G4MuBremsstrahlung</emphasis>)
+      </para></listitem>
+      <listitem><para>
         Ionisation and delta ray production (class name
         <emphasis>G4MuIonisation</emphasis>)
       </para></listitem>
       <listitem><para>
         Bremsstrahlung (class name <emphasis>G4MuBremsstrahlung</emphasis>)
+        Multiple scattering (class name <emphasis>G4MuMultipleScattering</emphasis>)
       </para></listitem>
       <listitem><para>
 …
     <itemizedlist spacing="compact">
       <listitem><para>
+        Bremsstrahlung (class name <emphasis>G4hBremsstrahlung</emphasis>)
+      </para></listitem>
+      <listitem><para>
         Ionisation (class name <emphasis>G4hIonisation</emphasis>)
       </para></listitem>
       <listitem><para>
+        e+e- pair production (class name <emphasis>G4hPairProduction</emphasis>)
+      </para></listitem>
+      <listitem><para>
         Ionisation for ions (class name <emphasis>G4ionIonisation</emphasis>)
       </para></listitem>
       <listitem><para>
         Ionisation for ions in low-density media (class name <emphasis>G4ionGasIonisation</emphasis>)
+        Multiple scattering (class name <emphasis>G4hMultipleScattering</emphasis>)
       </para></listitem>
       <listitem><para>
 …
         is used to simulate the multiple scattering of the all charged
         particles  (class name <emphasis>G4MultipleScattering</emphasis>)
-      </para></listitem>
-      <listitem><para>
-        Specialised process for more fast simulation the multiple scattering
-        of muons and hadrons (class name <emphasis>G4hMultipleScattering</emphasis>)
-      </para></listitem>
-      <listitem><para>
-        Alternative process (beta-version) for the multiple scattering
-        of muons (class name <emphasis>G4MuMultipleScattering</emphasis>)
       </para></listitem>
       <listitem><para>
 …
 <para>
+An example of the registration of these processes in a physics list
+is given in <xref linkend="programlist_PhysProc_1" />,
+similar method is used in EM-builders of reference physics
+lists ($G4INSTALL/source/physics_lists/builders) and in
+EM examples ($G4INSTALL/examples/extended/electromagnetic).
+<example id="programlist_PhysProc_1">
+<title>
+<literal>Registration of standard electromagnetic processes</literal>
+</title>
+<programlisting>
+void PhysicsList::ConstructEM()
+{
+  theParticleIterator-&gt;reset();
+  while( (*theParticleIterator)() ){
+    G4ParticleDefinition* particle = theParticleIterator-&gt;value();
+    G4ProcessManager* pmanager = particle-&gt;GetProcessManager();
+    G4String particleName = particle-&gt;GetParticleName();
+    if (particleName == "gamma") {
+      pmanager-&gt;AddDiscreteProcess(new G4PhotoElectricEffect);
+      pmanager-&gt;AddDiscreteProcess(new G4ComptonScattering);
+      pmanager-&gt;AddDiscreteProcess(new G4GammaConversion);
+    } else if (particleName == "e-") {
+      pmanager-&gt;AddProcess(new G4MultipleScattering, -1, 1, 1);
+      pmanager-&gt;AddProcess(new G4eIonisation,        -1, 2, 2);
+      pmanager-&gt;AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
+    } else if (particleName == "e+") {
+      pmanager-&gt;AddProcess(new G4MultipleScattering, -1, 1, 1);
+      pmanager-&gt;AddProcess(new G4eIonisation,        -1, 2, 2);
+      pmanager-&gt;AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
+      pmanager-&gt;AddProcess(new G4eplusAnnihilation,   0,-1, 4);
+    } else if( particleName == "mu+" ||
+               particleName == "mu-"    ) {
+      pmanager-&gt;AddProcess(new G4hMultipleScattering,-1, 1, 1);
+      pmanager-&gt;AddProcess(new G4MuIonisation,       -1, 2, 2);
+      pmanager-&gt;AddProcess(new G4MuBremsstrahlung,   -1, 3, 3);
+               pmanager-&gt;AddProcess(new G4MuPairProduction,   -1, 4, 4);
+    } else if (particleName == "alpha" ||
+               particleName == "He3" ||
+               particleName == "GenericIon") {
+      // ions with charge >= +2
+      pmanager-&gt;AddProcess(new G4hMultipleScattering,-1, 1, 1);
+      pmanager-&gt;AddProcess(new G4ionIonisation,      -1, 2, 2);
+    } else if ((!particle-&gt;IsShortLived()) &amp;&amp;
+               (particle-&gt;GetPDGCharge() != 0.0) &amp;&amp;
+               (particle-&gt;GetParticleName() != "chargedgeantino")) {
+      //all others charged particles except geantino and short-lived
+      pmanager-&gt;AddProcess(new G4hMultipleScattering,-1, 1, 1);
+      pmanager-&gt;AddProcess(new G4hIonisation,        -1, 2, 2);
+    }
+  }
+}
+</programlisting>
+</example>
+</para>
+<para>
+It is recommended to use physics constructor classes provided
+with rederence physics lists ($G4INSTALL/source/physics_lists/builders):
+    <itemizedlist spacing="compact">
+      <listitem><para>
+        default EM physics (class name <emphasis>G4EmStandardPhysics</emphasis>)
+      </para></listitem>
+      <listitem><para>
+        optional EM physics providing similar performance as g4 7.1p01
+        (class name <emphasis>G4EmStandardPhysics_option1</emphasis>)
+      </para></listitem>
+      <listitem><para>
+        Experimental EM physics with enabled "ApplyCuts" option
+        (class name <emphasis>G4EmStandardPhysics_option2</emphasis>)
+      </para></listitem>
+      <listitem><para>
+        EM physics for simulation with high accuracy
+        (class name <emphasis>G4EmStandardPhysics_option3</emphasis>)
+      </para></listitem>
+    </itemizedlist>
+Examples of the registration of these physics constructor and
+construction of alternative combinations of options are shown
+in novice and extended examples ($G4INSTALL/examples/extended/electromagnetic).
 Novice and extended electromagnetic examples illustrating the use
 of electromagnetic processes are available as part of the Geant4
 …
    <listitem><para>
      SetApplyCuts(G4bool)
+   </para></listitem>
+   <listitem><para>
+     SetSpline(G4bool)
    </para></listitem>
    <listitem><para>
 …
 The following is a summary of the Low Energy Electromagnetic
 processes available in Geant4. Further information is available in
+the
+<ulink url="http://www.ge.infn.it/geant4/lowE/index.html">
+homepage
+the web
+<ulink url="http://geant4.web.cern.ch/geant4/collaboration/working_groups/LEelectromagnetic/index.shtml">pages
 </ulink>
 of the Geant4 Low Energy Electromagnetic Physics Working Group.
 …
 Physics Reference Manual
 </ulink>
-and in other
-<ulink url="http://www.ge.infn.it/geant4/lowE/papers.html">
-papers</ulink>.
 </para>
 …
 <para>
+An example of the registration of these processes in a physics list
+is given in <xref linkend="programlist_PhysProc_2" />.
+<example id="programlist_PhysProc_2">
+<title>
+Registration of electromagnetic low energy electron/photon processes.
+</title>
+<programlisting>
+void LowEnPhysicsList::ConstructEM()
+{
+  theParticleIterator-&gt;reset();
+  while( (*theParticleIterator)() ){
+    G4ParticleDefinition* particle = theParticleIterator-&gt;value();
+    G4ProcessManager* pmanager = particle-&gt;GetProcessManager();
+    G4String particleName = particle-&gt;GetParticleName();
+    if (particleName == "gamma") {
+      theLEPhotoElectric   = new G4LowEnergyPhotoElectric();
+      theLECompton         = new G4LowEnergyCompton();
+      theLEGammaConversion = new G4LowEnergyGammaConversion();
+      theLERayleigh        = new G4LowEnergyRayleigh();
+      pmanager-&gt;AddDiscreteProcess(theLEPhotoElectric);
+      pmanager-&gt;AddDiscreteProcess(theLECompton);
+      pmanager-&gt;AddDiscreteProcess(theLERayleigh);
+      pmanager-&gt;AddDiscreteProcess(theLEGammaConversion);
+    }
+    else if (particleName == "e-") {
+      theLEIonisation = new G4LowEnergyIonisation();
+      theLEBremsstrahlung = new G4LowEnergyBremsstrahlung();
+      theeminusMultipleScattering = new G4MultipleScattering();
+      pmanager-&gt;AddProcess(theeminusMultipleScattering,-1,1,1);
+      pmanager-&gt;AddProcess(theLEIonisation,-1,2,2);
+      pmanager-&gt;AddProcess(theLEBremsstrahlung,-1,-1,3);
+    }
+    else if (particleName == "e+") {
+      theeplusMultipleScattering = new G4MultipleScattering();
+      theeplusIonisation = new G4eIonisation();
+      theeplusBremsstrahlung = new G4eBremsstrahlung();
+      theeplusAnnihilation = new G4eplusAnnihilation();
+      pmanager-&gt;AddProcess(theeplusMultipleScattering,-1,1,1);
+      pmanager-&gt;AddProcess(theeplusIonisation,-1,2,2);
+      pmanager-&gt;AddProcess(theeplusBremsstrahlung,-1,-1,3);
+      pmanager-&gt;AddProcess(theeplusAnnihilation,0,-1,4);
+    }
+  }
+}
+</programlisting>
+</example>
+</para>
+<para>
+Advanced <emphasis role="bold">examples</emphasis> illustrating the use of Low Energy
+Electromagnetic processes are available as part of the Geant4
+Examples of the registration of physics constructor with low-energy
+electromagnetic processes are shown
+in Geant4 extended examples ($G4INSTALL/examples/extended/electromagnetic).
+<emphasis role="bold">Advanced examples</emphasis> illustrating alternative instantiation
+of these processes. Both are available as part of the Geant4
 <ulink url="http://geant4.web.cern.ch/geant4/support/download.shtml">
+release
+</ulink>
+and are further documented
+<ulink url="http://www.ge.infn.it/geant4/lowE/examples/index.html">
+here</ulink>.
+release</ulink>.
 </para>
 …
 </emphasis>
 need to be copied by the user to his/her code
+repository. These files are distributed together with Geant4
+<ulink url="http://geant4.web.cern.ch/geant4/support/download.shtml">
+release</ulink>.
+</para>
+<para>
+repository. These files are distributed together with Geant4.
 The user should set the environment variable
 <emphasis role="bold">G4LEDATA</emphasis> to the
 …
    </para></listitem>
 </itemizedlist>
-</para>
-<para>
-The available models for ElectronicStoppingPower and
-NuclearStoppingPower are documented in the
-<ulink url="http://www.ge.infn.it/geant4/lowE/swprocess/design/">
-class diagrams</ulink>.
 </para>
 …
 <ulink url="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/PhysicsReferenceManual/html/PhysicsReferenceManual.html">
 Physics Reference Manual
+</ulink>
+and in the Geant4 Low Energy Electromagnetic Physics Working Group
+<ulink url="http://www.ge.infn.it/geant4/lowE/index.html">
+homepage</ulink>.
+</ulink>.
 </para>
 …
 G4PhotoElectricAngularGeneratorSauterGavrilla and
 G4PhotoElectricAngularGeneratorPolarized can be set using the
+strings "standard" and "polarized". Information regarding
+conditions of use, performance and energy limits of different
+models are available in the
+<ulink url="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/PhysicsReferenceManual/html/PhysicsReferenceManual.html">
+Physics Reference Manual
+</ulink>
+and in the Geant4 Low Energy Electromagnetic Physics Working Group
+<ulink url="http://www.ge.infn.it/geant4/lowE/index.html">
+homepage</ulink>.
+strings "standard" and "polarized".
 </para>
 …
 <sect3 id="sect.PhysProc.EleMag.VeryLowE">
 <title>
 Very Low energy Electromagnetic Processes (Geant4 DNA extension)
+Very Low energy Electromagnetic Processes (Geant4-DNA extension)
 </title>
 …
 to energies of a few electronVolts suitable for the simulation of radiation
 effects in liquid water for applications at the cellular and sub-cellular
+level. These developments take place in the framework of the Geant4 DNA
+project
+[
+<ulink url="http://www.ge.infn.it/geant4/dna">
+http://www.ge.infn.it/geant4/dna
+</ulink>
+] and are fully described in the paper
+level. These developments take place in the framework of the Geant4-DNA
+project and are described in the paper
 <citation>
 <xref linkend="biblio.chauvie2007" endterm="biblio.chauvie2007.abbrev" />
 …
 <itemizedlist spacing="compact">
   <listitem><para>
     Elastic scattering (two complementary models available depending on energy range)
+    Elastic scattering (two complementary models available depending on energy range, and one alternative model)
     <itemizedlist spacing="compact">
       <listitem><para>
+        Cross section policy class name, common to both models :
+        G4CrossSectionElasticScreenedRutherford
+      </para></listitem>
+      <listitem><para>
+        Final state policy class names : G4FinalStateElasticScreenedRutherford
+        or  G4FinalStateElasticBrennerZaider
+        - 1) either : cross section policy class names : G4CrossSectionElasticScreenedRutherfordLE (below 200 eV)
+        and G4CrossSectionElasticScreenedRutherfordHE (above 200 eV). Both should be used together.
+        - 2) or : cross section policy class name : G4CrossSectionElasticChampion.
+      </para></listitem>
+      <listitem><para>
+        - 1) either : final state policy class names : G4FinalStateElasticBrennerZaider (corresponding to G4CrossSectionElasticScreenedRutherfordLE)
+        and G4CrossSectionElasticScreenedRutherfordLE (corresponding to G4CrossSectionElasticScreenedRutherfordHE).
+        - 2) or final state policy class name : G4FinalStateElasticChampion (corresponding to G4CrossSectionElasticChampion).
       </para></listitem>
     </itemizedlist>
 …
 #include "G4FinalStateExcitationEmfietzoglou.hh"
+#include "G4CrossSectionElasticScreenedRutherford.hh"
+#include "G4CrossSectionElasticScreenedRutherfordLE.hh"
+#include "G4FinalStateElasticBrennerZaider.hh"
+#include "G4CrossSectionElasticScreenedRutherfordHE.hh"
 #include "G4FinalStateElasticScreenedRutherford.hh"
+#include "G4FinalStateElasticBrennerZaider.hh"
+#include "G4CrossSectionElasticChampion.hh"
+#include "G4FinalStateElasticChampion.hh"
 #include "G4CrossSectionExcitationBorn.hh"
 …
 // Processes definition
+typedef G4DNAProcess&lt;G4CrossSectionElasticScreenedRutherford,G4FinalStateElasticScreenedRutherford&gt;
+  ElasticScreenedRutherford;
+typedef G4DNAProcess&lt;G4CrossSectionElasticScreenedRutherford,G4FinalStateElasticBrennerZaider&gt;
+  ElasticBrennerZaider;
+typedef G4DNAProcess&lt;G4CrossSectionElasticScreenedRutherfordLE,G4FinalStateElasticBrennerZaider&gt;
+  ElasticScreenedRutherfordLE;
+typedef G4DNAProcess&lt;G4CrossSectionElasticScreenedRutherfordHE,G4FinalStateElasticScreenedRutherford&gt;
+  ElasticScreenedRutherfordHE;
+typedef G4DNAProcess&lt;G4CrossSectionElasticChampion,G4FinalStateElasticChampion&gt;
+  ElasticChampion;
 typedef G4DNAProcess&lt;G4CrossSectionExcitationEmfietzoglou,G4FinalStateExcitationEmfietzoglou&gt;
   ExcitationEmfietzoglou;
 …
     if (particleName == "e-") {
+       processManager-&gt;AddDiscreteProcess(new ExcitationEmfietzoglou);
+       processManager-&gt;AddDiscreteProcess(new ElasticScreenedRutherford);
+       processManager-&gt;AddDiscreteProcess(new ElasticBrennerZaider);
+       processManager-&gt;AddDiscreteProcess(new IonisationBorn);
+       processManager-&gt;AddDiscreteProcess(new ExcitationEmfietzoglou("ExcitationEmfietzoglou"));
+       // The two following elastic scattering models should be registered together
+       processManager-&gt;AddDiscreteProcess(new ElasticScreenedRutherfordLE("ElasticScreenedRutherfordLE"));
+       processManager-&gt;AddDiscreteProcess(new ElasticScreenedRutherfordHE("ElasticScreenedRutherfordHE"));
+       // The following process is commented here because it is ALTERNATIVE to ElasticScreenedRutherfordLE and ElasticScreenedRutherfordHE
+       // It should NOT be registered simultaneously with ElasticScreenedRutherfordLE and ElasticScreenedRutherfordHE
+       // processManager-&gt;AddDiscreteProcess(new ElasticChampion("ElasticChampion"));
+       processManager-&gt;AddDiscreteProcess(new IonisationBorn("IonisationBorn"));
     } else if ( particleName == "proton" ) {
        processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen);
        processManager-&gt;AddDiscreteProcess(new ExcitationBorn);
        processManager-&gt;AddDiscreteProcess(new IonisationRudd);
        processManager-&gt;AddDiscreteProcess(new IonisationBorn);
        processManager-&gt;AddDiscreteProcess(new ChargeDecrease);
+       processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen("ExcitationMillerGreen"));
+       processManager-&gt;AddDiscreteProcess(new ExcitationBorn("ExcitationBorn"));
+       processManager-&gt;AddDiscreteProcess(new IonisationRudd("IonisationRudd"));
+       processManager-&gt;AddDiscreteProcess(new IonisationBorn("IonisationBorn"));
+       processManager-&gt;AddDiscreteProcess(new ChargeDecrease("ChargeDecrease"));
     } else if ( particleName == "hydrogen" ) {
        processManager-&gt;AddDiscreteProcess(new IonisationRudd);
        processManager-&gt;AddDiscreteProcess(new ChargeIncrease);
+       processManager-&gt;AddDiscreteProcess(new IonisationRudd("IonisationRudd"));
+       processManager-&gt;AddDiscreteProcess(new ChargeIncrease("ChargeIncrease"));
     } else if ( particleName == "alpha" ) {
        processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen);
        processManager-&gt;AddDiscreteProcess(new IonisationRudd);
        processManager-&gt;AddDiscreteProcess(new ChargeDecrease);
+       processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen("ExcitationMillerGreen"));
+       processManager-&gt;AddDiscreteProcess(new IonisationRudd("IonisationRudd"));
+       processManager-&gt;AddDiscreteProcess(new ChargeDecrease("ChargeDecrease"));
     } else if ( particleName == "alpha+" ) {
        processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen);
        processManager-&gt;AddDiscreteProcess(new IonisationRudd);
        processManager-&gt;AddDiscreteProcess(new ChargeDecrease);
        processManager-&gt;AddDiscreteProcess(new ChargeIncrease);
+       processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen("ExcitationMillerGreen"));
+       processManager-&gt;AddDiscreteProcess(new IonisationRudd("IonisationRudd"));
+       processManager-&gt;AddDiscreteProcess(new ChargeDecrease("ChargeDecrease"));
+       processManager-&gt;AddDiscreteProcess(new ChargeIncrease("ChargeIncrease"));
     } else if ( particleName == "helium" ) {
        processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen);
        processManager-&gt;AddDiscreteProcess(new IonisationRudd);
        processManager-&gt;AddDiscreteProcess(new ChargeIncrease);
+       processManager-&gt;AddDiscreteProcess(new ExcitationMillerGreen("ExcitationMillerGreen"));
+       processManager-&gt;AddDiscreteProcess(new IonisationRudd("IonisationRudd"));
+       processManager-&gt;AddDiscreteProcess(new ChargeIncrease("ChargeIncrease"));
+    }
 …
       <mediaobject>
         <imageobject role="fo">
           <imagedata fileref="./AllResources/TrackingAndPhysics/physicsProcessPARAM.src/ComponentsWithRegion.gif"
+          <imagedata fileref="./AllResources/TrackingAndPhysics/physicsProcessPARAM.src/ComponentsWithRegion.jpg"
                      format="JPG" contentwidth="7.0cm" align="center" />
         </imageobject>
         <imageobject role="html">
           <imagedata fileref="./AllResources/TrackingAndPhysics/physicsProcessPARAM.src/ComponentsWithRegion.gif"
+          <imagedata fileref="./AllResources/TrackingAndPhysics/physicsProcessPARAM.src/ComponentsWithRegion.jpg"
                      format="JPG" align="center" />
         </imageobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/TrackingAndPhysics/physicsTable.xml

-              r904
+              r921
 event loop, the <literal>BuildPhysicsTable()</literal> method of
 <emphasis>G4VProcess</emphasis> is invoked for all processes and
 cross section tables are prepared. "Standard" electromagnetic
 processes calculate cross section and/or energy loss values for
+as a part of initialisation procedure cross section tables are prepared.
+Energy loss processes calculate cross section and/or energy loss values for
 each material and for each production cut value assigned to each
 material. A change in production cut values therefore require these
 cross sections to be re-calculated. Cross sections for hadronic
 processes do not depend on the production cut.
+processes and gamma processes do not depend on the production cut.
 </para>
 …
 <emphasis>G4PhysicsVector</emphasis> (and derived classes), each of which has
 cross section values for a particle within a given energy range
+traveling in a material.
+traveling in a material. By default the linear interpolation is used, alternatively
+spline may be used if the flag
+of spline is activated by <emphasis>SetSpline</emphasis> method of the
+<emphasis>G4PhysicsVector</emphasis>
 </para>
 …
 <para>
 Calculated physics tables for "Standard" electromagnetic processes
+Calculated physics tables for electromagnetic processes
 can be stored in files. The user may thus eliminate the time
 required for the calculation of physics tables by retrieving them

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Visualization/commandcontrol.xml

-              r905
+              r921
 <!--  [History]                                               -->
 <!--    Converted to DocBook: Katsuya Amako, Aug-2006         -->
+<!--    Added Qt Info: Laurent Garnier, Dec-2008              -->
 <!--                                                          -->
 <!-- ******************************************************** -->
 …
     </para>
   </para></listitem>
+  <listitem><para>
+    <emphasis role="bold">Additional note 2</emphasis>
+    <para>
+    Events may be kept and reviewed at end of run with
+    <programlisting>
+    Idle&gt; /vis/reviewKeptEvents
+    </programlisting>
+    Keep all events with
+    <programlisting>
+    Idle&gt; /vis/scene/endOfEventAction accumulate [maxNumber]
+    </programlisting>
+    (see
+    <xref linkend="sect.VisCntCmmd.EndEvtRun" />)
+    </para><para>
+    or keep some chosen subset with
+    <programlisting>
+    G4EventManager::GetEventManager()->KeepTheCurrentEvent();
+    </programlisting>
+    as described in
+    <xref linkend="programlist_OptUAct_1" />.
+    </para><para>
+    To suppress drawing during a run
+    <programlisting>
+    Idle&gt; /vis/disable
+    Idle&gt; /run/beamOn 10000
+    </programlisting>
+    then at end of run
+    <programlisting>
+    Idle&gt; /vis/enable
+    Idle&gt; /vis/reviewKeptEvents
+    </programlisting>
+    </para>
+  </para></listitem>
 </itemizedlist>
 …
 End of Event Action and End of Run Action:
 <literal>/vis/viewer/endOfEventAction</literal> and
 <literal>/vis/viewer/endOfEventAction</literal> commands
+<literal>/vis/viewer/endOfRunAction</literal> commands
 </title>
 …
 <para>
 The WIRED3 HepRep Browser and WIRED4 JAS Plug-In can generate a
+The HepRApp HepRep Browser and WIRED4 JAS Plug-In can generate a
 wide variety of bitmap and vector output formats including
 PostScript and PDF.
 …
     </para>
   </para></listitem>
+  <listitem><para>
+    <ulink url="./Visualization/visTutor/exN03Vis15_mac.html">
+    exN03Vis15.mac:</ulink>
+    <para>
+    A basic macro for visualization of detector geometry and events
+    using Qt.
+    </para>
+  </para></listitem>
+  <listitem><para>
+   <listitem><para>
     <ulink url="./Visualization/visTutor/exN03Tree0_mac.html">
     exN03Tree0.mac:</ulink>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Visualization/introduction.xml

-              r905
+              r921
 <!--    Proof read by: Joe Chuma,  5-Jul-1999                 -->
 <!--    Converted to DocBook: Katsuya Amako, Aug-2006         -->
+<!--    Added Qt Info: Laurent Garnier, Dec-2008              -->
+<!--    Updates for Qt and HepRApp: Joseph Perl, Dec-2008     -->
 <!--                                                          -->
 <!-- ******************************************************** -->
 …
 graphics systems use a graphics library compiled with Geant4, such
 as OpenGL, Qt, while others involve a separate application, such as
 WIRED or DAWN.
+HepRApp or DAWN.
 </para>
 …
       </para></listitem>
       <listitem><para>
+        Uses GL libraries that are already included on most Linux
+        systems (plus some Windows availability)
+        Requires addition of GL libraries that are freely avialable for all operating systems (and pre-installed on many)
       </para></listitem>
       <listitem><para>
 …
       </para></listitem>
       <listitem><para>
         Limited printing ability (pixel graphics, not vector graphics)
+        Print to EPS (vector and pixel graphics)
       </para></listitem>
     </itemizedlist>
 …
       </para></listitem>
       <listitem><para>
         Uses Qt and GL libraries that are already included on most Linux
         systems (plus some Windows availability)
+        Requies addition of Qt and GL libraries that are freely available on most operating
+        systems
       </para></listitem>
       <listitem><para>
 …
       </para></listitem>
       <listitem><para>
         Make movies interactively
+        Easy interface to make movies
       </para></listitem>
     </itemizedlist>
 …
   </para></listitem>
   <listitem><para>
+    HepRep/WIRED
+    <itemizedlist spacing="compact">
+      <listitem><para>
+        Create a file to view in the WIRED3 HepRep Browser or the
+        WIRED4 JAS Plugin
+      </para></listitem>
+      <listitem><para>
+        Requires WIRED browser (a Java application easily to install on
+        all operating systems)
+    HepRep
+    <itemizedlist spacing="compact">
+      <listitem><para>
+        Create a file to view in a HepRep browser such as HepRApp,
+        FRED or WIRED4
+      </para></listitem>
+      <listitem><para>
+        Requires a HepRep browser (above options work on any operating system)
       </para></listitem>
       <listitem><para>
 …
   <listitem><para>
     If you want very responsive photorealistic graphics plus more
     interactivity (and have the OpenInventor libraries installed)
     <itemizedlist spacing="compact">
       <listitem><para>
         OpenInventor is a good solution
+    interactivity (and have the OpenInventor or Qt libraries installed)
+    <itemizedlist spacing="compact">
+      <listitem><para>
+        OpenInventor or Qt are good solutions
       </para></listitem>
     </itemizedlist>
 …
     <itemizedlist spacing="compact">
       <listitem><para>
         HepRep/WIRED will meet your needs
+        HepRep will meet your needs
       </para></listitem>
     </itemizedlist>
 …
     <itemizedlist spacing="compact">
       <listitem><para>
         HepRep/WIRED
+        HepRep
       </para></listitem>
       <listitem><para>
 …
     <xref linkend="sect.VisPlylMrkTxt" />
     Polylines, Markers and Text
+  </para></listitem>
+  <listitem><para>
+    <xref linkend="sect.MkMovie" />
+    Making a Movie
   </para></listitem>
 </itemizedlist>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Visualization/makingamovie.xml

-              r904
+              r921
 <!--  [History]                                               -->
 <!--    Converted to DocBook: Katsuya Amako, Aug-2006         -->
+<!--    Updates for Qt: Laurent Garnier, Dec-2008             -->
 <!--                                                          -->
 <!-- ******************************************************** -->
 …
 drivers currently capable of producing picture files are:
+<ulink url="http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html">More informations about MPEG encoder</ulink>
 <informaltable>
   <tgroup cols="2">
 …
       <entry>
         eps
+      </entry>
+    </row>
+    <row>
+      <entry>
+        Qt
+      </entry>
+      <entry>
+        jpeg, eps, ppm, ...
       </entry>
     </row>
 …
 </sect2>
+<!-- ******************* Section (Level#2) ****************** -->
+<sect2 id="sect.MkMovie.Qt">
+<title>
+Qt
+</title>
+<para>
+The Qt driver provides one of the easiest ways to make a movie.
+Of course, you first need to add the Qt libraries and link with Qt,
+but once you have that, Qt provides a ready-made function to store all updates of the OpenGL
+frame into the movie format.
+You then use loops (as defined in OGLX section above) or even move/rotate/zoom you scene
+by mouse actions to form your movie.
+</para>
+<para>
+The Qt driver automatically handles all of the movie-making steps described in the OGLX section of this document - storing the files, converting them and assembling the finished movie.
+You just have to take care of installing an mpeg_encoder.
+</para>
+<para>
+To make a movie :
+<itemizedlist spacing="compact">
+  <listitem><para>
+   Right click to display a context menu, "Action"->"Movie parameters".
+  </para></listitem>
+  <listitem><para>
+   Select MPEG encoder path if it was not found.
+  </para></listitem>
+  <listitem><para>
+   Select the name of the output movie.
+  </para></listitem>
+  <listitem><para>
+   Let go! Hit SPACE to Start/Pause recording, RETURN to STOP
+  </para></listitem>
+</itemizedlist>
+</para>
+<para>
+Then, open your movie (on Mac, for example):
+<informalexample>
+<programlisting>
+open G4OpenGL.mpg
+</programlisting>
+</informalexample>
+opens a QuickTime player.
+</para>
+</sect2>
 <!-- ******************* Section (Level#2) ****************** -->

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Visualization/visdrivers.xml

-              r905
+              r921
 <!--    Changed by: Dennis Wright, 27-Nov-2001                -->
 <!--    Converted to DocBook: Katsuya Amako, Aug-2006         -->
+<!--    Updates for Qt and HepRApp: Joseph Perl, Dec-2008     -->
 <!--                                                          -->
 <!-- ******************************************************** -->
 …
     </entry>
     <entry>
       Linux, Unix, Mac with Xlib
+      Linux, UNIX, Mac with Xlib
     </entry>
   </row>
 …
     </entry>
     <entry>
       Linux, Unix, Mac, Windows
+      Linux, UNIX, Mac, Windows
     </entry>
   </row>
 …
     </entry>
     <entry>
       WIRED or FRED HepRep Browser
+      HepRApp, FRED or WIRED4 HepRep Browser
     </entry>
     <entry>
 …
     </entry>
     <entry>
       Linux, Unix, Mac, Windows
+      Linux, UNIX, Mac, Windows
     </entry>
   </row>
 …
 <para>
+If you don't have Motif, all control is done from Geant4
+Output can be exported to EPS (both vector and pixel graphics)
+using vis/ogl/printEPS.
+</para>
+<para>
+If you don't have Motif or Qt, all control is done from Geant4
 commands:
 …
 </programlisting>
 </informalexample>
+</para>
+<para>
+If you have Qt, see the Qt section below.
 </para>
 …
 <para>
+This driver have been developed by Laurent Garnier (IN2P3, LAL Orsay).
+It is an interface to the powerful toolkit Qt, now free on lot of
+platforms. This driver needs OpenGL library to be install. It is well suited for
+real-time fast visualization and demonstration. Fast visualization
+is realized with hardware acceleration, reuse of shapes stored in a
+This driver has been developed by Laurent Garnier (IN2P3, LAL Orsay).
+It is an interface to the powerful application framework, Qt, now free on most
+platforms. This driver also requires the OpenGL library.
+</para><para>
+The Qt driver 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. All OpenGL
 features are implements in Qt driver . In addition, mouse events control
+are used to rotation/move/zoom volume, you can save your scene in lots
+of formats (vector or not), make movies...
+features are implemented in the Qt driver, but one also gets mouse
+control of rotation/translation/zoom, the ability to save your scene in many formats
+(both vector and pixel graphics) and an easy interface for making movies.
 </para><para>
-There is only one session of Qt driver for all available platform.
 Two display modes are available: immediate mode and stored mode.
 The former has no limitation on data size, and the latter is fast
 …
 <para>
 To see the visualization window :
+</para>
 <?soft-pagebreak ?>
 <informalexample>
 <programlisting>
+     /vis/open OGLSQt
+     /vis/open OGLSQt  (for Stored mode)
+or
+     /vis/open OGLIQt  (for Immediate mode)
 </programlisting>
 </informalexample>
 …
   </para></listitem>
   <listitem><para>
     <ulink url="http://geant4.slac.stanford.edu/Presentations/vis/G4OpenGLTutorial/G4OpenGLTutorial.html">
+    <ulink url="http://users.lal.in2p3.fr/garnier/G4QtTutorial.html">
     Geant4 Visualization Tutorial
     </ulink>
 …
   </para></listitem>
 </itemizedlist>
+</para>
 </sect2>
 …
 The HepRepFile driver creates a HepRep XML file in the HepRep1
 format suitable for viewing with the
 <ulink url="http://www.slac.stanford.edu/BFROOT/www/Computing/Graphics/Wired/">
 WIRED3</ulink> HepRep Browser.
+<ulink url="http://www.slac.stanford.edu/~perl/HepRApp/">
+HepRApp</ulink> HepRep Browser.
 </para>
 …
 <para>
 View the file using the WIRED3 HepRep Browser, available from:
 </para>
 <para>
 <ulink url="http://www.slac.stanford.edu/BFROOT/www/Computing/Graphics/Wired/">
 http://www.slac.stanford.edu/BFROOT/www/Computing/Graphics/Wired/
+View the file using the HepRApp HepRep Browser, available from:
+</para>
+<para>
+<ulink url="http://www.slac.stanford.edu/~perl/HepRApp/">
+http://www.slac.stanford.edu/~perl/HepRApp/
 </ulink>
+.
 …
 <para>
 WIRED3 allows you to pick on volumes, trajectories and hits to
+HepRApp allows you to pick on volumes, trajectories and hits to
 find out their associated HepRep Attributes, such as volume name,
 particle ID, momentum, etc. These same attributes can be displayed
 …
 <para>
 WIRED3 can read heprep files in zipped format as well as
+HepRApp can read heprep files in zipped format as well as
 unzipped, so you can save space by applying gzip to the heprep
 file. This will reduce the file to about five percent of its
 …
 <itemizedlist spacing="compact">
   <listitem><para>
     WIRED3 Users Home Page:
+    HepRApp Users Home Page:
     <para>
     <ulink url="http://www.slac.stanford.edu/BFROOT/www/Computing/Graphics/Wired/">
     http://www.slac.stanford.edu/BFROOT/www/Computing/Graphics/Wired/
+    <ulink url="http://www.slac.stanford.edu/~perl/HepRApp/">
+    http://www.slac.stanford.edu/~perl/HepRApp/
     </ulink>
+    .
 …
   </para></listitem>
   <listitem><para>
     Geant4 Visualization Tutorial using the WIRED3 HepRep Browser
+    Geant4 Visualization Tutorial using the HepRApp HepRep Browser
     <para>
     <ulink url="http://geant4.slac.stanford.edu/Presentations/vis/G4WIREDTutorial/G4WIREDTutorial.html">
     http://geant4.slac.stanford.edu/Presentations/vis/G4WIREDTutorial/G4WIREDTutorial.html
+    <ulink url="http://geant4.slac.stanford.edu/Presentations/vis/G4HepRAppTutorial/G4HepRAppTutorial.html">
+    http://geant4.slac.stanford.edu/Presentations/vis/G4HepRAppTutorial/G4HepRAppTutorial.html
     </ulink>
     </para>
 …
     <mediaobject>
       <imageobject role="fo">
         <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnp.gif"
+        <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnp.jpg"
                    format="JPG" contentwidth="12.0cm" align="center" />
       </imageobject>
       <imageobject role="html">
         <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnp.gif"
+        <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnp.jpg"
                    format="JPG" align="center" />
         </imageobject>
 …
     <mediaobject>
       <imageobject role="fo">
         <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnpfind.gif"
+        <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnpfind.jpg"
                    format="JPG" contentwidth="12.0cm" align="center" />
       </imageobject>
       <imageobject role="html">
         <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnpfind.gif"
+        <imagedata fileref="./AllResources/Visualization/visualization.src/xmlnpfind.jpg"
                    format="JPG" align="center" />
       </imageobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Visualization/visexecutable.xml

r905	r921
3	3	<!-- [History] -->
4	4	<!-- Converted to DocBook: Katsuya Amako, Aug-2006 -->
	5	<!-- Updates for Qt: Laurent Garnier, Dec-2008 -->
5	6	<!-- -->
6	7	<!-- ******************************************************** -->

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/XSLCustomizationLayer/G4XSLCustomFO.xsl

r904	r921
10	10	<!-- Import the FO stylesheet -->
11	11	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
12		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/fo/docbook.xsl"~~/>
	12	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl" />
13	13
14	14	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/XSLCustomizationLayer/G4XSLCustomHTML.xsl

r904	r921
9	9	<!-- Import the stylesheet to chunk the html output -->
10	10	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
11		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/~~html/chunk.xsl" />
	11	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl" />
12	12
13	13	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/BookForToolDev.xml

-              r904
+              r921
   </authorgroup>
   <pubdate>14 December, 2007</pubdate>
   <releaseinfo>Version: geant4 9.1</releaseinfo>
+  <pubdate>19 December, 2008</pubdate>
+  <releaseinfo>Version: geant4 9.2</releaseinfo>
 </bookinfo>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/GuideToExtendFunctionality/HadronicPhysics/hadronics.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level1.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level1.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level1.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level1.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_1.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_1.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_1.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_1.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_2.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_2.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_2.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_2.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_3.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_3.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_3.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level2_3.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level3_1.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level3_1.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level3_1.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level3_1.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_1.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_1.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_1.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_1.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_2.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_2.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_2.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level4_2.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level5_1.gif"
                format="GIF" align="center" contentwidth="10.0cm" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level5_1.jpg"
+               format="JPG" align="center" contentwidth="10.0cm" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level5_1.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/HadronicPhysics/Level5_1.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/GuideToExtendFunctionality/Particles/particles.xml

-              r904
+              r921
 Particle properties can be overridden with the method
 <informalexample><programlisting>
 G4bool SetParticleProperty(const G4ParticlePropertyData& newProperty)
+G4bool SetParticleProperty(const G4ParticlePropertyData&amp; newProperty)
 </programlisting></informalexample>
 by setting new values in <emphasis> G4ParticlePropertyData </emphasis>.
 …
   G4Monopole(
        const G4String&     aName,        G4double            mass,
+       const G4String&amp;     aName,        G4double            mass,
        G4double            width,        G4double            charge,
        G4int               iSpin,        G4int               iParity,
        G4int               iConjugation, G4int               iIsospin,
        G4int               iIsospin3,    G4int               gParity,
        const G4String&     pType,        G4int               lepton,
+       const G4String&amp;     pType,        G4int               lepton,
        G4int               baryon,       G4int               encoding,
        G4bool              stable,       G4double            lifetime,

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/GuideToExtendFunctionality/Visualization/visualization.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/Visualization/visClassDiagram.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/Visualization/visClassDiagram.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/GuideToExtendFunctionality/Visualization/visClassDiagram.gif"
                format="GIF" align="center" scale="110" />
+    <imagedata fileref="./AllResources/GuideToExtendFunctionality/Visualization/visClassDiagram.jpg"
+               format="JPG" align="center" scale="110" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/ChapDsgnFunc.xml

r904	r921
31	31	&sectDsgnFuncVisualization;
32	32	&sectDsgnFuncUserInterface;
	33
33	34	</chapter>
34	35

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/ElectromagneticField/electroMagneticField.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/ElectromagneticField/field-prop.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/ElectromagneticField/field-prop.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/ElectromagneticField/field-prop.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/ElectromagneticField/field-prop.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Event/event.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventManager.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventManager.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventManager.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventManager.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventGen.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventGen.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventGen.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Event/classDgmEventGen.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Geometry/geometry.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/overall.gif" format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/overall.jpg" format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/overall.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/overall.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/smart_voxels.gif" format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/smart_voxels.jpg" format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/smart_voxels.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/smart_voxels.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/navigator.gif" format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/navigator.jpg" format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/navigator.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Geometry/navigator.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/GlobalUsage/globalUsage.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/classDgmRandom.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/classDgmRandom.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/classDgmRandom.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/classDgmRandom.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagStat.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagStat.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagStat.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagStat.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagDist.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagDist.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagDist.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagDist.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagEng.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagEng.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagEng.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/GlobalUsage/ObjDiagEng.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Hit/hit.xml

-              r904
+              r921
   <imageobject role="fo">
     <imagedata
 fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitMain.gif" format="GIF" contentwidth="10.0cm"  align="center" />
+fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitMain.jpg" format="JPG" contentwidth="10.0cm"  align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitMain.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitMain.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
   <imageobject role="fo">
     <imagedata
 fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitUser.gif" format="GIF"
+fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitUser.jpg" format="JPG"
 contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitUser.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmHitUser.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmReadoutGeom.gif" format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmReadoutGeom.jpg" format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmReadoutGeom.gif" format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Hit/classDgmReadoutGeom.jpg" format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Materials/materials.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Materials/classDgmMaterials.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Materials/classDgmMaterials.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Materials/classDgmMaterials.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Materials/classDgmMaterials.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Particles/particles.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticlesMain.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticlesMain.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticlesMain.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticlesMain.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleTable.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleTable.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleTable.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleTable.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleDecay.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleDecay.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleDecay.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Particles/classDgmParticleDecay.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/PhysicsProcesses/physicsProcesses.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessMain.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessMain.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessMain.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessMain.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>
 …
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessProcesses.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessProcesses.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessProcesses.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/PhysicsProcesses/classDgmProcessProcesses.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/Tracking/tracking.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Tracking/classDgmTracking.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Tracking/classDgmTracking.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/Tracking/classDgmTracking.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/Tracking/classDgmTracking.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/OOAnalysisDesign/UserInterface/userInterface.xml

-              r904
+              r921
 <mediaobject>
   <imageobject role="fo">
     <imagedata fileref="./AllResources/OOAnalysisDesign/UserInterface/classDgmUserInterface.gif"
                format="GIF" contentwidth="10.0cm" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/UserInterface/classDgmUserInterface.jpg"
+               format="JPG" contentwidth="10.0cm" align="center" />
   </imageobject>
   <imageobject role="html">
     <imagedata fileref="./AllResources/OOAnalysisDesign/UserInterface/classDgmUserInterface.gif"
                format="GIF" align="center" />
+    <imagedata fileref="./AllResources/OOAnalysisDesign/UserInterface/classDgmUserInterface.jpg"
+               format="JPG" align="center" />
   </imageobject>
 </mediaobject>

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/XSLCustomizationLayer/G4XSLCustomFO.xsl

r904	r921
10	10	<!-- Import the FO stylesheet -->
11	11	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
12		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/fo/docbook.xsl"~~/>
	12	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl" />
13	13
14	14	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/ForToolkitDeveloper/xml/XSLCustomizationLayer/G4XSLCustomHTML.xsl

r904	r921
9	9	<!-- Import the stylesheet to chunk the html output -->
10	10	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
11		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/~~html/chunk.xsl" />
	11	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl" />
12	12
13	13	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/InstallationGuide/xml/BookInstalGuide.xml

-              r904
+              r921
   </authorgroup>
   <pubdate>14 December, 2007</pubdate>
   <releaseinfo>Version: geant4 9.1</releaseinfo>
+  <pubdate>19 December, 2008</pubdate>
+  <releaseinfo>Version: geant4 9.2</releaseinfo>
 </bookinfo>

trunk/documents/UserDoc/DocBookUsersGuides/InstallationGuide/xml/Introduction/introduction.xml

-              r904
+              r921
   </para></listitem>
   <listitem><para>
+    <ulink url="http://www.trolltech.com">
+    Qt
+    </ulink>
+    , a powerfull toolkit
+  </para></listitem>
+  <listitem><para>
     <ulink url="http://oss.sgi.com/projects/inventor/">
     Open Inventor

trunk/documents/UserDoc/DocBookUsersGuides/InstallationGuide/xml/XSLCustomizationLayer/G4XSLCustomFO.xsl

r904	r921
10	10	<!-- Import the FO stylesheet -->
11	11	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
12		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/fo/docbook.xsl"~~/>
	12	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl" />
13	13
14	14	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/InstallationGuide/xml/XSLCustomizationLayer/G4XSLCustomHTML.xsl

r904	r921
9	9	<!-- Import the stylesheet to chunk the html output -->
10	10	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
11		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/~~html/chunk.xsl" />
	11	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl" />
12	12
13	13	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/IntroductionToGeant4/xml/BookIntroToGeant4.xml

-              r904
+              r921
   </authorgroup>
   <pubdate>14 December, 2007</pubdate>
   <releaseinfo>Version: geant4 9.1</releaseinfo>
+  <pubdate>19 December, 2008</pubdate>
+  <releaseinfo>Version: geant4 9.2</releaseinfo>
 </bookinfo>

trunk/documents/UserDoc/DocBookUsersGuides/IntroductionToGeant4/xml/XSLCustomizationLayer/G4XSLCustomFO.xsl

r904	r921
10	10	<!-- Import the FO stylesheet -->
11	11	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
12		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/fo/docbook.xsl"~~/>
	12	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl" />
13	13
14	14	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/documents/UserDoc/DocBookUsersGuides/IntroductionToGeant4/xml/XSLCustomizationLayer/G4XSLCustomHTML.xsl

r904	r921
9	9	<!-- Import the stylesheet to chunk the html output -->
10	10	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
11		<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/~~current/~~html/chunk.xsl" />
	11	<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl" />
12	12
13	13	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

trunk/examples/novice/N02/vis.mac

r893	r921
11	11	# (Edit the next line(s) to choose another graphics system)
12	12	#
13		/vis/open OGLIX 600x600+20+70
	13	/vis/open OGLIXm 600x400-100+30
	14	#/vis/open OGLIX
14	15	#
15	16	####/vis/open OGLSXm

trunk/examples/novice/N03/G4History.macro

-              r893
+              r921
 /run/verbose 2
 /vis/scene/create
 /vis/open OGLIQt
 /vis/sceneHandler/create OGLIQt
+/vis/open OGLSQt
+/vis/sceneHandler/create OGLSQt
 /vis/sceneHandler/attach
 /vis/viewer/create ! ! 600
 …
 /vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
 /vis/scene/endOfEventAction accumulate
+/gun/energy 1 GeV
+/run/beamOn 1

trunk/examples/novice/N03/vis.mac

-              r893
+              r921
+#
 # Use this open statement instead for OpenGL in immediate mode.
+#/vis/open OGLIX
+/vis/open OGLIQt
+#/vis/open OGLSWin32
+/vis/open OGLSQt
+#/vis/open/OIX
+#
 # Use this open statement instead to get a HepRep version 1 file

trunk/examples/novice/N03/visTutor/exN03Vis10.mac

r483	r921
8	8	# CONTENTS: A basic macro for demonstrating Inventor driver #
9	9	# #
10		# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis~~6.mac~~ #
	10	# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis10.mac #
11	11	# #
12	12	# REQUIRED PLATFORMS & SOFTWARES: Windows, #

trunk/examples/novice/N03/visTutor/exN03Vis11.mac

r474	r921
58	58	#
59	59	/vis/viewer/reset
	60	/vis/viewer/scale 1 1 2
60	61	/vis/viewer/set/viewpointThetaPhi 20 70
61	62	/vis/viewer/zoom 0.8

trunk/examples/novice/N03/visTutor/exN03Vis12.mac

r609	r921
8	8	# CONTENTS: A basic macro for demonstrating time slicing #
9	9	# #
10		# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis12.mac #
	10	# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis12.mac #
11	11	# #
12	12	# REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL #

trunk/examples/novice/N03/visTutor/exN03Vis13.mac

r483	r921
8	8	# CONTENTS: Time development of an electrmagnetic shower. #
9	9	# #
10		# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis1~~2.mac~~ #
	10	# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis13.mac #
11	11	# #
12	12	# REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL #

trunk/examples/novice/N03/visTutor/exN03Vis14.mac~

-              r888
+              r921
 ###########################################
 # Invoke the OGLSQT driver
 /vis/open OGLSQT
+# Invoke the OGLSQt driver
+/vis/open OGLSQt
 # Bird's-eye view of the detector geometry

trunk/examples/novice/N03/visTutor/exN03Vis15.mac

-              r887
+              r921
 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
 #                                                                     #
+#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
+#                                  HEPVis                             #
+#                                  Inventor (TGS or SoFree)           #
+#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL ,Qt  #
 #                                                                     #
 #  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
 #  (See geant4/source/visualization/README for details.)              #
 #                                                                     #
 #    % setenv G4VIS_BUILD_OIX_DRIVER       1                          #
+#    % setenv G4VIS_BUILD_OGLQT
 #                                                                     #
 #  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
 #  (See geant4/source/visualization/README for details.)              #
 #                                                                     #
 #    % setenv G4VIS_USE_OIQT               1                          #
+#    % setenv G4VIS_USE_OGLQT               1                          #
 #                                                                     #
 #  ADDITIONAL NOTES:                                                  #
 …
 /vis/scene/create
 # Invoke the OpenInventor driver
 /vis/sceneHandler/create OGLIQt
+# Invoke the Qt driver
+/vis/sceneHandler/create OGLSQt
 /vis/viewer/create
 …
 # Bird-eye view of events
 /vis/viewer/reset
 /vis/viewer/set/viewpointThetaPhi   45 45
+/vis/viewer/set/viewpointThetaPhi 45 45
 /vis/scene/notifyHandlers
 /control/verbose 2
-#######################################################################
-#   Controls on an Inventor examiner viewer are :                     #
-#  - in picking mode (cursor is the upper left arrow)                 #
-#   Ctrl + pick a volume : see daughters.                             #
-#   Shift + pick a volume : see mother.                               #
-#  - in viewing mode (cursor is the hand)                             #
-#   Left-button + pointer move : rotate.                              #
-#   Ctrl+Left-button + pointer move : pane.                           #
-#   Ctrl+Shift+Left-button + pointer move : scale.                    #
-#   Middle-button + pointer move : pane.                              #
-#                                                                     #
-#######################################################################
 /vis/viewer/update

trunk/examples/novice/N03/visTutor/exN03Vis15.mac~

-              r888
+              r921
 #######################################################################
 #  MACRO FILE NAME: exN03Vis12.mac                                     #
+#  MACRO FILE NAME: exN03Vis15.mac                                    #
 #                                                                     #
 #  AUTHOR(S): Laurent Garnier                                         #
 …
 #  CONTENTS: A basic macro for demonstrating Inventor driver          #
 #                                                                     #
 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
+#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis15.mac            #
 #                                                                     #
 #  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
 …
 # Invoke the OpenInventor driver
 /vis/sceneHandler/create OGLIQT
+/vis/sceneHandler/create OGLIQt
 /vis/viewer/create

trunk/examples/novice/N03/visTutor/exN03Vis5.mac

-              r474
+              r921
 #  CONTENTS: A basic macro for demonstrating Inventor driver          #
 #                                                                     #
 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis6.mac             #
+#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis5.mac             #
 #                                                                     #
 #  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,     #
 …
 # Name of the gaps = name of their material (liquidArgon) !
 #/vis/scene/add/volume liquidArgon
 #/vis/scene/add/trajectories
+/vis/scene/add/trajectories
 /tracking/storeTrajectory 1

trunk/examples/novice/N03/visTutor/exN03Vis6.mac

r474	r921
15	15	# USAGE: % gmake visclean #
16	16	# % $G4BINDIR/exampleN03 #
17		# Idle> /control/execute visTutor/exN03Vis7.mac #
	17	# Idle> /control/execute visTutor/exN03Vis6.mac #
18	18	# #
19	19	# REQUIRED PLATFORMS & SOFTWARES: Unix, X-window, #

trunk/examples/novice/N03/visTutor/exN03Vis7.mac

r474	r921
13	13	# % make visclean #
14	14	# % $G4BINDIR/exampleN03 #
15		# Idle> /control/execute visTutor/exN03Vis8.mac #
	15	# Idle> /control/execute visTutor/exN03Vis7.mac #
16	16	# Idle> exit #
17	17	# % gv g4_00.eps & #

trunk/examples/novice/N03/visTutor/exN03Vis8.mac

r474	r921
19	19	# % gmake visclean #
20	20	# % $G4BINDIR/exampleN03 #
21		# Idle> /control/execute visTutor/exN03Vis9.mac #
	21	# Idle> /control/execute visTutor/exN03Vis8.mac #
22	22	# Idle> exit #
23	23	# % gv g4_00.eps #

trunk/source/digits_hits/History

-              r850
+              r921
 $Id: History,v 1.33 2008/08/27 18:35:28 asaim Exp $
+$Id: History,v 1.36 2008/11/26 22:40:01 asaim Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Nov 26, 2008, M.Asai (digits_hits-V09-01-02)
+- Fixing an incorrect index number in G4ScoringMessenger.cc.
+Nov 14, 2008, M.Asai (digits_hits-V09-01-01)
+- Tag for release 9.2.
+- Introducing the cylindrical scoring mesh (G4ScoringCylinder and related class)
+- Introducing the log-scale color map (G4ScoreLogColorMap)
 Aug 27, 2008, M.Asai (digits_hits-V09-01-00)

trunk/source/geometry/magneticfield/History

-              r850
+              r921
 $Id: History,v 1.130 2008/04/24 12:40:50 gcosmo Exp $
+$Id: History,v 1.135 2008/11/21 21:16:11 gum Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+November, 19th, 2008  P.Gumplinger - field-V09-01-05
+- renormalize the spin to ONE in G4EqEMFieldWithSpin.cc and G4Mag_SpinEqRhs.cc
+November, 7th, 2008   P.Gumplinger - field-V09-01-04
+----------------------------------
+- Added SetAnomaly() and GetAnomaly() accessors to G4EqEMFieldWithSpin.
+October, 28th, 2008   T.Nikitina - field-V09-01-03
+--------------------------------
+- Added 'ApproxCurveV' to method G4ChordFinder::ApproxCurvePointS() in
+  order to better calculate the curve length.
+- Some code cleanup.
+September, 18th, 2008   T.Nikitina
+----------------------------------
+- Added new stepper class G4ConstRK4, performing integration of one step
+  with error calculation in constant magnetic field; implementation derived
+  from G4ClassicalRK4.
+July, 15th, 2008   J.Apostolakis - field-V09-01-02
+--------------------------------
+- Revised signature of G4ChordFinder::FinderNextChord(), making 'FieldTrack'
+  argument passed a reference.
+May, 28th, 2008   T.Nikitina
+----------------------------
+- G4ChordFinder: added new method ApproxCurvePointS() using Brent second order
+  location mechanism.
 April 24th, 2008   T.Nikitina - field-V09-01-01

trunk/source/geometry/magneticfield/include/G4CashKarpRKF45.hh

r850	r921
26	26	//
27	27	// $Id: G4CashKarpRKF45.hh,v 1.11 2008/01/11 15:23:54 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ChordFinder.hh

-              r850
+              r921
 //
 //
 // $Id: G4ChordFinder.hh,v 1.19 2008/07/15 14:02:06 japost Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ChordFinder.hh,v 1.21 2008/10/29 14:17:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 // class G4ChordFinder
 //
 // Class description:
+// Class G4ChordFinder
+//
+// class description:
 //
 // A class that provides RK integration of motion ODE  (as does g4magtr)
 …
 // History:
+// - 25.02.97 John Apostolakis,  design and implementation
+// - 05.03.97 V. Grichine , makeup to G4 'standard'
+// - 25.02.97 - John Apostolakis - Design and implementation
 // -------------------------------------------------------------------
 …
       virtual ~G4ChordFinder();
       G4double    AdvanceChordLimited( G4FieldTrack& yCurrent,
 …
         // -> Returns Length of Step taken.
+      G4FieldTrack ApproxCurvePointS(const  G4FieldTrack&  curveAPointVelocity,
+                                      const  G4FieldTrack&  curveBPointVelocity,
+                                      const  G4ThreeVector& currentEPoint,
+                                      const  G4ThreeVector& currentFPoint,
+                                      const  G4ThreeVector& PointG,
+                                             G4bool first,G4double      epsStep);
+      G4FieldTrack ApproxCurvePointS( const G4FieldTrack&  curveAPointVelocity,
+                                      const G4FieldTrack&  curveBPointVelocity,
+                                      const G4FieldTrack&  ApproxCurveV,
+                                      const G4ThreeVector& currentEPoint,
+                                      const G4ThreeVector& currentFPoint,
+                                      const G4ThreeVector& PointG,
+                                            G4bool first,  G4double epsStep);
       G4FieldTrack ApproxCurvePointV(const  G4FieldTrack&  curveAPointVelocity,
                                      const  G4FieldTrack&  curveBPointVelocity,
                                      const  G4ThreeVector& currentEPoint,
                                             G4double      epsStep);
+      G4FieldTrack ApproxCurvePointV( const G4FieldTrack&  curveAPointVelocity,
+                                      const G4FieldTrack&  curveBPointVelocity,
+                                      const G4ThreeVector& currentEPoint,
+                                            G4double       epsStep);
       inline G4double InvParabolic( const G4double xa, const G4double ya,
                                     const G4double xb, const G4double yb,
                              const G4double xc, const G4double yc );
+                                    const G4double xb, const G4double yb,
+                                    const G4double xc, const G4double yc );
       inline G4double  GetDeltaChord() const;
 …
         // A report with the above -- and possibly other stats
       inline G4int SetVerbose( G4int newvalue=1);
+       // Set verbosity and return old value
+        // Set verbosity and return old value
+      void SetFractions_Last_Next( G4double fractLast= 0.90,
+                                   G4double fractNext= 0.95 );
+        // Parameters for  performance ... change with great care
+      inline void SetFirstFraction(G4double fractFirst);
+        // Parameter for  performance ... change with great care
+   public:  // without description
+      void     TestChordPrint( G4int    noTrials,
+                               G4int    lastStepTrial,
+                               G4double dChordStep,
+                               G4double nextStepTrial );
+        //   Printing for monitoring ...
+      inline   G4double GetFirstFraction();         // Originally 0.999
+      inline   G4double GetFractionLast();          // Originally 1.000
+      inline   G4double GetFractionNextEstimate();  // Originally 0.980
+      inline   G4double GetMultipleRadius();        // No original value
+        //  Parameters for adapting performance ... use with great care
    protected:   // .........................................................
 …
                                 G4double  oldStepTrial,
                                 G4double  dChordStep);
+  public:  // no description
+      void     TestChordPrint( G4int    noTrials,
+                               G4int    lastStepTrial,
+                               G4double dChordStep,
+                               G4double nextStepTrial );
+        //   Printing for monitoring ...
+      inline   G4double GetFirstFraction();         // Originally 0.999
+      inline   G4double GetFractionLast();          // Originally 1.000
+      inline   G4double GetFractionNextEstimate();  // Originally 0.980
+      inline   G4double GetMultipleRadius();        // No original value
+       //  Parameters for adapting performance ... use with great care
+   public:  // with description
+      void     SetFractions_Last_Next( G4double fractLast= 0.90,
+                                       G4double fractNext= 0.95 );
+      //  Parameters for  performance ... change with great care
+      inline   void     SetFirstFraction(G4double fractFirst);
+      //  Parameter for  performance ... change with great care
+   protected:
       inline G4double GetLastStepEstimateUnc();
       inline void     SetLastStepEstimateUnc( G4double stepEst );
 …
    private:  // ............................................................
                                             // G4int    nOK, nBAD;
+                                          // G4int    nOK, nBAD;
       G4MagInt_Driver* fIntgrDriver;
       const G4double fDefaultDeltaChord;  // SET in G4ChordFinder.cc = 0.25 mm
+      G4double fDeltaChord;                        //  Maximum miss distance
+      G4double    fLastStepEstimate_Unconstrained; //  State information for efficiency
+      G4double fDeltaChord;               //  Maximum miss distance
+      G4double    fLastStepEstimate_Unconstrained;
+        //  State information for efficiency
       //  Variables used in construction/destruction
       G4bool fAllocatedStepper;
       G4EquationOfMotion* fEquation;

trunk/source/geometry/magneticfield/include/G4ChordFinder.icc

-              r850
+              r921
 //
 //
 // $Id: G4ChordFinder.icc,v 1.13 2008/05/28 09:20:03 tnikitin Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ChordFinder.icc,v 1.14 2008/10/29 14:34:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // G4ChordFinder inline implementations
 …
                        T = ya/yc;
         const G4double Q = (T-1)*(R-1)*(S-1);
         if (fabs(Q) <DBL_MIN ) return  DBL_MAX;
+        if (std::fabs(Q) <DBL_MIN ) return  DBL_MAX;
         const G4double P = S*(T*(R-T)*(xc-xb) - (1-R)*(xb-xa));

trunk/source/geometry/magneticfield/include/G4ChordFinderSaf.hh

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4ChordFinderSaf.hh,v 1.3 2006/06/29 18:21:52 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ChordFinderSaf.hh,v 1.4 2008/09/12 16:12:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   ~G4ChordFinderSaf();
   G4double FindNextChord( const  G4FieldTrack  yStart,
+  G4double FindNextChord( const  G4FieldTrack&  yStart,
                           G4double     stepMax,
                           G4FieldTrack&   yEnd,  // Endpoint

trunk/source/geometry/magneticfield/include/G4ClassicalRK4.hh

r850	r921
26	26	//
27	27	// $Id: G4ClassicalRK4.hh,v 1.10 2006/06/29 18:21:55 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4DELPHIMagField.hh

r850	r921
26	26	//
27	27	// $Id: G4DELPHIMagField.hh,v 1.4 2006/06/29 18:21:57 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ElectricField.hh

r850	r921
26	26	//
27	27	// $Id: G4ElectricField.hh,v 1.2 2006/06/29 18:21:59 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ElectroMagneticField.hh

r850	r921
26	26	//
27	27	// $Id: G4ElectroMagneticField.hh,v 1.11 2006/06/29 18:22:01 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4EqEMFieldWithSpin.hh

-              r850
+              r921
 //
 //
 // $Id: G4EqEMFieldWithSpin.hh,v 1.1 2007/08/30 23:34:01 gum Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EqEMFieldWithSpin.hh,v 1.3 2008/11/14 13:37:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 #include "G4EquationOfMotion.hh"
+#include "G4ElectroMagneticField.hh"
+class G4ElectroMagneticField;
 class G4EqEMFieldWithSpin : public G4EquationOfMotion
 …
     G4EqEMFieldWithSpin(G4ElectroMagneticField *emField );
     ~G4EqEMFieldWithSpin() {;}
+    ~G4EqEMFieldWithSpin();
     void  SetChargeMomentumMass(G4double particleCharge, // in e+ units
 …
       // calculates the value of the derivative dydx.
+    inline void SetAnomaly(G4double a) { anomaly = a; }
+    inline G4double GetAnomaly() const { return anomaly; }
+      // set/get magnetic anomaly
   private:
     G4double        fElectroMagCof ;
     G4double        fMassCof;
+    G4double fElectroMagCof ;
+    G4double fMassCof;
     G4double omegac;
 …
 };
 #endif
+#endif /* G4EQEMFIELDWITHSPIN */

trunk/source/geometry/magneticfield/include/G4EqMagElectricField.hh

r850	r921
26	26	//
27	27	// $Id: G4EqMagElectricField.hh,v 1.9 2006/06/29 18:22:03 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4EquationOfMotion.hh

r850	r921
26	26	//
27	27	// $Id: G4EquationOfMotion.hh,v 1.10 2006/06/29 18:22:05 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4EquationOfMotion.icc

r850	r921
26	26	//
27	27	// $Id: G4EquationOfMotion.icc,v 1.9 2006/06/29 18:22:07 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ErrorMag_UsualEqRhs.hh

r850	r921
26	26	//
27	27	// $Id: G4ErrorMag_UsualEqRhs.hh,v 1.1 2007/05/16 12:54:02 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ExactHelixStepper.hh

r850	r921
25	25	//
26	26	// $Id: G4ExactHelixStepper.hh,v 1.5 2007/05/18 12:50:31 tnikitin Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	//
29	29	//

trunk/source/geometry/magneticfield/include/G4ExplicitEuler.hh

r850	r921
26	26	//
27	27	// $Id: G4ExplicitEuler.hh,v 1.9 2006/06/29 18:22:11 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4Field.hh

r850	r921
26	26	//
27	27	// $Id: G4Field.hh,v 1.10 2006/06/29 18:22:13 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4FieldManager.hh

r850	r921
26	26	//
27	27	// $Id: G4FieldManager.hh,v 1.16 2006/06/29 18:22:15 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4FieldManager.icc

r850	r921
26	26	//
27	27	// $Id: G4FieldManager.icc,v 1.12 2006/06/29 18:22:18 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4FieldManagerStore.hh

r850	r921
26	26	//
27	27	// $Id: G4FieldManagerStore.hh,v 1.3 2008/01/17 09:39:08 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// class G4FieldManagerStore

trunk/source/geometry/magneticfield/include/G4FieldTrack.hh

r850	r921
26	26	//
27	27	// $Id: G4FieldTrack.hh,v 1.21 2006/11/13 18:24:35 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4FieldTrack.icc

r850	r921
26	26	//
27	27	// $Id: G4FieldTrack.icc,v 1.21 2006/11/13 18:24:35 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh

r850	r921
26	26	//
27	27	// $Id: G4HarmonicPolMagField.hh,v 1.4 2006/06/29 18:22:24 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// class G4HarmonicPolMagField

trunk/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh

r850	r921
26	26	//
27	27	// $Id: G4HelixExplicitEuler.hh,v 1.9 2007/08/21 08:52:00 tnikitin Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4HelixHeum.hh

r850	r921
26	26	//
27	27	// $Id: G4HelixHeum.hh,v 1.8 2006/06/29 18:22:36 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh

r850	r921
26	26	//
27	27	// $Id: G4HelixImplicitEuler.hh,v 1.8 2006/06/29 18:22:38 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh

r850	r921
26	26	//
27	27	// $Id: G4HelixSimpleRunge.hh,v 1.7 2006/06/29 18:22:41 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4ImplicitEuler.hh

r850	r921
26	26	//
27	27	// $Id: G4ImplicitEuler.hh,v 1.8 2006/06/29 18:22:44 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4LineCurrentMagField.hh

r850	r921
26	26	//
27	27	// $Id: G4LineCurrentMagField.hh,v 1.4 2006/06/29 18:22:46 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4LineSection.hh

r850	r921
26	26	//
27	27	// $Id: G4LineSection.hh,v 1.9 2006/06/29 18:22:48 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4MagErrorStepper.hh

r850	r921
26	26	//
27	27	// $Id: G4MagErrorStepper.hh,v 1.11 2006/06/29 18:22:50 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4MagErrorStepper.icc

r850	r921
26	26	//
27	27	// $Id: G4MagErrorStepper.icc,v 1.13 2006/06/29 18:22:52 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.hh

r850	r921
27	27	//
28	28	// $Id: G4MagHelicalStepper.hh,v 1.15 2007/08/21 08:48:28 tnikitin Exp $
29		// GEANT4 tag $Name: ~~HEAD~~ $
	29	// GEANT4 tag $Name: geant4-09-02-cand-01 $
30	30	//
31	31	//

trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.icc

r850	r921
26	26	//
27	27	// $Id: G4MagHelicalStepper.icc,v 1.13 2007/05/18 15:45:15 tnikitin Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// Linear Step in regions of no field

trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh

r850	r921
26	26	//
27	27	// $Id: G4MagIntegratorDriver.hh,v 1.20 2007/05/10 10:10:05 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc

r850	r921
26	26	//
27	27	// $Id: G4MagIntegratorDriver.icc,v 1.13 2007/05/10 10:10:48 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh

r850	r921
25	25	//
26	26	// $Id: G4MagIntegratorStepper.hh,v 1.12 2006/09/20 09:31:01 japost Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	//
29	29	//

trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc

r850	r921
25	25	//
26	26	// $Id: G4MagIntegratorStepper.icc,v 1.10 2006/09/20 09:31:46 japost Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	//
29	29

trunk/source/geometry/magneticfield/include/G4Mag_EqRhs.hh

r850	r921
26	26	//
27	27	// $Id: G4Mag_EqRhs.hh,v 1.9 2006/06/29 18:23:07 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh

r850	r921
26	26	//
27	27	// $Id: G4Mag_SpinEqRhs.hh,v 1.11 2006/06/29 18:23:09 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh

r850	r921
26	26	//
27	27	// $Id: G4Mag_UsualEqRhs.hh,v 1.7 2006/06/29 18:23:12 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4MagneticField.hh

r850	r921
26	26	//
27	27	// $Id: G4MagneticField.hh,v 1.14 2006/06/29 18:23:14 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh

r850	r921
26	26	//
27	27	// $Id: G4QuadrupoleMagField.hh,v 1.4 2006/06/29 18:23:16 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4RKG3_Stepper.hh

r850	r921
27	27	//
28	28	// $Id: G4RKG3_Stepper.hh,v 1.13 2007/05/18 12:44:02 tnikitin Exp $
29		// GEANT4 tag $Name: ~~HEAD~~ $
	29	// GEANT4 tag $Name: geant4-09-02-cand-01 $
30	30	//
31	31	//

trunk/source/geometry/magneticfield/include/G4SimpleHeum.hh

r850	r921
26	26	//
27	27	// $Id: G4SimpleHeum.hh,v 1.8 2006/06/29 18:23:20 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4SimpleRunge.hh

r850	r921
26	26	//
27	27	// $Id: G4SimpleRunge.hh,v 1.8 2006/06/29 18:23:23 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4UniformElectricField.hh

r850	r921
26	26	//
27	27	// $Id: G4UniformElectricField.hh,v 1.9 2006/06/29 18:23:25 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/include/G4UniformMagField.hh

r850	r921
26	26	//
27	27	// $Id: G4UniformMagField.hh,v 1.9 2006/06/29 18:23:27 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4CashKarpRKF45.cc

r850	r921
26	26	//
27	27	// $Id: G4CashKarpRKF45.cc,v 1.15 2008/01/11 18:11:44 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// The Cash-Karp Runge-Kutta-Fehlberg 4/5 method is an embedded fourth

trunk/source/geometry/magneticfield/src/G4ChordFinder.cc

-              r850
+              r921
 //
 //
 // $Id: G4ChordFinder.cc,v 1.49 2008/07/15 14:02:06 japost Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ChordFinder.cc,v 1.51 2008/10/29 14:17:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
+// 25.02.97 John Apostolakis,  design and implimentation
+// 05.03.97 V. Grichine , style modification
+// 25.02.97 - John Apostolakis - Design and implementation
 // -------------------------------------------------------------------
+#include <iomanip>
 #include "G4ChordFinder.hh"
 …
 #include "G4ClassicalRK4.hh"
-#include <iomanip>
 // ..........................................................................
 …
+{
   // Simple constructor which does not create equation, ..
+      // fDeltaChord= fDefaultDeltaChord;
   fIntgrDriver= pIntegrationDriver;
   fAllocatedStepper= false;
 …
     // check the values and set the other parameters
+}
 // ..........................................................................
 …
   //  Construct the Chord Finder
   //  by creating in inverse order the  Driver, the Stepper and EqRhs ...
   G4Mag_EqRhs *pEquation = new G4Mag_UsualEqRhs(theMagField);
   fEquation = pEquation;
 …
                                      pItsStepper->GetNumberOfVariables() );
+}
+// ......................................................................
+G4ChordFinder::~G4ChordFinder()
+{
+  delete   fEquation; // fIntgrDriver->pIntStepper->theEquation_Rhs;
+  if( fAllocatedStepper)
+  {
+     delete fDriversStepper;
+  }
+  delete   fIntgrDriver;
+  if( fStatsVerbose ) { PrintStatistics(); }
+}
 // ......................................................................
 …
   if( fractNext == -1.0 )   fractNext = 0.98;  // 0.9;
+  // fFirstFraction  = 0.999;  // Orig 0.999 A safe value,  range: ~ 0.95 - 0.999
+  // fMultipleRadius = 15.0;   // For later use, range: ~  2 - 20
+  if( fStatsVerbose ) {
+  // fFirstFraction  = 0.999; // Orig 0.999 A safe value, range: ~ 0.95 - 0.999
+  // fMultipleRadius = 15.0;  // For later use, range: ~  2 - 20
+  if( fStatsVerbose )
+  {
     G4cout << " ChordFnd> Trying to set fractions: "
            << " first " << fFirstFraction
            << " last " <<  fractLast
            << " next " <<  fractNext
            << " and multiple " << fMultipleRadius
            << G4endl;
+           << " first " << fFirstFraction
+           << " last " <<  fractLast
+           << " next " <<  fractNext
+           << " and multiple " << fMultipleRadius
+           << G4endl;
+  }
   if( (fractLast > 0.0) && (fractLast <=1.0) )
+    { fFractionLast= fractLast; }
+  else
+  {
+    fFractionLast= fractLast;
+  }
+  else
+  {
+    G4cerr << "G4ChordFinder::SetFractions_Last_Next: Invalid "
+           << " fraction Last = " << fractLast
+           << " must be  0 <  fractionLast <= 1 " << G4endl;
+  }
+  if( (fractNext > 0.0) && (fractNext <1.0) )
+  {
+    fFractionNextEstimate = fractNext;
+  }
+  else
+  {
     G4cerr << "G4ChordFinder:: SetFractions_Last_Next: Invalid "
+           << " fraction Last = " << fractLast
+           << " must be  0 <  fractionLast <= 1 " << G4endl;
+  if( (fractNext > 0.0) && (fractNext <1.0) )
+    { fFractionNextEstimate = fractNext; }
+  else
+    G4cerr << "G4ChordFinder:: SetFractions_Last_Next: Invalid "
+           << " fraction Next = " << fractNext
+           << " must be  0 <  fractionNext < 1 " << G4endl;
+}
+           << " fraction Next = " << fractNext
+           << " must be  0 <  fractionNext < 1 " << G4endl;
+  }
+}
 // ......................................................................
+G4ChordFinder::~G4ChordFinder()
+{
+  delete   fEquation; // fIntgrDriver->pIntStepper->theEquation_Rhs;
+  if( fAllocatedStepper)
+G4double
+G4ChordFinder::AdvanceChordLimited( G4FieldTrack& yCurrent,
+                                    G4double      stepMax,
+                                    G4double      epsStep,
+                                    const G4ThreeVector latestSafetyOrigin,
+                                    G4double       latestSafetyRadius )
+{
+  G4double stepPossible;
+  G4double dyErr;
+  G4FieldTrack yEnd( yCurrent);
+  G4double  startCurveLen= yCurrent.GetCurveLength();
+  G4double nextStep;
+  //            *************
+  stepPossible= FindNextChord(yCurrent, stepMax, yEnd, dyErr, epsStep,
+                              &nextStep, latestSafetyOrigin, latestSafetyRadius
+                             );
+  //            *************
+  G4bool good_advance;
+  if ( dyErr < epsStep * stepPossible )
+  {
+     // Accept this accuracy.
+     yCurrent = yEnd;
+     good_advance = true;
+  }
+  else
+  {
+     // Advance more accurately to "end of chord"
+     //                           ***************
+     good_advance = fIntgrDriver->AccurateAdvance(yCurrent, stepPossible,
+                                                  epsStep, nextStep);
+     if ( ! good_advance )
+     {
+       // In this case the driver could not do the full distance
+       stepPossible= yCurrent.GetCurveLength()-startCurveLen;
+     }
+  }
+  return stepPossible;
+}
+// ............................................................................
+G4double
+G4ChordFinder::FindNextChord( const  G4FieldTrack& yStart,
+                                     G4double     stepMax,
+                                     G4FieldTrack&   yEnd, // Endpoint
+                                     G4double&   dyErrPos, // Error of endpoint
+                                     G4double    epsStep,
+                                     G4double*  pStepForAccuracy,
+                              const  G4ThreeVector, //  latestSafetyOrigin,
+                                     G4double       //  latestSafetyRadius
+                                        )
+{
+  // Returns Length of Step taken
+  G4FieldTrack yCurrent=  yStart;
+  G4double    stepTrial, stepForAccuracy;
+  G4double    dydx[G4FieldTrack::ncompSVEC];
+  //  1.)  Try to "leap" to end of interval
+  //  2.)  Evaluate if resulting chord gives d_chord that is good enough.
+  // 2a.)  If d_chord is not good enough, find one that is.
+  G4bool    validEndPoint= false;
+  G4double  dChordStep, lastStepLength; //  stepOfLastGoodChord;
+  fIntgrDriver-> GetDerivatives( yCurrent, dydx );
+  G4int     noTrials=0;
+  const G4double safetyFactor= fFirstFraction; //  0.975 or 0.99 ? was 0.999
+  stepTrial = std::min( stepMax, safetyFactor*fLastStepEstimate_Unconstrained );
+  G4double newStepEst_Uncons= 0.0;
+  do
+  {
+     delete fDriversStepper;
+  }                                //  fIntgrDriver->pIntStepper;}
+  delete   fIntgrDriver;
+  if( fStatsVerbose ) { PrintStatistics();  }
+}
+     G4double stepForChord;
+     yCurrent = yStart;    // Always start from initial point
+     //            ************
+     fIntgrDriver->QuickAdvance( yCurrent, dydx, stepTrial,
+                                 dChordStep, dyErrPos);
+     //            ************
+     //  We check whether the criterion is met here.
+     validEndPoint = AcceptableMissDist(dChordStep);
+     lastStepLength = stepTrial;
+     // This method estimates to step size for a good chord.
+     stepForChord = NewStep(stepTrial, dChordStep, newStepEst_Uncons );
+     if( ! validEndPoint )
+     {
+        if( stepTrial<=0.0 )
+        {
+          stepTrial = stepForChord;
+        }
+        else if (stepForChord <= stepTrial)
+        {
+          // Reduce by a fraction, possibly up to 20%
+          stepTrial = std::min( stepForChord, fFractionLast * stepTrial);
+        }
+        else
+        {
+          stepTrial *= 0.1;
+        }
+     }
+     noTrials++;
+  }
+  while( ! validEndPoint );   // End of do-while  RKD
+  if( newStepEst_Uncons > 0.0  )
+  {
+     fLastStepEstimate_Unconstrained= newStepEst_Uncons;
+  }
+  AccumulateStatistics( noTrials );
+  if( pStepForAccuracy )
+  {
+     // Calculate the step size required for accuracy, if it is needed
+     //
+     G4double dyErr_relative = dyErrPos/(epsStep*lastStepLength);
+     if( dyErr_relative > 1.0 )
+     {
+        stepForAccuracy = fIntgrDriver->ComputeNewStepSize( dyErr_relative,
+                                                            lastStepLength );
+     }
+     else
+     {
+        stepForAccuracy = 0.0;   // Convention to show step was ok
+     }
+     *pStepForAccuracy = stepForAccuracy;
+  }
+#ifdef  TEST_CHORD_PRINT
+  static int dbg=0;
+  if( dbg )
+  {
+    G4cout << "ChordF/FindNextChord:  NoTrials= " << noTrials
+           << " StepForGoodChord=" << std::setw(10) << stepTrial << G4endl;
+  }
+#endif
+  yEnd=  yCurrent;
+  return stepTrial;
+}
+// ...........................................................................
+G4double G4ChordFinder::NewStep(G4double  stepTrialOld,
+                                G4double  dChordStep, // Curr. dchord achieved
+                                G4double& stepEstimate_Unconstrained )
+{
+  // Is called to estimate the next step size, even for successful steps,
+  // in order to predict an accurate 'chord-sensitive' first step
+  // which is likely to assist in more performant 'stepping'.
+  G4double stepTrial;
+  static G4double lastStepTrial = 1.,  lastDchordStep= 1.;
+#if 1
+  if (dChordStep > 0.0)
+  {
+    stepEstimate_Unconstrained =
+                 stepTrialOld*std::sqrt( fDeltaChord / dChordStep );
+    stepTrial =  fFractionNextEstimate * stepEstimate_Unconstrained;
+  }
+  else
+  {
+    // Should not update the Unconstrained Step estimate: incorrect!
+    stepTrial =  stepTrialOld * 2.;
+  }
+  if( stepTrial <= 0.001 * stepTrialOld)
+  {
+     if ( dChordStep > 1000.0 * fDeltaChord )
+     {
+        stepTrial= stepTrialOld * 0.03;
+     }
+     else
+     {
+        if ( dChordStep > 100. * fDeltaChord )
+        {
+          stepTrial= stepTrialOld * 0.1;
+        }
+        else   // Try halving the length until dChordStep OK
+        {
+          stepTrial= stepTrialOld * 0.5;
+        }
+     }
+  }
+  else if (stepTrial > 1000.0 * stepTrialOld)
+  {
+     stepTrial= 1000.0 * stepTrialOld;
+  }
+  if( stepTrial == 0.0 )
+  {
+     stepTrial= 0.000001;
+  }
+  lastStepTrial = stepTrialOld;
+  lastDchordStep= dChordStep;
+#else
+  if ( dChordStep > 1000. * fDeltaChord )
+  {
+        stepTrial= stepTrialOld * 0.03;
+  }
+  else
+  {
+     if ( dChordStep > 100. * fDeltaChord )
+     {
+        stepTrial= stepTrialOld * 0.1;
+     }
+     else  // Keep halving the length until dChordStep OK
+     {
+        stepTrial= stepTrialOld * 0.5;
+     }
+  }
+#endif
+  // A more sophisticated chord-finder could figure out a better
+  // stepTrial, from dChordStep and the required d_geometry
+  //   e.g.
+  //      Calculate R, r_helix (eg at orig point)
+  //      if( stepTrial < 2 pi  R )
+  //          stepTrial = R arc_cos( 1 - fDeltaChord / r_helix )
+  //      else
+  //          ??
+  return stepTrial;
+}
+// ...........................................................................
+G4FieldTrack
+G4ChordFinder::ApproxCurvePointS( const G4FieldTrack&  CurveA_PointVelocity,
+                                  const G4FieldTrack&  CurveB_PointVelocity,
+                                  const G4FieldTrack&  ApproxCurveV,
+                                  const G4ThreeVector& CurrentE_Point,
+                                  const G4ThreeVector& CurrentF_Point,
+                                  const G4ThreeVector& PointG,
+                                       G4bool first, G4double eps_step)
+{
+  // ApproxCurvePointS is 2nd implementation of ApproxCurvePoint.
+  // Use Brent Algorithm (or InvParabolic) when possible.
+  // Given a starting curve point A (CurveA_PointVelocity), curve point B
+  // (CurveB_PointVelocity), a point E which is (generally) not on the curve
+  // and  a point F which is on the curve (first approximation), find new
+  // point S on the curve closer to point E.
+  // While advancing towards S utilise 'eps_step' as a measure of the
+  // relative accuracy of each Step.
+  G4FieldTrack EndPoint( CurveA_PointVelocity);
+  G4ThreeVector Point_A=CurveA_PointVelocity.GetPosition();
+  G4ThreeVector Point_B=CurveB_PointVelocity.GetPosition();
+  G4double xa,xb,xc,ya,yb,yc;
+  // InverseParabolic. AF Intersects (First Part of Curve)
+  if(first)
+  {
+      xa=0.;
+      ya=(PointG-Point_A).mag();
+      xb=(Point_A-CurrentF_Point).mag();
+      yb=-(PointG-CurrentF_Point).mag();
+      xc=(Point_A-Point_B).mag();
+      yc=-(CurrentE_Point-Point_B).mag();
+  }
+  else
+  {
+     xa=0.;
+     ya=(Point_A-PointG).mag();
+     xb=(Point_B-Point_A).mag();
+     yb=-(PointG-Point_B).mag();
+     xc=-(Point_A-CurrentF_Point).mag();
+     yc=-(Point_A-CurrentE_Point).mag();
+  }
+  const G4double tolerance= 1.e-12;
+  if(ya<=tolerance||std::abs(yc)<=tolerance)
+  {
+    ; // What to do for the moment: return the same point as at start
+      // then PropagatorInField will take care
+  }
+  else
+  {
+    G4double test_step = InvParabolic(xa,ya,xb,yb,xc,yc);
+    G4double curve;
+    if(first)
+    {
+      curve=std::abs(EndPoint.GetCurveLength()
+                    -ApproxCurveV.GetCurveLength());
+    }
+    else
+    {
+      curve=std::abs(EndPoint.GetCurveLength()
+                    -CurveB_PointVelocity.GetCurveLength());
+    }
+    if(test_step<=0)    { test_step=0.1*xb; }
+    if(test_step>=xb)   { test_step=0.5*xb; }
+    if(test_step>=curve){ test_step=0.5*curve; }
+    if(curve*(1.+eps_step)<xb) // Similar to ReEstimate Step from
+    {                          // G4VIntersectionLocator
+      test_step=0.5*curve;
+    }
+    G4bool goodAdvance;
+    goodAdvance = fIntgrDriver->AccurateAdvance(EndPoint,test_step, eps_step);
+#ifdef G4DEBUG_FIELD
+    // Printing Brent and Linear Approximation
+    //
+    G4cout << "G4ChordFinder::ApproxCurvePointS() - test-step ShF = "
+           << test_step << "  EndPoint = " << EndPoint << G4endl;
+    //  Test Track
+    //
+    G4FieldTrack TestTrack( CurveA_PointVelocity);
+    TestTrack = ApproxCurvePointV( CurveA_PointVelocity,
+                                   CurveB_PointVelocity,
+                                   CurrentE_Point, eps_step );
+    G4cout.precision(14);
+    G4cout << "G4ChordFinder::BrentApprox = " << EndPoint  << G4endl;
+    G4cout << "G4ChordFinder::LinearApprox= " << TestTrack << G4endl;
+#endif
+  }
+  return EndPoint;
+}
+// ...........................................................................
+G4FieldTrack G4ChordFinder::
+ApproxCurvePointV( const G4FieldTrack& CurveA_PointVelocity,
+                   const G4FieldTrack& CurveB_PointVelocity,
+                   const G4ThreeVector& CurrentE_Point,
+                         G4double eps_step)
+{
+  // If r=|AE|/|AB|, and s=true path lenght (AB)
+  // return the point that is r*s along the curve!
+  G4FieldTrack   Current_PointVelocity = CurveA_PointVelocity;
+  G4ThreeVector  CurveA_Point= CurveA_PointVelocity.GetPosition();
+  G4ThreeVector  CurveB_Point= CurveB_PointVelocity.GetPosition();
+  G4ThreeVector  ChordAB_Vector= CurveB_Point   - CurveA_Point;
+  G4ThreeVector  ChordAE_Vector= CurrentE_Point - CurveA_Point;
+  G4double       ABdist= ChordAB_Vector.mag();
+  G4double  curve_length;  //  A curve length  of AB
+  G4double  AE_fraction;
+  curve_length= CurveB_PointVelocity.GetCurveLength()
+              - CurveA_PointVelocity.GetCurveLength();
+  G4double  integrationInaccuracyLimit= std::max( perMillion, 0.5*eps_step );
+  if( curve_length < ABdist * (1. - integrationInaccuracyLimit) )
+  {
+#ifdef G4DEBUG_FIELD
+    G4cerr << " Warning in G4ChordFinder::ApproxCurvePoint: "
+           << G4endl
+           << " The two points are further apart than the curve length "
+           << G4endl
+           << " Dist = "         << ABdist
+           << " curve length = " << curve_length
+           << " relativeDiff = " << (curve_length-ABdist)/ABdist
+           << G4endl;
+    if( curve_length < ABdist * (1. - 10*eps_step) )
+    {
+      G4cerr << " ERROR: the size of the above difference"
+             << " exceeds allowed limits.  Aborting." << G4endl;
+      G4Exception("G4ChordFinder::ApproxCurvePointV()", "PrecisionError",
+                  FatalException, "Unphysical curve length.");
+    }
+#endif
+    // Take default corrective action: adjust the maximum curve length.
+    // NOTE: this case only happens for relatively straight paths.
+    // curve_length = ABdist;
+  }
+  G4double  new_st_length;
+  if ( ABdist > 0.0 )
+  {
+     AE_fraction = ChordAE_Vector.mag() / ABdist;
+  }
+  else
+  {
+     AE_fraction = 0.5;                         // Guess .. ?;
+#ifdef G4DEBUG_FIELD
+     G4cout << "Warning in G4ChordFinder::ApproxCurvePointV():"
+            << " A and B are the same point!" << G4endl
+            << " Chord AB length = " << ChordAE_Vector.mag() << G4endl
+            << G4endl;
+#endif
+  }
+  if( (AE_fraction> 1.0 + perMillion) || (AE_fraction< 0.) )
+  {
+#ifdef G4DEBUG_FIELD
+    G4cerr << " G4ChordFinder::ApproxCurvePointV() - Warning:"
+           << " Anomalous condition:AE > AB or AE/AB <= 0 " << G4endl
+           << "   AE_fraction = " <<  AE_fraction << G4endl
+           << "   Chord AE length = " << ChordAE_Vector.mag() << G4endl
+           << "   Chord AB length = " << ABdist << G4endl << G4endl;
+    G4cerr << " OK if this condition occurs after a recalculation of 'B'"
+           << G4endl << " Otherwise it is an error. " << G4endl ;
+#endif
+     // This course can now result if B has been re-evaluated,
+     // without E being recomputed (1 July 99).
+     // In this case this is not a "real error" - but it is undesired
+     // and we cope with it by a default corrective action ...
+     //
+     AE_fraction = 0.5;                         // Default value
+  }
+  new_st_length= AE_fraction * curve_length;
+  G4bool good_advance;
+  if ( AE_fraction > 0.0 )
+  {
+     good_advance = fIntgrDriver->AccurateAdvance(Current_PointVelocity,
+                                                  new_st_length, eps_step );
+     //
+     // In this case it does not matter if it cannot advance the full distance
+  }
+  // If there was a memory of the step_length actually required at the start
+  // of the integration Step, this could be re-used ...
+  G4cout.precision(14);
+  return Current_PointVelocity;
+}
+// ......................................................................
 void
 …
+{
   // Print Statistics
   G4cout << "G4ChordFinder statistics report: " << G4endl;
   G4cout
 …
+}
-// ......................................................................
-G4double
-G4ChordFinder::AdvanceChordLimited( G4FieldTrack& yCurrent,
-                                    G4double      stepMax,
-                                    G4double      epsStep,
-                                    const G4ThreeVector latestSafetyOrigin,
-                                    G4double       latestSafetyRadius
+                                    )
+{
-  G4double stepPossible;
-  G4double dyErr;
-  G4FieldTrack yEnd( yCurrent);
-  G4double  startCurveLen= yCurrent.GetCurveLength();
-  G4double nextStep;
-  //            *************
-  stepPossible= FindNextChord(yCurrent, stepMax, yEnd, dyErr, epsStep, &nextStep
-                              , latestSafetyOrigin, latestSafetyRadius
-                             );
-  //            *************
-  //  G4cout<<"Exit Find Next Chord Err= "<<dyErr<<" eps=  "<<epsStep<<"stepPos=  "<<stepPossible<<G4endl;
-  G4bool good_advance;
-  if ( dyErr < epsStep * stepPossible )
-      {   //G4cout<<"err comparison = "<<dyErr<<" eps=  "<<epsStep<<G4endl;
-     // Accept this accuracy.
-     yCurrent = yEnd;
-     good_advance = true;
+  }
-  else
+  {
-    // G4cout<<"Entering Accurate Advance"<<G4endl;
-     // Advance more accurately to "end of chord"
-     //                           ***************
-     good_advance = fIntgrDriver->AccurateAdvance(yCurrent, stepPossible, epsStep, nextStep);
-     //                           ***************
-     if ( ! good_advance ){
-       // In this case the driver could not do the full distance
-       stepPossible= yCurrent.GetCurveLength()-startCurveLen;
+     }
+  }
-#ifdef G4DEBUG_FIELD
-  //G4cout << "Exiting FindNextChord Limited with:" << G4endl
-  //       << "   yCurrent: " << yCurrent<< G4endl;
-#endif
-  return stepPossible;
+}
-// #define  TEST_CHORD_PRINT  1
-// ............................................................................
-G4double
-G4ChordFinder::FindNextChord( const  G4FieldTrack& yStart,
-                                     G4double     stepMax,
-                                     G4FieldTrack&   yEnd, // Endpoint
-                                     G4double&   dyErrPos, // Error of endpoint
-                                     G4double    epsStep,
-                                     G4double*  pStepForAccuracy,
-                              const  G4ThreeVector, //  latestSafetyOrigin,
-                                     G4double       //  latestSafetyRadius
+                                        )
-  // Returns Length of Step taken
+{
-  //G4cout<<"Inter Find Next Chord with step="<<stepMax<<G4endl;
-  // G4int       stepRKnumber=0;
-  G4FieldTrack yCurrent=  yStart;
-  G4double    stepTrial, stepForAccuracy;
-  G4double    dydx[G4FieldTrack::ncompSVEC];
-  //  1.)  Try to "leap" to end of interval
-  //  2.)  Evaluate if resulting chord gives d_chord that is good enough.
-  //     2a.)  If d_chord is not good enough, find one that is.
-  G4bool    validEndPoint= false;
-  G4double  dChordStep, lastStepLength; //  stepOfLastGoodChord;
-  fIntgrDriver-> GetDerivatives( yCurrent, dydx )  ;
-  //for (G4int i=0;i<G4FieldTrack::ncompSVEC;i++){
-  //  dydx[i]=0.;
-  //}
-  G4int     noTrials=0;
-  const G4double safetyFactor= fFirstFraction; //  0.975 or 0.99 ? was 0.999
-  stepTrial = std::min( stepMax,
-                          safetyFactor * fLastStepEstimate_Unconstrained );
-  G4double newStepEst_Uncons= 0.0;
-  do
+  {
-     G4double stepForChord;
-     yCurrent = yStart;    // Always start from initial point
-     //            ************
-     fIntgrDriver->QuickAdvance( yCurrent, dydx, stepTrial,
-                                 dChordStep, dyErrPos);
-     //            ************
-     // G4cout<<"AfterQuickAdv step="<<stepTrial<<"  dC="<<dChordStep<<" yErr="<<dyErrPos<<G4endl;
-      //  We check whether the criterion is met here.
-     validEndPoint = AcceptableMissDist(dChordStep);
-     // if(validEndPoint){G4cout<<"validEndPoint"<<fDeltaChord<<G4endl;}
-     // else{G4cout<<"No__validEndPoint"<<G4endl;}
-     //&& (dyErrPos < eps) ;
-     //   validEndPoint = AcceptableMissDist(dChordStep) && (dyErrPos < epsStep) ;
-     lastStepLength = stepTrial;
-     // This method estimates to step size for a good chord.
-     stepForChord = NewStep(stepTrial, dChordStep, newStepEst_Uncons );
-     if( ! validEndPoint ) {
-        if( stepTrial<=0.0 )
-          stepTrial = stepForChord;
-        else if (stepForChord <= stepTrial)
-          // Reduce by a fraction, possibly up to 20%
-          stepTrial = std::min( stepForChord,
-                                fFractionLast * stepTrial);
-        else
-          stepTrial *= 0.1;
-        // if(dbg) G4cerr<<"Dchord too big. Try new hstep="<<stepTrial<<G4endl;
+     }
-     // #ifdef  TEST_CHORD_PRINT
-     // TestChordPrint( noTrials, lastStepLength, dChordStep, stepTrial );
-     // #endif
-     noTrials++;
+  }
-  while( ! validEndPoint );   // End of do-while  RKD
-  if( newStepEst_Uncons > 0.0  ){
-    fLastStepEstimate_Unconstrained= newStepEst_Uncons;
+  }
-  AccumulateStatistics( noTrials );
-  // stepOfLastGoodChord = stepTrial;
-  if( pStepForAccuracy ){
-     // Calculate the step size required for accuracy, if it is needed
-     G4double dyErr_relative = dyErrPos/(epsStep*lastStepLength);
-     if( dyErr_relative > 1.0 ) {
-        stepForAccuracy =
-           fIntgrDriver->ComputeNewStepSize( dyErr_relative,
-                                             lastStepLength );
-     }else{
-        stepForAccuracy = 0.0;   // Convention to show step was ok
+     }
-     *pStepForAccuracy = stepForAccuracy;
+  }
-#ifdef  TEST_CHORD_PRINT
-  static int dbg=0;
-  if( dbg )
-    G4cout << "ChordF/FindNextChord:  NoTrials= " << noTrials
-           << " StepForGoodChord=" << std::setw(10) << stepTrial << G4endl;
-#endif
-  //G4cout << "ChordF/FindNextChord:  NoTrials= " << noTrials
-  //         << " StepForGoodChord=" << std::setw(10) << stepTrial << G4endl;
-  yEnd=  yCurrent;
-  return stepTrial;
+}
-// ----------------------------------------------------------------------------
-#if 0
-//   #ifdef G4VERBOSE
-if( dbg ) {
-   G4cerr << "Returned from QuickAdvance with: yCur=" << yCurrent <<G4endl;
-   G4cerr << " dChordStep= "<< dChordStep <<" dyErr=" << dyErr << G4endl;
+}
-#endif
-// ----------------------------------------------------------------------------
 // ...........................................................................
+G4double G4ChordFinder::NewStep(G4double  stepTrialOld,
+                                G4double  dChordStep, // Curr. dchord achieved
+                                G4double& stepEstimate_Unconstrained )
+//
+// Is called to estimate the next step size, even for successful steps,
+// in order to predict an accurate 'chord-sensitive' first step
+// which is likely to assist in more performant 'stepping'.
+//
+{
+  G4double stepTrial;
+  static G4double lastStepTrial = 1.,  lastDchordStep= 1.;
+#if 1
+  // const G4double  threshold = 1.21, multiplier = 0.9;
+  //  0.9 < 1 / std::sqrt(1.21)
+  if (dChordStep > 0.0)
+  {
+    stepEstimate_Unconstrained = stepTrialOld*std::sqrt( fDeltaChord / dChordStep );
+    // stepTrial =  0.98 * stepEstimate_Unconstrained;
+    stepTrial =  fFractionNextEstimate * stepEstimate_Unconstrained;
+  }
+  else
+  {
+    // Should not update the Unconstrained Step estimate: incorrect!
+    stepTrial =  stepTrialOld * 2.;
+  }
+  // if ( dChordStep < threshold * fDeltaChord ){
+  //    stepTrial= stepTrialOld *  multiplier;
+  // }
+  if( stepTrial <= 0.001 * stepTrialOld)
+  {
+     if ( dChordStep > 1000.0 * fDeltaChord ){
+        stepTrial= stepTrialOld * 0.03;
+     }else{
+        if ( dChordStep > 100. * fDeltaChord ){
+          stepTrial= stepTrialOld * 0.1;
+        }else{
+    // Try halving the length until dChordStep OK
+          stepTrial= stepTrialOld * 0.5;
+        }
+     }
+  }else if (stepTrial > 1000.0 * stepTrialOld)
+  {
+     stepTrial= 1000.0 * stepTrialOld;
+  }
+  if( stepTrial == 0.0 ){
+     stepTrial= 0.000001;
+  }
+  lastStepTrial = stepTrialOld;
+  lastDchordStep= dChordStep;
+#else
+  if ( dChordStep > 1000. * fDeltaChord ){
+        stepTrial= stepTrialOld * 0.03;
+  }else{
+     if ( dChordStep > 100. * fDeltaChord ){
+        stepTrial= stepTrialOld * 0.1;
+     }else{
+        // Keep halving the length until dChordStep OK
+        stepTrial= stepTrialOld * 0.5;
+     }
+  }
+#endif
+  // A more sophisticated chord-finder could figure out a better
+  //   stepTrial, from dChordStep and the required d_geometry
+  //   eg
+  //      Calculate R, r_helix (eg at orig point)
+  //      if( stepTrial < 2 pi  R )
+  //          stepTrial = R arc_cos( 1 - fDeltaChord / r_helix )
+  //      else
+  //          ??
+  return stepTrial;
+}
+//  ApproxCurvePointS is 2nd implementation of ApproxCurvePoint.
+//  Use Brent Algorithm(or InvParabolic) when it possible.
+//  Given a starting curve point A (CurveA_PointVelocity),
+//  curve point B (CurveB_PointVelocity), a point E which is (generally)
+//  not on the curve  and  a point F which is on the curve(first approximation)
+//  From this information find new point S on the curve closer to point E.
+//  While advancing towards S utilise eps_step
+//  as a measure of the relative accuracy of each Step.
+G4FieldTrack
+G4ChordFinder::ApproxCurvePointS( const G4FieldTrack& CurveA_PointVelocity,
+                                  const G4FieldTrack& CurveB_PointVelocity,
+                                  const G4ThreeVector& CurrentE_Point,
+                                  const G4ThreeVector& CurrentF_Point,
+                                  const G4ThreeVector& PointG,
+                                       G4bool first, G4double eps_step)
+{
+  G4FieldTrack EndPoint( CurveA_PointVelocity);
+  G4ThreeVector Point_A=CurveA_PointVelocity.GetPosition();
+  G4ThreeVector Point_B=CurveB_PointVelocity.GetPosition();
+  G4double xa,xb,xc,ya,yb,yc;
+//InverseParabolic
+//AF Intersects (First Part of Curve)
+  if(first){
+      xa=0.;
+      ya=(PointG-Point_A).mag();
+      xb=(Point_A-CurrentF_Point).mag();
+      yb=-(PointG-CurrentF_Point).mag();
+      xc=(Point_A-Point_B).mag();
+      yc=-(CurrentE_Point-Point_B).mag();
+  }
+  else{
+     xa=0.;
+     ya=(Point_A-PointG).mag();
+     xb=(Point_B-Point_A).mag();
+     yb=-(PointG-Point_B).mag();
+     xc=-(Point_A-CurrentF_Point).mag();
+     yc=-(Point_A-CurrentE_Point).mag();
+  }
+  const G4double tolerance= 1.e-12;
+  if(ya<=tolerance||std::abs(yc)<=tolerance){
+    ; //What to do for the moment return the same point as in begin
+     //Then PropagatorInField will take care
+   }
+   else{
+      G4double test_step  =InvParabolic(xa,ya,xb,yb,xc,yc);
+      G4double curve=std::abs(EndPoint.GetCurveLength()-CurveB_PointVelocity.GetCurveLength());
+      G4double dist= (EndPoint.GetPosition()-Point_B).mag();
+      if(test_step<=0) { test_step=0.1*xb;}
+      if(test_step>=xb){ test_step=0.5*xb;}
+      if(curve*(1.+eps_step)<dist){
+        test_step=0.5*dist;
+       }
+       G4bool goodAdvance;
+       goodAdvance=
+             fIntgrDriver->AccurateAdvance(EndPoint,test_step, eps_step);
+            //            ***************
+       #ifdef G4DEBUG_FIELD
+        G4cout<<"G4ChordFinder:: test-step ShF="<<test_step<<"  EndPoint="<<EndPoint<<G4endl;
+      //    Test Track
+       G4FieldTrack TestTrack( CurveA_PointVelocity);
+       TestTrack = ApproxCurvePointV( CurveA_PointVelocity,
+                                                  CurveB_PointVelocity,
+                                                  CurrentE_Point,
+                                                  eps_step );
+       G4cout.precision(14);
+       G4cout<<"G4ChordFinder:: BrentApprox="<<EndPoint<<G4endl;
+       G4cout<<"G4ChordFinder::LinearApprox="<<TestTrack<<G4endl;
+       #endif
+  }
+return EndPoint;
+}
+G4FieldTrack
+G4ChordFinder::ApproxCurvePointV( const G4FieldTrack& CurveA_PointVelocity,
+                                  const G4FieldTrack& CurveB_PointVelocity,
+                                  const G4ThreeVector& CurrentE_Point,
+                                        G4double eps_step)
+{
+  // 1st implementation:
+  //    if r=|AE|/|AB|, and s=true path lenght (AB)
+  //    return the point that is r*s along the curve!
+  /////////////////////////////
+  //
+  //2st implementation : Inverse Parabolic Extrapolation by D.C.Williams
+  //
+  //    Uses InvParabolic (xa,ya,xb,yb,xc,yc)
+  G4FieldTrack    Current_PointVelocity = CurveA_PointVelocity;
+  G4ThreeVector  CurveA_Point= CurveA_PointVelocity.GetPosition();
+  G4ThreeVector  CurveB_Point= CurveB_PointVelocity.GetPosition();
+  G4ThreeVector  ChordAB_Vector= CurveB_Point   - CurveA_Point;
+  G4ThreeVector  ChordAE_Vector= CurrentE_Point - CurveA_Point;
+  G4double       ABdist= ChordAB_Vector.mag();
+  G4double  curve_length;  //  A curve length  of AB
+  G4double  AE_fraction;
+  curve_length= CurveB_PointVelocity.GetCurveLength()
+              - CurveA_PointVelocity.GetCurveLength();
+  // const
+  G4double  integrationInaccuracyLimit= std::max( perMillion, 0.5*eps_step );
+  if( curve_length < ABdist * (1. - integrationInaccuracyLimit) ){
+#ifdef G4DEBUG_FIELD
+    G4cerr << " Warning in G4ChordFinder::ApproxCurvePoint: "
+           << G4endl
+           << " The two points are further apart than the curve length "
+           << G4endl
+           << " Dist = "         << ABdist
+           << " curve length = " << curve_length
+           << " relativeDiff = " << (curve_length-ABdist)/ABdist
+           << G4endl;
+    if( curve_length < ABdist * (1. - 10*eps_step) ) {
+      G4cerr << " ERROR: the size of the above difference"
+             << " exceeds allowed limits.  Aborting." << G4endl;
+      G4Exception("G4ChordFinder::ApproxCurvePointV()", "PrecisionError",
+                  FatalException, "Unphysical curve length.");
+    }
+#endif
+    // Take default corrective action:
+    //    -->  adjust the maximum curve length.
+    //  NOTE: this case only happens for relatively straight paths.
+    curve_length = ABdist;
+  }
+  G4double  new_st_length;
+  if ( ABdist > 0.0 ){
+     AE_fraction = ChordAE_Vector.mag() / ABdist;
+  }else{
+     AE_fraction = 0.5;                         // Guess .. ?;
+#ifdef G4DEBUG_FIELD
+     G4cout << "Warning in G4ChordFinder::ApproxCurvePoint:"
+            << " A and B are the same point!" << G4endl
+            << " Chord AB length = " << ChordAE_Vector.mag() << G4endl
+            << G4endl;
+#endif
+  }
+  if( (AE_fraction> 1.0 + perMillion) || (AE_fraction< 0.) ){
+#ifdef G4DEBUG_FIELD
+    G4cerr << " G4ChordFinder::ApproxCurvePointV - Warning:"
+           << " Anomalous condition:AE > AB or AE/AB <= 0 " << G4endl
+           << "   AE_fraction = " <<  AE_fraction << G4endl
+           << "   Chord AE length = " << ChordAE_Vector.mag() << G4endl
+           << "   Chord AB length = " << ABdist << G4endl << G4endl;
+    G4cerr << " OK if this condition occurs after a recalculation of 'B'"
+           << G4endl << " Otherwise it is an error. " << G4endl ;
+#endif
+     // This course can now result if B has been re-evaluated,
+     //   without E being recomputed   (1 July 99)
+     //  In this case this is not a "real error" - but it undesired
+     //   and we cope with it by a default corrective action ...
+     AE_fraction = 0.5;                         // Default value
+  }
+  new_st_length= AE_fraction * curve_length;
+  G4bool good_advance;
+  if ( AE_fraction > 0.0 ) {
+     good_advance =
+      fIntgrDriver->AccurateAdvance(Current_PointVelocity,
+                                    new_st_length,
+                                    eps_step ); // Relative accuracy
+     // In this case it does not matter if it cannot advance the full distance
+  }
+  // If there was a memory of the step_length actually require at the start
+  // of the integration Step, this could be re-used ...
+   G4cout.precision(14);
+   //     G4cout<<"G4ChordFinder::LinearApprox="<<Current_PointVelocity<<G4endl;
+  return Current_PointVelocity;
+}
+void
+G4ChordFinder::TestChordPrint( G4int    noTrials,
+                               G4int    lastStepTrial,
+                               G4double dChordStep,
+                               G4double nextStepTrial )
+void G4ChordFinder::TestChordPrint( G4int    noTrials,
+                                    G4int    lastStepTrial,
+                                    G4double dChordStep,
+                                    G4double nextStepTrial )
+{
      G4int oldprec= G4cout.precision(5);
      G4cout << " ChF/fnc: notrial " << std::setw( 3) << noTrials
             << " this_step= "       << std::setw(10) << lastStepTrial;
+     if( std::fabs( (dChordStep / fDeltaChord) - 1.0 ) < 0.001 ){
+             G4cout.precision(8);
+     }else{  G4cout.precision(6); }
+     G4cout << " dChordStep=  "     << std::setw(12) << dChordStep;
+     if( std::fabs( (dChordStep / fDeltaChord) - 1.0 ) < 0.001 )
+     {
+       G4cout.precision(8);
+     }
+     else
+     {
+       G4cout.precision(6);
+     }
+     G4cout << " dChordStep=  " << std::setw(12) << dChordStep;
      if( dChordStep > fDeltaChord ) { G4cout << " d+"; }
      else                           { G4cout << " d-"; }

trunk/source/geometry/magneticfield/src/G4ChordFinderSaf.cc

r831	r921
116	116
117	117	G4double
118		G4ChordFinderSaf::FindNextChord( const G4FieldTrack yStart,
	118	G4ChordFinderSaf::FindNextChord( const G4FieldTrack& yStart,
119	119	G4double stepMax,
120	120	G4FieldTrack& yEnd, // Endpoint

trunk/source/geometry/magneticfield/src/G4ClassicalRK4.cc

r850	r921
26	26	//
27	27	// $Id: G4ClassicalRK4.cc,v 1.12 2006/06/29 18:23:37 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4DELPHIMagField.cc

r850	r921
26	26	//
27	27	// $Id: G4DELPHIMagField.cc,v 1.6 2006/06/29 18:23:39 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	// -------------------------------------------------------------------
30	30

trunk/source/geometry/magneticfield/src/G4ElectricField.cc

r850	r921
26	26	//
27	27	// $Id: G4ElectricField.cc,v 1.2 2006/06/29 18:23:42 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4ElectroMagneticField.cc

r850	r921
26	26	//
27	27	// $Id: G4ElectroMagneticField.cc,v 1.3 2006/06/29 18:23:44 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4EqEMFieldWithSpin.cc

-              r850
+              r921
 //
 //
 // $Id: G4EqEMFieldWithSpin.cc,v 1.2 2008/04/24 12:33:08 tnikitin Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EqEMFieldWithSpin.cc,v 1.4 2008/11/21 21:17:03 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 #include "G4EqEMFieldWithSpin.hh"
+#include "G4ElectroMagneticField.hh"
 #include "G4ThreeVector.hh"
 #include "globals.hh"
 G4EqEMFieldWithSpin::G4EqEMFieldWithSpin(G4ElectroMagneticField *emField )
+      : G4EquationOfMotion( emField ) { anomaly = 1.165923e-3; }
+      : G4EquationOfMotion( emField )
+{
+  anomaly = 0.0011659208;
+}
+G4EqEMFieldWithSpin::~G4EqEMFieldWithSpin()
+{
+}
 void
 G4EqEMFieldWithSpin::SetChargeMomentumMass(G4double particleCharge, // e+ units
                                             G4double MomentumXc,
+                                            G4double MomentumXc,
                                             G4double particleMass)
+{
 …
    beta  = MomentumXc/E;
    gamma = E/particleMass;
+}
 void
 G4EqEMFieldWithSpin::EvaluateRhsGivenB(const G4double y[],
                                         const G4double Field[],
                                               G4double dydx[] ) const
+                                       const G4double Field[],
+                                             G4double dydx[] ) const
+{
 …
    G4ThreeVector Spin(y[9],y[10],y[11]);
+   if (Spin.mag() > 0.) Spin = Spin.unit();
    G4ThreeVector dSpin;

trunk/source/geometry/magneticfield/src/G4EqMagElectricField.cc

r850	r921
26	26	//
27	27	// $Id: G4EqMagElectricField.cc,v 1.14 2008/04/24 12:33:35 tnikitin Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4EquationOfMotion.cc

r850	r921
26	26	//
27	27	// $Id: G4EquationOfMotion.cc,v 1.9 2006/06/29 18:23:48 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4ErrorMag_UsualEqRhs.cc

r850	r921
26	26	//
27	27	// $Id: G4ErrorMag_UsualEqRhs.cc,v 1.1 2007/05/16 12:54:02 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4ExactHelixStepper.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExactHelixStepper.cc,v 1.8 2007/12/10 16:29:47 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExactHelixStepper.cc,v 1.9 2008/10/29 14:34:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //  Helix a-la-Explicity Euler: x_1 = x_0 + helix(h)
 …
+{
   // Implementation : must check whether h/R >  pi  !!
   //   If( h/R <  pi)   DistChord=h/2*tan(Ang_curve/4)
+  //   If( h/R <  pi)   DistChord=h/2*std::tan(Ang_curve/4)
   //   Else             DistChord=R_helix
   //

trunk/source/geometry/magneticfield/src/G4ExplicitEuler.cc

r850	r921
26	26	//
27	27	// $Id: G4ExplicitEuler.cc,v 1.8 2006/06/29 18:23:53 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4FieldManager.cc

r850	r921
26	26	//
27	27	// $Id: G4FieldManager.cc,v 1.15 2007/12/07 15:34:10 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4FieldManagerStore.cc

r850	r921
26	26	//
27	27	// $Id: G4FieldManagerStore.cc,v 1.4 2008/01/17 10:56:23 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// G4FieldManagerStore

trunk/source/geometry/magneticfield/src/G4FieldTrack.cc

r850	r921
26	26	//
27	27	// $Id: G4FieldTrack.cc,v 1.14 2007/10/03 15:34:42 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4HarmonicPolMagField.cc

r850	r921
26	26	//
27	27	// $Id: G4HarmonicPolMagField.cc,v 1.6 2006/06/29 18:24:00 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc

r850	r921
26	26	//
27	27	// $Id: G4HelixExplicitEuler.cc,v 1.8 2007/12/10 16:29:49 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4HelixHeum.cc

r850	r921
26	26	//
27	27	// $Id: G4HelixHeum.cc,v 1.6 2006/06/29 18:24:04 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc

r850	r921
26	26	//
27	27	// $Id: G4HelixImplicitEuler.cc,v 1.6 2006/06/29 18:24:06 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc

r850	r921
26	26	//
27	27	// $Id: G4HelixSimpleRunge.cc,v 1.7 2006/06/29 18:24:08 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4ImplicitEuler.cc

r850	r921
26	26	//
27	27	// $Id: G4ImplicitEuler.cc,v 1.9 2006/06/29 18:24:11 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4LineCurrentMagField.cc

r850	r921
25	25	//
26	26	// $Id: G4LineCurrentMagField.cc,v 1.6 2006/06/29 18:24:13 gunter Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	// -------------------------------------------------------------------
29	29

trunk/source/geometry/magneticfield/src/G4LineSection.cc

r850	r921
26	26	//
27	27	// $Id: G4LineSection.cc,v 1.10 2006/06/29 18:24:16 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4MagErrorStepper.cc

r850	r921
26	26	//
27	27	// $Id: G4MagErrorStepper.cc,v 1.13 2006/06/29 18:24:18 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4MagHelicalStepper.cc

r850	r921
26	26	//
27	27	// $Id: G4MagHelicalStepper.cc,v 1.23 2007/09/05 12:20:17 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc

r850	r921
26	26	//
27	27	// $Id: G4MagIntegratorDriver.cc,v 1.49 2007/08/17 12:30:33 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc

r850	r921
26	26	//
27	27	// $Id: G4MagIntegratorStepper.cc,v 1.11 2006/06/29 18:24:34 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4Mag_EqRhs.cc

r850	r921
26	26	//
27	27	// $Id: G4Mag_EqRhs.cc,v 1.11 2006/06/29 18:24:36 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// This is the standard right-hand side for equation of motion

trunk/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc

-              r850
+              r921
 //
 //
 // $Id: G4Mag_SpinEqRhs.cc,v 1.12 2006/06/29 18:24:39 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Mag_SpinEqRhs.cc,v 1.13 2008/11/21 21:18:26 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // This is the standard right-hand side for equation of motion.
 …
   : G4Mag_EqRhs( MagField )
+{
    anomaly = 1.165923e-3;
+   anomaly = 0.0011659208;
+}
 …
 G4Mag_SpinEqRhs::SetChargeMomentumMass(G4double particleCharge, // in e+ units
                                        G4double MomentumXc,
                                        G4double mass)
+                                       G4double particleMass)
+{
    //  To set fCof_val
    G4Mag_EqRhs::SetChargeMomentumMass(particleCharge, MomentumXc, mass);
+   G4Mag_EqRhs::SetChargeMomentumMass(particleCharge, MomentumXc, particleMass);
    omegac = 0.105658387*GeV/mass * 2.837374841e-3*(rad/cm/kilogauss);
+   omegac = 0.105658387*GeV/particleMass * 2.837374841e-3*(rad/cm/kilogauss);
    ParticleCharge = particleCharge;
    E = std::sqrt(sqr(MomentumXc)+sqr(mass));
+   E = std::sqrt(sqr(MomentumXc)+sqr(particleMass));
    beta  = MomentumXc/E;
    gamma = E/mass;
+   gamma = E/particleMass;
+}
 …
    G4ThreeVector Spin(y[9],y[10],y[11]);
+   if (Spin.mag() > 0.) Spin = Spin.unit();
    G4ThreeVector dSpin;

trunk/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc

r850	r921
26	26	//
27	27	// $Id: G4Mag_UsualEqRhs.cc,v 1.12 2006/06/29 18:24:42 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4MagneticField.cc

r850	r921
26	26	//
27	27	// $Id: G4MagneticField.cc,v 1.3 2006/06/29 18:24:44 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4QuadrupoleMagField.cc

r850	r921
26	26	//
27	27	// $Id: G4QuadrupoleMagField.cc,v 1.4 2006/06/29 18:24:46 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4RKG3_Stepper.cc

r850	r921
26	26	//
27	27	// $Id: G4RKG3_Stepper.cc,v 1.15 2007/08/21 10:17:41 tnikitin Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// -------------------------------------------------------------------

trunk/source/geometry/magneticfield/src/G4SimpleHeum.cc

r850	r921
26	26	//
27	27	// $Id: G4SimpleHeum.cc,v 1.8 2006/06/29 18:24:51 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// Simple Heum:

trunk/source/geometry/magneticfield/src/G4SimpleRunge.cc

r850	r921
26	26	//
27	27	// $Id: G4SimpleRunge.cc,v 1.10 2006/06/29 18:24:53 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// Simple Runge:

trunk/source/geometry/magneticfield/src/G4UniformElectricField.cc

r850	r921
26	26	//
27	27	// $Id: G4UniformElectricField.cc,v 1.12 2006/06/29 18:24:56 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/magneticfield/src/G4UniformMagField.cc

r850	r921
26	26	//
27	27	// $Id: G4UniformMagField.cc,v 1.11 2006/06/29 18:24:58 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/management/History

-              r850
+              r921
 $Id: History,v 1.128 2008/07/15 10:27:55 gcosmo Exp $
+$Id: History,v 1.131 2008/09/23 13:10:55 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+September 23, 2008  G. Cosmo               geommng-V09-01-08
+- G4VSolid: explicitely reserve memory for polygon vectors in clipping
+  algorithm to help reducing memory footprint. Courtesy of P.Elmer, CMS.
+September 10, 2008  G. Cosmo               geommng-V09-01-07
+- G4VSolid: promote copy-constructor and assignment operator to public
+  to cope with specific use-case in ATLAS (see problem report #1023).
 July 15, 2008  G.Cosmo                     geommng-V09-01-06

trunk/source/geometry/management/include/G4VSolid.hh

-              r850
+              r921
 //
 //
 // $Id: G4VSolid.hh,v 1.28 2008/02/20 15:24:25 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4VSolid.hh,v 1.29 2008/09/10 13:18:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
       // persistifiable objects.
+    G4VSolid(const G4VSolid& rhs);
+    G4VSolid& operator=(const G4VSolid& rhs);
+      // Copy constructor and assignment operator.
   protected:  // with description
 …
       // expressed by the first argument.
-  protected:  // without description
-    G4VSolid(const G4VSolid& rhs);
-    G4VSolid& operator=(const G4VSolid& rhs);
-      // Protected copy constructor and assignment operator.
   protected:

trunk/source/geometry/management/src/G4VSolid.cc

-              r850
+              r921
 //
 //
 // $Id: G4VSolid.cc,v 1.37 2008/02/20 15:24:26 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4VSolid.cc,v 1.39 2008/09/23 13:07:41 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // class G4VSolid
 …
 //////////////////////////////////////////////////////////////////////////
 //
 // Protected copy constructor
+// Copy constructor
 //
 …
   G4ThreeVectorList polygon;
+  polygon.reserve(4);
   polygon.push_back((*pVertices)[pSectionIndex]);
   polygon.push_back((*pVertices)[pSectionIndex+1]);
 …
+{
   G4ThreeVectorList polygon;
+  polygon.reserve(4);
   polygon.push_back((*pVertices)[pSectionIndex]);
   polygon.push_back((*pVertices)[pSectionIndex+4]);

trunk/source/geometry/navigation/History

-              r850
+              r921
 $Id: History,v 1.119 2008/04/29 15:33:05 gcosmo Exp $
+$Id: History,v 1.125 2008/11/14 18:26:53 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+November 14th, 2008 - T.Nikitina, J.Apostolakis (geomnav-V09-01-09)
+-----------------------------------------------
+- Introduced first implementation of new optional method in locator classes
+  AdjustementOfFoundIntersection() using surface-normal of the intersecting
+  solid to boost accuracy. Added the optional call to the new method in each
+  concrete locator.
+- Removed unnecessary accessors for Brent locator in G4PropagatorInField.
+- G4VoxelNavigation: implemented additional check when running in "check"
+  mode; if it is on the surface, ensure that it can move on next step;
+  either DistanceToIn(p,v) or DistanceToOut(p,v) should return a finite
+  value greater than the tolerance.
+November 10th, 2008 - G.Cosmo (geomnav-V09-01-08)
+-----------------------------
+- G4PathFinder: cleared unecessary calls to ComputeSafety() in ReLocate().
+October 28th, 2008 - T.Nikitina (geomnav-V09-01-07)
+-------------------------------
+- Moved method LocateIntersectionPoint() in G4PropagatorInField to a separate
+  class G4VIntersectionLocator, now allowing to use different location
+  algorithms: Brent, MultiLevel, Simple.
+- New classes: G4VIntersectionLocator, G4SimpleLocator, G4BrentLocator and
+  G4MultiLevelLocator.
+- Coworks with tag "field-V09-01-03".
+October 10th, 2008 - G.Cosmo (geomnav-V09-01-06)
+----------------------------
+- Introduced optional Boolean argument in G4Navigator::ComputeSafety() to
+  allow for computation of safety without modifying the state restoring of
+  the navigator.
+- Modified accordingly the following classes, for calls to ComputeSafety():
+  G4SafetyHelper, G4PathFinder (now calling ComputeSafety() with TRUE
+  argument to preserve navigator's state), G4MultiNavigator and
+  G4ErrorPropagationNavigator.
+May 5th, 2008 - T.Nikitina (geomnav-V09-01-05)
+--------------------------
+- Added Brent method for LocateIntersectionPoint() in G4PropagatorInField.
+  The Brent method is now used as default and can be switched off through
+  call to the proper accessor function SetBrentMethod().
+- Requires related update to G4ChordFinder in geometry/magneticfield module
+  included in tag "field-V09-01-02".
 April 29th, 2008 - M.Asai (geomnav-V09-01-04)

trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh

r850	r921
26	26	//
27	27	// $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc

r850	r921
26	26	//
27	27	// $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4DrawVoxels.hh

r850	r921
26	26	//
27	27	// $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh

-              r850
+              r921
 //
 //
 // $Id: G4ErrorPropagationNavigator.hh,v 1.1 2007/05/16 12:49:18 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     G4double ComputeSafety(const G4ThreeVector &globalpoint,
+                           const G4double pProposedMaxLength = DBL_MAX);
+                           const G4double pProposedMaxLength = DBL_MAX,
+                           const G4bool keepState = false);
       // Calls the navigation in the detector geometry and then checks
       // if the distance to surface is smaller than the proposed safety

trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestLogger.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestPoint.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestSegment.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeomTestVolume.hh

r850	r921
26	26	//
27	27	// $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4GeometryMessenger.hh

r850	r921
26	26	//
27	27	// $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4MultiNavigator.hh

-              r850
+              r921
 //
 //
 // $Id: G4MultiNavigator.hh,v 1.4 2007/05/21 15:36:25 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   G4double ComputeSafety(const G4ThreeVector &globalpoint,
+                         const G4double pProposedMaxLength = DBL_MAX);
+                         const G4double pProposedMaxLength = DBL_MAX,
+                         const G4bool keepState = false);
     // Calculate the isotropic distance to the nearest boundary
     // in any geometry from the specified point in the global coordinate

trunk/source/geometry/navigation/include/G4Navigator.hh

-              r850
+              r921
 //
 //
 // $Id: G4Navigator.hh,v 1.26 2007/10/18 14:18:36 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Navigator.hh,v 1.27 2008/10/24 14:00:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   virtual G4double ComputeSafety(const G4ThreeVector &globalpoint,
+                                 const G4double pProposedMaxLength = DBL_MAX);
+                                 const G4double pProposedMaxLength = DBL_MAX,
+                                 const G4bool keepState = false);
     // Calculate the isotropic distance to the nearest boundary from the
     // specified point in the global coordinate system.

trunk/source/geometry/navigation/include/G4Navigator.icc

r850	r921
26	26	//
27	27	// $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4NormalNavigation.hh

r850	r921
26	26	//
27	27	// $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4NormalNavigation.icc

r850	r921
26	26	//
27	27	// $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh

r850	r921
26	26	//
27	27	// $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc

r850	r921
26	26	//
27	27	// $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4PathFinder.hh

r850	r921
25	25	//
26	26	// $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	//
29	29	// class G4PathFinder

trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh

r850	r921
26	26	//
27	27	// $Id: G4PhantomParameterisation.hh,v 1.4 2008/01/22 15:02:36 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc

r850	r921
26	26	//
27	27	// $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//--------------------------------------------------------------------

trunk/source/geometry/navigation/include/G4PropagatorInField.hh

-              r850
+              r921
 // ********************************************************************
 //
-//
-// $Id: G4PropagatorInField.hh,v 1.14 2008/05/28 09:11:59 tnikitin Exp $
-// GEANT4 tag $Name: HEAD $
 //
+// class G4PropagatorInField
+//
+// Class description:
+// $Id: G4PropagatorInField.hh,v 1.17 2008/11/13 14:28:56 tnikitin Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
+//
+//
+// Class G4PropagatorInField
+//
+// class description:
 //
 // This class performs the navigation/propagation of a particle/track
 …
 // For the calculation of the path, it relies on the class G4ChordFinder.
 //
 // Key Method:
+//              ComputeStep(..)
+// Key Method: ComputeStep(..)
 // History:
 // -------
 …
 #include "G4FieldTrack.hh"
 #include "G4FieldManager.hh"
+#include "G4VIntersectionLocator.hh"
 class G4ChordFinder;
 …
    G4PropagatorInField( G4Navigator    *theNavigator,
+                        G4FieldManager *detectorFieldMgr );
+                        G4FieldManager *detectorFieldMgr,
+                        G4VIntersectionLocator *vLocator=0 );
   ~G4PropagatorInField();
 …
    inline G4FieldTrack GetEndState() const;
+   // The following methods are now obsolescent but *for now* will work
+   //   They are being replaced by same-name methods in G4FieldManager,
+   //   allowing the specialisation in different volumes.
+   //   Their new behaviour is to change the values for the global field manager.
+   inline G4double  GetMinimumEpsilonStep() const;
+   inline void      SetMinimumEpsilonStep( G4double newEpsMin );
+     // Minimum for Relative accuracy of any Step
+   inline G4double  GetMinimumEpsilonStep() const;  // Min for relative accuracy
+   inline void      SetMinimumEpsilonStep( G4double newEpsMin ); //  of any step
    inline G4double  GetMaximumEpsilonStep() const;
    inline void      SetMaximumEpsilonStep( G4double newEpsMax );
    inline void      SetLargestAcceptableStep( G4double newBigDist );
    inline G4double  GetLargestAcceptableStep();
+     // The 6 above methods are now obsolescent but *for now* will work
+     // They are being replaced by same-name methods in G4FieldManager,
+     // allowing the specialisation in different volumes.
+     // Their new behaviour is to change the values for the global field
+     // manager
+   void SetTrajectoryFilter(G4VCurvedTrajectoryFilter* filter);
+     // Set the filter that examines & stores 'intermediate'
+     //  curved trajectory points.  Currently only position is stored.
+   std::vector<G4ThreeVector>* GimmeTrajectoryVectorAndForgetIt() const;
+     // Access the points which have passed by the filter.
+     // Responsibility for deleting the points lies with the client.
+     // This method MUST BE called exactly ONCE per step.
+   void ClearPropagatorState();
+     // Clear all the State of this class and its current associates
+     //   --> the current field manager & chord finder will also be called
+   inline void SetDetectorFieldManager( G4FieldManager* newGlobalFieldManager );
+     // Update this (dangerous) state -- for the time being
+     // Use alternative Locator(based on Brent Method,second order Intersection)
+  inline void      SetBrentMethod(G4bool newLocator);
+  inline G4bool    GetBrentMethod();
+ public:  // with description
+   // The following methods are obsolete and will not work --
+   //   as they have been replaced by the same methods in G4FieldManager
+   //   since Geant4 4.0
+   inline void   SetUseSafetyForOptimization( G4bool );
+   inline G4bool GetUseSafetyForOptimization();
+     // Toggle & view parameter for using safety to discard
+     //   unneccesary calls to navigator (thus 'optimising' performance)
+   inline G4bool IntersectChord( G4ThreeVector  StartPointA,
+                                 G4ThreeVector  EndPointB,
+                                 G4double      &NewSafety,
+                                 G4double      &LinearStepLength,
+                                 G4ThreeVector &IntersectionPoint);
+     // Intersect the chord from StartPointA to EndPointB
+     // and return whether an intersection occurred
+     // NOTE : SAFETY IS CHANGED
+   inline G4VIntersectionLocator* GetIntersectionLocator();
+   inline void SetIntersectionLocator(G4VIntersectionLocator *pLocator );
+ public:  // without description
    inline G4double  GetDeltaIntersection() const;
    inline G4double  GetDeltaOneStep() const;
 …
    inline void    SetDeltaIntersection( G4double deltaIntersection );
    inline void    SetDeltaOneStep( G4double deltaOneStep );
  public:  // without description
+     // The above 5 methods are obsolete and will not work, as they have been
+     // replaced by the same methods in G4FieldManager since Geant4 4.0 ...
    inline G4FieldManager*  GetCurrentFieldManager();
    inline void             SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator );
    inline G4Navigator*     GetNavigatorForPropagating();
- public:  // no description
    inline void SetThresholdNoZeroStep( G4int noAct,
 …
    inline G4int GetThresholdNoZeroSteps( G4int i );
- public:  // with description
-  //
-  void SetTrajectoryFilter(G4VCurvedTrajectoryFilter* filter);
-  // Set the filter that examines & stores 'intermediate'
-  //  curved trajectory points.  Currently only position is stored.
-  std::vector<G4ThreeVector>* GimmeTrajectoryVectorAndForgetIt() const;
-  // Access the points which have passed by the filter.
-  // Responsibility for deleting the points lies with the client.
-  // This method MUST BE called exactly ONCE per step.
-  void ClearPropagatorState();
-  // Clear all the State of this class and its current associates
-  //   --> the current field manager & chord finder will also be called
-  inline void SetDetectorFieldManager( G4FieldManager* newGlobalFieldManager );
-      // Update this (dangerous) state -- for the time being
-  inline void   SetUseSafetyForOptimization( G4bool );
-  inline G4bool GetUseSafetyForOptimization();
-      // Toggle & view parameter for using safety to discard
-      //   unneccesary calls to navigator (thus 'optimising' performance)
  protected:  // with description
-   G4bool LocateIntersectionPoint(
-        const  G4FieldTrack&       curveStartPointTangent,  //  A
-        const  G4FieldTrack&       curveEndPointTangent,    //  B
-        const  G4ThreeVector&      trialPoint,              //  E
-               G4FieldTrack&       intersectPointTangent,   // Output
-               G4bool&             recalculatedEndPoint);   // Out:
-     // If such an intersection exists, this function
-     // calculate the intersection point of the true path of the particle
-     // with the surface of the current volume (or of one of its daughters).
-     // (Should use lateral displacement as measure of convergence).
-   G4bool IntersectChord( G4ThreeVector  StartPointA,
-                          G4ThreeVector  EndPointB,
-                          G4double      &NewSafety,
-                          G4double      &LinearStepLength,
-                          G4ThreeVector &IntersectionPoint);
-     // Intersect the chord from StartPointA to EndPointB
-     // and return whether an intersection occurred
-   G4FieldTrack ReEstimateEndpoint( const G4FieldTrack &CurrentStateA,
-                                    const G4FieldTrack &EstimtdEndStateB,
-                                          G4double      linearDistSq,
-                                          G4double      curveDist);
-     // Return new estimate for state after curveDist
-     // starting from CurrentStateA,  to replace EstimtdEndStateB,
-     // (and report displacement -- if field is compiled verbose.)
    void PrintStepLengthDiagnostic( G4double      currentProposedStepLength,
 …
  private:
   // ----------------------------------------------------------------------
   //  DATA Members
   // ----------------------------------------------------------------------
+   // ----------------------------------------------------------------------
+   //  DATA Members
+   // ----------------------------------------------------------------------
    G4FieldManager *fDetectorFieldMgr;
 …
    G4Navigator   *fNavigator;
    //  STATE information
    //  -----------------
 …
      // Geometrical tolerance defining surface thickness
+  G4int maxNumberOfStepsForIntersection;
+  G4int maxNumberOfCallsToReIntegration;
+  G4int maxNumberOfCallsToReIntegration_depth;
+    //  Counters for Statistics about Location and ReIntegrations
+private:
+   static const G4int max_depth=4;
+   G4FieldTrack* ptrInterMedFT[max_depth+1];
+     // Used to store intermediate values of tracks in case of
+     // too slow progress
+private:
+   G4bool fUseBrentLocator;
+private:
+  G4VCurvedTrajectoryFilter* fpTrajectoryFilter;
+    // The filter encapsulates the algorithm which selects which
+    // intermediate points should be stored in a trajectory.
+    // When it is NULL, no intermediate points will be stored.
+    // Else PIF::ComputeStep must submit (all) intermediate
+    // points it calculates, to this filter.  (jacek 04/11/2002)
+   G4VIntersectionLocator *fIntersectionLocator;
+   G4bool fAllocatedLocator;
+     // Used to Intersection Locator
+ private:
+   G4VCurvedTrajectoryFilter* fpTrajectoryFilter;
+     // The filter encapsulates the algorithm which selects which
+     // intermediate points should be stored in a trajectory.
+     // When it is NULL, no intermediate points will be stored.
+     // Else PIF::ComputeStep must submit (all) intermediate
+     // points it calculates, to this filter.  (jacek 04/11/2002)
 };

trunk/source/geometry/navigation/include/G4PropagatorInField.icc

-              r850
+              r921
 //
 //
 // $Id: G4PropagatorInField.icc,v 1.11 2008/05/28 09:12:05 tnikitin Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PropagatorInField.icc,v 1.13 2008/10/29 14:31:55 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
+}
+inline
+void G4PropagatorInField::SetBrentMethod(G4bool newLocator)
+{
+  fUseBrentLocator=newLocator;
+}
+inline
+G4bool G4PropagatorInField::GetBrentMethod()
+{
+  return fUseBrentLocator;
+}
+inline
+void G4PropagatorInField::
+SetIntersectionLocator( G4VIntersectionLocator *pIntLoc )
+{
+  if(pIntLoc)  { fIntersectionLocator= pIntLoc; }
+}
+inline
+G4VIntersectionLocator* G4PropagatorInField::GetIntersectionLocator()
+{
+  return fIntersectionLocator;
+}
+inline
+G4bool G4PropagatorInField::IntersectChord( G4ThreeVector  StartPointA,
+                                            G4ThreeVector  EndPointB,
+                                            G4double      &NewSafety,
+                                            G4double      &LinearStepLength,
+                                            G4ThreeVector &IntersectionPoint )
+{
+  // Calculate the direction and length of the chord AB
+  //
+  return fIntersectionLocator
+         ->IntersectChord(StartPointA,EndPointB,NewSafety,
+                          fPreviousSafety,fPreviousSftOrigin,
+                          LinearStepLength,IntersectionPoint);
+}

trunk/source/geometry/navigation/include/G4RegularNavigation.hh

r850	r921
26	26	//
27	27	// $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh

r850	r921
26	26	//
27	27	// $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc

r850	r921
26	26	//
27	27	// $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4SafetyHelper.hh

r850	r921
26	26	//
27	27	// $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4TransportationManager.hh

r850	r921
26	26	//
27	27	// $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// class G4TransportationManager

trunk/source/geometry/navigation/include/G4TransportationManager.icc

r850	r921
26	26	//
27	27	// $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	// ------------------------------------------------------------
30	30	// GEANT 4 inlined function members implementation

trunk/source/geometry/navigation/include/G4VoxelNavigation.hh

r850	r921
26	26	//
27	27	// $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/include/G4VoxelNavigation.icc

r850	r921
26	26	//
27	27	// $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4AuxiliaryNavServices.cc

r850	r921
25	25	//
26	26	// $Id: G4AuxiliaryNavServices.cc,v 1.3 2006/06/29 18:36:32 gunter Exp $
27		// GEANT4 tag $Name: ~~HEAD~~ $
	27	// GEANT4 tag $Name: geant4-09-02-cand-01 $
28	28	//
29	29	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4DrawVoxels.cc

r850	r921
26	26	//
27	27	// $Id: G4DrawVoxels.cc,v 1.4 2006/06/29 18:36:34 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4ErrorPropagationNavigator.cc

-              r850
+              r921
 //
 //
 // $Id: G4ErrorPropagationNavigator.cc,v 1.1 2007/05/16 12:49:18 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ErrorPropagationNavigator.cc,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 G4double G4ErrorPropagationNavigator::
 ComputeSafety( const G4ThreeVector &pGlobalpoint,
+               const G4double pMaxLength )
+               const G4double pMaxLength,
+               const G4bool keepState )
+{
+  G4double newSafety = G4Navigator::ComputeSafety(pGlobalpoint, pMaxLength);
+  G4double newSafety = G4Navigator::ComputeSafety(pGlobalpoint,
+                                                  pMaxLength, keepState);
   G4ErrorPropagatorData *g4edata

trunk/source/geometry/navigation/src/G4GeomTestErrorList.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestErrorList.cc,v 1.3 2006/06/29 18:36:36 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestOverlapList.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestOverlapList.cc,v 1.3 2006/06/29 18:36:39 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestOvershootList.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestOvershootList.cc,v 1.3 2006/06/29 18:36:41 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestPoint.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestPoint.cc,v 1.3 2006/06/29 18:36:44 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestSegment.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestSegment.cc,v 1.11 2007/11/16 09:39:14 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestStreamLogger.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestStreamLogger.cc,v 1.3 2006/06/29 18:36:49 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestVolPoint.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestVolPoint.cc,v 1.3 2006/06/29 18:36:52 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeomTestVolume.cc

r850	r921
26	26	//
27	27	// $Id: G4GeomTestVolume.cc,v 1.6 2007/11/16 09:39:14 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4GeometryMessenger.cc

r850	r921
26	26	//
27	27	// $Id: G4GeometryMessenger.cc,v 1.5 2006/06/29 18:36:57 gunter Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	// --------------------------------------------------------------------

trunk/source/geometry/navigation/src/G4MultiNavigator.cc

-              r831
+              r921
 //
 //
 // $Id: G4MultiNavigator.cc,v 1.7 2007/11/02 13:48:43 japost Exp $
+// $Id: G4MultiNavigator.cc,v 1.8 2008/10/24 14:00:03 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 //
 …
 G4double G4MultiNavigator::ComputeSafety( const G4ThreeVector& position,
+                                                G4double       maxDistance)
+                                          const G4double       maxDistance,
+                                          const G4bool         state)
+{
     // Recompute safety for the relevant point
 …
     for( register int num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num )
+    {
        safety = (*pNavigatorIter)->ComputeSafety( position, maxDistance );
+       safety = (*pNavigatorIter)->ComputeSafety( position, maxDistance, state);
        if( safety < minSafety ) { minSafety = safety; }
+    }

trunk/source/geometry/navigation/src/G4Navigator.cc

-              r831
+              r921
 //
 //
 // $Id: G4Navigator.cc,v 1.37 2007/10/18 14:18:36 gcosmo Exp $
+// $Id: G4Navigator.cc,v 1.38 2008/10/24 14:00:03 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 //
 …
 //
 G4double G4Navigator::ComputeSafety( const G4ThreeVector &pGlobalpoint,
+                                     const G4double pMaxLength)
+                                     const G4double pMaxLength,
+                                     const G4bool keepState)
+{
   G4double newSafety = 0.0;
 …
+  }
 #endif
+  if (keepState)  { SetSavedState(); }
   G4double distEndpointSq = (pGlobalpoint-fStepEndPoint).mag2();
 …
   fPreviousSafety = newSafety;
+  if (keepState)  { RestoreSavedState(); }
 #ifdef G4DEBUG_NAVIGATION
   if( fVerbose > 1 )

trunk/source/geometry/navigation/src/G4NormalNavigation.cc

r850	r921
26	26	//
27	27	// $Id: G4NormalNavigation.cc,v 1.9 2007/05/11 13:43:59 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4ParameterisedNavigation.cc

r850	r921
26	26	//
27	27	// $Id: G4ParameterisedNavigation.cc,v 1.12 2007/11/09 16:06:02 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4PathFinder.cc

-              r850
+              r921
 //
 //
 // $Id: G4PathFinder.cc,v 1.59 2008/04/29 15:32:54 gcosmo Exp $
+// $Id: G4PathFinder.cc,v 1.61 2008/11/13 12:59:26 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 //
 …
   if( (!fNewTrack) && ( longMoveEnd && longMoveSaf ) )
+  {
-     G4ThreeVector  LastSafetyLocation;
-       // Copy to keep last value - and restore
-     LastSafetyLocation= fSafetyLocation;
      // Recompute ComputeSafety for end position
      //
      revisedSafety= ComputeSafety(lastEndPosition);
-     // Reset the state of last call to ComputeSafety
-     //
-     ComputeSafety( LastSafetyLocation );
 #ifdef G4DEBUG_PATHFINDER
 …
    std::vector<G4Navigator*>::iterator pNavigatorIter;
    pNavigatorIter= fpTransportManager-> GetActiveNavigatorsIterator();
+   pNavigatorIter= fpTransportManager->GetActiveNavigatorsIterator();
    for( register G4int num=0; num<fNoActiveNavigators; ++pNavigatorIter,++num )
+   {
       G4double safety = (*pNavigatorIter)->ComputeSafety( position );
+      G4double safety = (*pNavigatorIter)->ComputeSafety( position,true );
       if( safety < minSafety ) { minSafety = safety; }
       fNewSafetyComputed[num]= safety;
 …
      for( numNav=0; numNav < fNoActiveNavigators; ++numNav )
+     {
         safety= fpNavigator[numNav]->ComputeSafety( startPoint );
+        safety= fpNavigator[numNav]->ComputeSafety( startPoint, false );
         fPreSafetyValues[numNav]= safety;
         fCurrentPreStepSafety[numNav]= safety;

trunk/source/geometry/navigation/src/G4PropagatorInField.cc

-              r850
+              r921
 //
 //
-// $Id: G4PropagatorInField.cc,v 1.43 2008/05/28 09:12:23 tnikitin Exp $
-// GEANT4 tag $Name: HEAD $
 //
 //
 …
 #include "G4VCurvedTrajectoryFilter.hh"
 #include "G4ChordFinder.hh"
+#include "G4BrentLocator.hh"
 ///////////////////////////////////////////////////////////////////////////
 …
 G4PropagatorInField::G4PropagatorInField( G4Navigator    *theNavigator,
+                                          G4FieldManager *detectorFieldMgr )
+                                          G4FieldManager *detectorFieldMgr,
+                                          G4VIntersectionLocator *vLocator  )
   : fDetectorFieldMgr(detectorFieldMgr),
     fCurrentFieldMgr(detectorFieldMgr),
 …
   fPreviousSafety= 0.0;
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
+  //
+  fUseBrentLocator=true;
+  // In case of too slow progress in finding Intersection Point
+  // intermediates Points on the Track must be stored.
+  // Initialise the array of Pointers [max_depth+1] to do this
+  G4ThreeVector zeroV(0.0,0.0,0.0);
+  for (G4int idepth=0; idepth<max_depth+1; idepth++ )
+  {
+    ptrInterMedFT[ idepth ] = new G4FieldTrack( zeroV, zeroV, 0., 0., 0., 0.);
+  }
+  // Counter for Maximum Number Of Trial before Intersection Found
+    maxNumberOfStepsForIntersection=0;
+ // Counter for Number Of Calls to ReIntegrationEndPoint Method
+    maxNumberOfCallsToReIntegration=0;
+    maxNumberOfCallsToReIntegration_depth=0;
+  // Definding Intersection Locator and his parameters
+  if(vLocator==0){
+    fIntersectionLocator= new G4BrentLocator(theNavigator);
+    fAllocatedLocator=true;
+  }else{
+    fIntersectionLocator=vLocator;
+    fAllocatedLocator=false;
+  }
+  fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
+  fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection());
+  fIntersectionLocator->SetChordFinderFor(GetChordFinder());
+  fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
+}
 G4PropagatorInField::~G4PropagatorInField()
+{
+  for ( G4int idepth=0; idepth<max_depth+1; idepth++)
+  {
+    delete ptrInterMedFT[idepth];
+  }
+  if(fVerboseLevel>0){
+  G4cout<<"G4PropagatorInField::Location with Max Number of Steps="
+       << maxNumberOfStepsForIntersection<<G4endl;
+  G4cout<<"G4PropagatorInField::ReIntegrateEndPoint was called "<<
+    maxNumberOfCallsToReIntegration<<" times and for depth algorithm "<<
+    maxNumberOfCallsToReIntegration_depth<<" times"<<G4endl;
+  }
+  if(fAllocatedLocator)delete  fIntersectionLocator;
+}
 …
   fSetFieldMgr= false;
+  GetChordFinder()->SetChargeMomentumMass(fCharge, fInitialMomentumModulus, fMass);
+  GetChordFinder()->SetChargeMomentumMass(fCharge, fInitialMomentumModulus, fMass);
+ // Values for Intersection Locator has to be updated on each call
+ // because the CurrentFieldManager changes
+    fIntersectionLocator->SetChordFinderFor(GetChordFinder());
+    fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
+    fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
+    fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection());
   G4FieldTrack  CurrentState(pFieldTrack);
   G4FieldTrack  OriginalState = CurrentState;
 …
        //   of vol(A), if it exists. Start with point E as first "estimate".
        G4bool recalculatedEndPt= false;
+       G4bool found_intersection =
+         LocateIntersectionPoint( SubStepStartState, CurrentState,
+         G4bool found_intersection = fIntersectionLocator->
+         EstimateIntersectionPoint( SubStepStartState, CurrentState,
                                   InterSectionPointE, IntersectPointVelct_G,
+                                  recalculatedEndPt);
+       // G4cout<<"In Locate"<<recalculatedEndPt<<"  and V"<<IntersectPointVelct_G.GetPosition()<<G4endl;
+                                  recalculatedEndPt,fPreviousSafety,fPreviousSftOrigin);
        intersects = intersects && found_intersection;
        if( found_intersection ) {
 …
   return TruePathLength;
+}
-// --------------------------------------------------------------------------
-// G4bool
-// G4PropagatorInField::LocateIntersectionPoint(
-//   const G4FieldTrack&       CurveStartPointVelocity,   //  A
-//   const G4FieldTrack&       CurveEndPointVelocity,     //  B
-//   const G4ThreeVector&      TrialPoint,                //  E
-//         G4FieldTrack&       IntersectedOrRecalculated  // Output
-//         G4bool&             recalculated)              // Out
-// --------------------------------------------------------------------------
-//
-// Function that returns the intersection of the true path with the surface
-// of the current volume (either the external one or the inner one with one
-// of the daughters
-//
-//     A = Initial point
-//     B = another point
-//
-// Both A and B are assumed to be on the true path.
-//
-//     E is the first point of intersection of the chord AB with
-//     a volume other than A  (on the surface of A or of a daughter)
-//
-// Convention of Use :
-//     i) If it returns "true", then IntersectionPointVelocity is set
-//       to the approximate intersection point.
-//    ii) If it returns "false", no intersection was found.
-//          The validity of IntersectedOrRecalculated depends on 'recalculated'
-//        a) if latter is false, then IntersectedOrRecalculated is invalid.
-//        b) if latter is true,  then IntersectedOrRecalculated is
-//             the new endpoint, due to a re-integration.
-// --------------------------------------------------------------------------
-G4bool
-G4PropagatorInField::LocateIntersectionPoint(
-  const   G4FieldTrack&       CurveStartPointVelocity,   //  A
-  const   G4FieldTrack&       CurveEndPointVelocity,     //  B
-  const   G4ThreeVector&      TrialPoint,                //  E
-          G4FieldTrack&       IntersectedOrRecalculatedFT, // Out: point found
-          G4bool&             recalculatedEndPoint)        // Out:
+{
-  // Find Intersection Point ( A, B, E )  of true path AB - start at E.
-  G4bool found_approximate_intersection = false;
-  G4bool there_is_no_intersection       = false;
-  G4FieldTrack  CurrentA_PointVelocity = CurveStartPointVelocity;
-  G4FieldTrack  CurrentB_PointVelocity = CurveEndPointVelocity;
-  G4ThreeVector CurrentE_Point = TrialPoint;
-  G4FieldTrack ApproxIntersecPointV(CurveEndPointVelocity); // FT-Def-Construct
-  G4double    NewSafety= -0.0;
-  G4bool final_section= true;  // Shows whether current section is last
-                               // (i.e. B=full end)
-  G4bool first_section=true;
-  recalculatedEndPoint= false;
-  G4bool restoredFullEndpoint= false;
-  G4int substep_no = 0;
-  // Limits for substep number
-  //
-  const G4int max_substeps=   10000;  // Test 120  (old value 100 )
-  const G4int warn_substeps=   1000;  //      100
-  // Statistics for substeps
-  //
-  static G4int max_no_seen= -1;
-  static G4int trigger_substepno_print= warn_substeps - 20 ;
-  //--------------------------------------------------------------------------
-  //  Algoritm for the case if progress in founding intersection is too slow.
-  //  Process is defined too slow if after N=param_substeps advances on the
-  //  path, it will be only 'fraction_done' of the total length.
-  //  In this case the remaining length is divided in two half and
-  //  the loop is restarted for each half.
-  //  If progress is still too slow, the division in two halfs continue
-  //  until 'max_depth'.
-  //--------------------------------------------------------------------------
-  G4double count_did_len=0.;
-  G4double count_all_len=0;
-  G4int param_substeps=100;//Test value for the maximum number of substeps
-  if(!fUseBrentLocator)  param_substeps=10;// Reduced value for the maximum number
-  const G4double fraction_done=0.3;
-  G4bool Second_half=false;      // First half or second half of divided step
-  // We need to know this for the 'final_section':
-  // real 'final_section' or first half 'final_section'
-  // In algorithm it is considered that the 'Second_half' is true
-  // and it becomes false only if we are in the first-half of level
-  // depthness or if we are in the first section
-  G4int depth=0; // Depth counts how many subdivisions of initial step made
-#ifdef G4DEBUG_FIELD
-  static G4double tolerance= 1.0e-8;
-  G4ThreeVector  StartPosition= CurveStartPointVelocity.GetPosition();
-  if( (TrialPoint - StartPosition).mag() < tolerance * mm )
+  {
-     G4cerr << "WARNING - G4PropagatorInField::LocateIntersectionPoint()"
-            << G4endl
-            << "          Intermediate F point is on top of starting point A."
-            << G4endl;
-     G4Exception("G4PropagatorInField::LocateIntersectionPoint()",
-                 "IntersectionPointIsAtStart", JustWarning,
-                 "Intersection point F is exactly at start point A." );
+  }
-#endif
-  // Intermediates Points on the Track = Subdivided Points must be stored.
-  // Give the initial values to 'InterMedFt'
-  // Important is 'ptrInterMedFT[0]', it saves the 'EndCurvePoint'
-  //
-  *ptrInterMedFT[0] = CurveEndPointVelocity;
-  for (G4int idepth=1; idepth<max_depth+1; idepth++ )
+  {
-    *ptrInterMedFT[idepth]=CurveStartPointVelocity;
+  }
-  // 'SubStartPoint' is needed to calculate the length of the divided step
-  //
-  G4FieldTrack SubStart_PointVelocity = CurveStartPointVelocity;
-  do
+  {
-    G4int substep_no_p = 0;
-    G4bool sub_final_section = false; // the same as final_section,
-                                      // but for 'sub_section'
-    do // REPEAT param
+    {
-      G4ThreeVector Point_A = CurrentA_PointVelocity.GetPosition();
-      G4ThreeVector Point_B = CurrentB_PointVelocity.GetPosition();
-      // F = a point on true AB path close to point E
-      // (the closest if possible)
-      //
-      if((!fUseBrentLocator)||(substep_no_p==0)){
-       ApproxIntersecPointV = GetChordFinder()
-                             ->ApproxCurvePointV( CurrentA_PointVelocity,
-                                                  CurrentB_PointVelocity,
-                                                  CurrentE_Point,
-                                                  fEpsilonStep );
-      //  The above method is the key & most intuitive part ...
+      }
-#ifdef G4DEBUG_FIELD
-      if( ApproxIntersecPointV.GetCurveLength() >
-          CurrentB_PointVelocity.GetCurveLength() * (1.0 + tolerance) )
+      {
-        G4cerr << "ERROR - G4PropagatorInField::LocateIntersectionPoint()"
-               << G4endl
-               << "        Intermediate F point is more advanced than"
-               << " endpoint B." << G4endl;
-        G4Exception("G4PropagatorInField::LocateIntersectionPoint()",
-                    "IntermediatePointConfusion", FatalException,
-                    "Intermediate F point is past end B point" );
+      }
-#endif
-      G4ThreeVector CurrentF_Point= ApproxIntersecPointV.GetPosition();
-      if(substep_no> maxNumberOfStepsForIntersection)maxNumberOfStepsForIntersection=substep_no;
-      // First check whether EF is small - then F is a good approx. point
-      // Calculate the length and direction of the chord AF
-      //
-      G4ThreeVector  ChordEF_Vector = CurrentF_Point - CurrentE_Point;
-      if ( ChordEF_Vector.mag2() <= sqr(GetDeltaIntersection()) )
+      {
-        found_approximate_intersection = true;
-        // Create the "point" return value
-        //
-        IntersectedOrRecalculatedFT = ApproxIntersecPointV;
-        IntersectedOrRecalculatedFT.SetPosition( CurrentE_Point );
-        // Note: in order to return a point on the boundary,
-        //       we must return E. But it is F on the curve.
-        //       So we must "cheat": we are using the position at point E
-        //       and the velocity at point F !!!
-        //
-        // This must limit the length we can allow for displacement!
+      }
-      else  // E is NOT close enough to the curve (ie point F)
+      {
-        // Check whether any volumes are encountered by the chord AF
-        // ---------------------------------------------------------
-        // First relocate to restore any Voxel etc information
-        // in the Navigator before calling ComputeStep()
-        //
-        fNavigator->LocateGlobalPointWithinVolume( Point_A );
-        G4ThreeVector PointG;   // Candidate intersection point
-        G4double stepLengthAF;
-        G4bool Intersects_AF = IntersectChord( Point_A,   CurrentF_Point,
-                                               NewSafety, stepLengthAF,
-                                               PointG );
-        if( Intersects_AF )
+        {
-          if(fUseBrentLocator){
-            G4FieldTrack EndPoint=ApproxIntersecPointV;
-            ApproxIntersecPointV= GetChordFinder()->ApproxCurvePointS(
-                   CurrentA_PointVelocity,CurrentB_PointVelocity,
-                   CurrentE_Point,CurrentF_Point,PointG,true,fEpsilonStep);
-            CurrentB_PointVelocity =  EndPoint;
-            CurrentE_Point = PointG;
-          // By moving point B, must take care if current
-          // AF has no intersection to try current FB!!
-          //
-          final_section= false;
+          }
-          else{
-          // G is our new Candidate for the intersection point.
-          // It replaces  "E" and we will repeat the test to see if
-          // it is a good enough approximate point for us.
-          //       B    <- F
-          //       E    <- G
-          CurrentB_PointVelocity = ApproxIntersecPointV;
-          CurrentE_Point = PointG;
-          // By moving point B, must take care if current
-          // AF has no intersection to try current FB!!
-          //
-          final_section= false;
+          }
-#ifdef G4VERBOSE
-          if( fVerboseLevel > 3 )
+          {
-            G4cout << "G4PiF::LI> Investigating intermediate point"
-                   << " at s=" << ApproxIntersecPointV.GetCurveLength()
-                   << " on way to full s="
-                   << CurveEndPointVelocity.GetCurveLength() << G4endl;
+          }
-#endif
+        }
-        else  // not Intersects_AF
+        {
-          // In this case:
-          // There is NO intersection of AF with a volume boundary.
-          // We must continue the search in the segment FB!
-          //
-          fNavigator->LocateGlobalPointWithinVolume( CurrentF_Point );
-          G4double stepLengthFB;
-          G4ThreeVector PointH;
-          // Check whether any volumes are encountered by the chord FB
-          // ---------------------------------------------------------
-          G4bool Intersects_FB = IntersectChord( CurrentF_Point, Point_B,
-                                                 NewSafety, stepLengthFB,
-                                                 PointH );
-          if( Intersects_FB )
+          {
-            if(fUseBrentLocator){
-               CurrentA_PointVelocity = ApproxIntersecPointV;
-               ApproxIntersecPointV= GetChordFinder()->ApproxCurvePointS(
-                   CurrentA_PointVelocity,CurrentB_PointVelocity,
-                   CurrentE_Point,Point_A,PointH,false,fEpsilonStep);
-               CurrentE_Point = PointH;
+           }
-           else{
-            // There is an intersection of FB with a volume boundary
-            // H <- First Intersection of Chord FB
-            // H is our new Candidate for the intersection point.
-            // It replaces  "E" and we will repeat the test to see if
-            // it is a good enough approximate point for us.
-            // Note that F must be in volume volA  (the same as A)
-            // (otherwise AF would meet a volume boundary!)
-            //   A    <- F
-            //   E    <- H
-            CurrentA_PointVelocity = ApproxIntersecPointV;
-            CurrentE_Point = PointH;
+           }
+          }
-          else  // not Intersects_FB
+          {
-            // There is NO intersection of FB with a volume boundary
-            if( final_section  )
+            {
-              // If B is the original endpoint, this means that whatever
-              // volume(s) intersected the original chord, none touch the
-              // smaller chords we have used.
-              // The value of 'IntersectedOrRecalculatedFT' returned is
-              // likely not valid
-              // Check on real final_section or SubEndSection
-              //
-              if( ((Second_half)&&(depth==0)) || (first_section) )
+              {
-                there_is_no_intersection = true;   // real final_section
+              }
-              else
+              {
-                // end of subsection, not real final section
-                // exit from the and go to the depth-1 level
-                substep_no_p = param_substeps+2;  // exit from the loop
-                // but 'Second_half' is still true because we need to find
-                // the 'CurrentE_point' for the next loop
-                //
-                Second_half = true;
-                sub_final_section = true;
+              }
+            }
-            else
+            {
-              // We must restore the original endpoint
-              CurrentA_PointVelocity = CurrentB_PointVelocity;  // Got to B
-              CurrentB_PointVelocity = CurveEndPointVelocity;
-              restoredFullEndpoint = true;
+            }
-          } // Endif (Intersects_FB)
-        } // Endif (Intersects_AF)
-        // Ensure that the new endpoints are not further apart in space
-        // than on the curve due to different errors in the integration
-        //
-        G4double linDistSq, curveDist;
-        linDistSq = ( CurrentB_PointVelocity.GetPosition()
-                    - CurrentA_PointVelocity.GetPosition() ).mag2();
-        curveDist = CurrentB_PointVelocity.GetCurveLength()
-                    - CurrentA_PointVelocity.GetCurveLength();
-         if( curveDist*curveDist*(1+2*fEpsilonStep ) < linDistSq )
+        {
-          // Re-integrate to obtain a new B
-          //
-          G4FieldTrack newEndPointFT=
-                  ReEstimateEndpoint( CurrentA_PointVelocity,
-                                      CurrentB_PointVelocity,
-                                      linDistSq,    // to avoid recalculation
-                                      curveDist );
-          G4FieldTrack oldPointVelB = CurrentB_PointVelocity;
-          CurrentB_PointVelocity = newEndPointFT;
-          maxNumberOfCallsToReIntegration= maxNumberOfCallsToReIntegration+1;
-          #ifdef G4DEBUG_FIELD
-          G4cout<<"G4PIF::Call ReIntEnd1 linD="<<std::sqrt(linDistSq)<<" curve="<<curveDist<<" n="<<substep_no<<G4endl;
-          G4cout<<"G4PIF::Call ReIntEnd2 IntersectAF="<< Intersects_AF<<" final_section="<<final_section<<G4endl;
-          #endif
-          if( (final_section)&&(Second_half)&&(depth==0) ) // real final section
+          {
-            recalculatedEndPoint = true;
-            IntersectedOrRecalculatedFT = newEndPointFT;
-              // So that we can return it, if it is the endpoint!
+          }
+        }
-        if( curveDist < 0.0 )
+        {
-          G4cerr << "ERROR - G4PropagatorInField::LocateIntersectionPoint()"
-                 << G4endl
-                 << "        Error in advancing propagation." << G4endl;
-          fVerboseLevel = 5; // Print out a maximum of information
-          printStatus( CurrentA_PointVelocity,  CurrentB_PointVelocity,
-                       -1.0, NewSafety,  substep_no, 0 );
-          G4cerr << "        Point A (start) is " << CurrentA_PointVelocity
-                 << G4endl;
-          G4cerr << "        Point B (end)   is " << CurrentB_PointVelocity
-                 << G4endl;
-          G4cerr << "        Curve distance is " << curveDist << G4endl;
-          G4cerr << G4endl
-                 << "The final curve point is not further along"
-                 << " than the original!" << G4endl;
-          if( recalculatedEndPoint )
+          {
-            G4cerr << "Recalculation of EndPoint was called with fEpsStep= "
-                   << fEpsilonStep << G4endl;
+          }
-          G4cerr.precision(20);
-          G4cerr << " Point A (Curve start)   is " << CurveStartPointVelocity
-                 << G4endl;
-          G4cerr << " Point B (Curve   end)   is " << CurveEndPointVelocity
-                 << G4endl;
-          G4cerr << " Point A (Current start) is " << CurrentA_PointVelocity
-                 << G4endl;
-          G4cerr << " Point B (Current end)   is " << CurrentB_PointVelocity
-                 << G4endl;
-          G4cerr << " Point S (Sub start)     is " << SubStart_PointVelocity
-                 << G4endl;
-          G4cerr << " Point E (Trial Point)   is " << CurrentE_Point
-                 << G4endl;
-          G4cerr << " Point F (Intersection)  is " << ApproxIntersecPointV
-                 << G4endl;
-          G4cerr << "        LocateIntersection parameters are : Substep no= "
-                 << substep_no << G4endl;
-          G4cerr << "        Substep depth no= "<< substep_no_p  << " Depth= "
-                 << depth << G4endl;
-          G4cerr << "        did_len= "<< count_did_len  << " all_len= "
-                 << count_all_len << G4endl;
-          G4Exception("G4PropagatorInField::LocateIntersectionPoint()",
-                      "FatalError", FatalException,
-                      "Error in advancing propagation.");
+        }
-        if(restoredFullEndpoint)
+        {
-          final_section = restoredFullEndpoint;
-          restoredFullEndpoint = false;
+        }
-      } // EndIf ( E is close enough to the curve, ie point F. )
-        // tests ChordAF_Vector.mag() <= maximum_lateral_displacement
-#ifdef G4DEBUG_LOCATE_INTERSECTION
-      if( substep_no >= trigger_substepno_print )
+      {
-        G4cout << "Difficulty in converging in "
-               << "G4PropagatorInField::LocateIntersectionPoint():"
-               << G4endl
-               << "    Substep no = " << substep_no << G4endl;
-        if( substep_no == trigger_substepno_print )
+        {
-          printStatus( CurveStartPointVelocity, CurveEndPointVelocity,
-                       -1.0, NewSafety, 0, 0);
+        }
-        G4cout << " State of point A: ";
-        printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity,
-                     -1.0, NewSafety, substep_no-1, 0);
-        G4cout << " State of point B: ";
-        printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity,
-                     -1.0, NewSafety, substep_no, 0);
+      }
-#endif
-      substep_no++;
-      substep_no_p++;
-    } while (  ( ! found_approximate_intersection )
-            && ( ! there_is_no_intersection )
-            && ( substep_no_p <= param_substeps) );  // UNTIL found or
-                                                     // failed param substep
-    first_section = false;
-    if( (!found_approximate_intersection) && (!there_is_no_intersection) )
+    {
-      G4double did_len = std::abs( CurrentA_PointVelocity.GetCurveLength()
-                       - SubStart_PointVelocity.GetCurveLength());
-      G4double all_len = std::abs( CurrentB_PointVelocity.GetCurveLength()
-                       - SubStart_PointVelocity.GetCurveLength());
-      count_did_len=did_len;
-      count_all_len=all_len;
-      G4double stepLengthAB;
-      G4ThreeVector PointGe;
-      // Check if progress is too slow and if it possible to go deeper,
-      // then halve the step if so
-      //
-      if( ( ( did_len )<fraction_done*all_len)
-         && (depth<max_depth) && (!sub_final_section) )
+      {
-        Second_half=false;
-        depth++;
-        G4double Sub_len = (all_len-did_len)/(2.);
-        G4FieldTrack start = CurrentA_PointVelocity;
-        G4MagInt_Driver* integrDriver=GetChordFinder()->GetIntegrationDriver();
-        integrDriver->AccurateAdvance(start, Sub_len, fEpsilonStep);
-        *ptrInterMedFT[depth] = start;
-        CurrentB_PointVelocity = *ptrInterMedFT[depth];
-        // Adjust 'SubStartPoint' to calculate the 'did_length' in next loop
-        //
-        SubStart_PointVelocity = CurrentA_PointVelocity;
-        // Find new trial intersection point needed at start of the loop
-        //
-        G4ThreeVector Point_A = CurrentA_PointVelocity.GetPosition();
-        G4ThreeVector SubE_point = CurrentB_PointVelocity.GetPosition();
-        fNavigator->LocateGlobalPointWithinVolume(Point_A);
-        G4bool Intersects_AB = IntersectChord(Point_A, SubE_point,
-                                              NewSafety, stepLengthAB, PointGe);
-        if(Intersects_AB)
+        {
-          CurrentE_Point = PointGe;
+        }
-        else
+        {
-          // No intersection found for first part of curve
-          // (CurrentA,InterMedPoint[depth]). Go to the second part
-          //
-          Second_half = true;
+        }
-      } // if did_len
-      if( (Second_half)&&(depth!=0) )
+      {
-        // Second part of curve (InterMed[depth],Intermed[depth-1])                       )
-        // On the depth-1 level normally we are on the 'second_half'
-        Second_half = true;
-        //  Find new trial intersection point needed at start of the loop
-        //
-        SubStart_PointVelocity = *ptrInterMedFT[depth];
-        CurrentA_PointVelocity = *ptrInterMedFT[depth];
-        CurrentB_PointVelocity = *ptrInterMedFT[depth-1];
-        // Ensure that the new endpoints are not further apart in space
-        // than on the curve due to different errors in the integration
-        //
-        G4double linDistSq, curveDist;
-        linDistSq = ( CurrentB_PointVelocity.GetPosition()
-                    - CurrentA_PointVelocity.GetPosition() ).mag2();
-        curveDist = CurrentB_PointVelocity.GetCurveLength()
-                    - CurrentA_PointVelocity.GetCurveLength();
-        if( curveDist*curveDist*(1+2*fEpsilonStep ) < linDistSq )
+        {
-          // Re-integrate to obtain a new B
-          //
-          G4FieldTrack newEndPointFT=
-                  ReEstimateEndpoint( CurrentA_PointVelocity,
-                                      CurrentB_PointVelocity,
-                                      linDistSq,    // to avoid recalculation
-                                      curveDist );
-          G4FieldTrack oldPointVelB = CurrentB_PointVelocity;
-          CurrentB_PointVelocity = newEndPointFT;
-          maxNumberOfCallsToReIntegration_depth= maxNumberOfCallsToReIntegration_depth+1;
+        }
-        G4ThreeVector Point_A    = CurrentA_PointVelocity.GetPosition();
-        G4ThreeVector SubE_point = CurrentB_PointVelocity.GetPosition();
-        fNavigator->LocateGlobalPointWithinVolume(Point_A);
-        G4bool Intersects_AB = IntersectChord(Point_A, SubE_point, NewSafety,
-                                              stepLengthAB, PointGe);
-        if(Intersects_AB)
+        {
-          CurrentE_Point = PointGe;
+        }
-        else
+        {
-          final_section = true;
+        }
-        depth--;
+      }
-    }  // if(!found_aproximate_intersection)
-  } while ( ( ! found_approximate_intersection )
-            && ( ! there_is_no_intersection )
-            && ( substep_no <= max_substeps) ); // UNTIL found or failed
-  if( substep_no > max_no_seen )
+  {
-    max_no_seen = substep_no;
-    if( max_no_seen > warn_substeps )
+    {
-      trigger_substepno_print = max_no_seen-20; // Want to see last 20 steps
+    }
+  }
-  if(  ( substep_no >= max_substeps)
-      && !there_is_no_intersection
-      && !found_approximate_intersection )
+  {
-    G4cerr << "WARNING - G4PropagatorInField::LocateIntersectionPoint()"
-           << G4endl
-           << "          Convergence is requiring too many substeps: "
-           << substep_no << G4endl;
-    G4cerr << "          Abandoning effort to intersect. " << G4endl;
-    G4cerr << "          Information on start & current step follows in cout."
-           << G4endl;
-    G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()"
-           << G4endl
-           << "          Convergence is requiring too many substeps: "
-           << substep_no << G4endl;
-    G4cout << "          Found intersection = "
-           << found_approximate_intersection << G4endl
-           << "          Intersection exists = "
-           << !there_is_no_intersection << G4endl;
-    G4cout << "          Start and Endpoint of Requested Step:" << G4endl;
-    printStatus( CurveStartPointVelocity, CurveEndPointVelocity,
-                 -1.0, NewSafety, 0, 0);
-    G4cout << G4endl;
-    G4cout << "          'Bracketing' starting and endpoint of current Sub-Step"
-           << G4endl;
-    printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity,
-                 -1.0, NewSafety, substep_no-1, 0);
-    printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity,
-                 -1.0, NewSafety, substep_no, 0);
-    G4cout << G4endl;
-#ifdef FUTURE_CORRECTION
-    // Attempt to correct the results of the method // FIX - TODO
-    if ( ! found_approximate_intersection )
+    {
-      recalculatedEndPoint = true;
-      // Return the further valid intersection point -- potentially A ??
-      // JA/19 Jan 2006
-      IntersectedOrRecalculatedFT = CurrentA_PointVelocity;
-      G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()"
-             << G4endl
-             << "          Did not convergence after " << substep_no
-             << " substeps." << G4endl;
-      G4cout << "          The endpoint was adjused to pointA resulting"
-             << G4endl
-             << "          from the last substep: " << CurrentA_PointVelocity
-             << G4endl;
+    }
-#endif
-    G4cout.precision( 10 );
-    G4double done_len = CurrentA_PointVelocity.GetCurveLength();
-    G4double full_len = CurveEndPointVelocity.GetCurveLength();
-    G4cout << "ERROR - G4PropagatorInField::LocateIntersectionPoint()"
-           << G4endl
-           << "        Undertaken only length: " << done_len
-           << " out of " << full_len << " required." << G4endl;
-    G4cout << "        Remaining length = " << full_len - done_len << G4endl;
-    G4Exception("G4PropagatorInField::LocateIntersectionPoint()",
-                "UnableToLocateIntersection", FatalException,
-                "Too many substeps while trying to locate intersection.");
+  }
-  else if( substep_no >= warn_substeps )
+  {
-    int oldprc= G4cout.precision( 10 );
-    G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()"
-           << G4endl
-           << "          Undertaken length: "
-           << CurrentB_PointVelocity.GetCurveLength();
-    G4cout << " - Needed: "  << substep_no << " substeps." << G4endl
-           << "          Warning level = " << warn_substeps
-           << " and maximum substeps = " << max_substeps << G4endl;
-    G4Exception("G4PropagatorInField::LocateIntersectionPoint()",
-                "DifficultyToLocateIntersection", JustWarning,
-                "Many substeps while trying to locate intersection.");
-    G4cout.precision( oldprc );
+  }
-  return  !there_is_no_intersection; //  Success or failure
+}
 …
+}
-G4bool
-G4PropagatorInField::IntersectChord( G4ThreeVector  StartPointA,
-                                     G4ThreeVector  EndPointB,
-                                     G4double      &NewSafety,
-                                     G4double      &LinearStepLength,
-                                     G4ThreeVector &IntersectionPoint
+                                   )
+{
-    // Calculate the direction and length of the chord AB
-    G4ThreeVector  ChordAB_Vector = EndPointB - StartPointA;
-    G4double       ChordAB_Length = ChordAB_Vector.mag();  // Magnitude (norm)
-    G4ThreeVector  ChordAB_Dir =    ChordAB_Vector.unit();
-    G4bool intersects;
-    G4ThreeVector OriginShift = StartPointA - fPreviousSftOrigin ;
-    G4double      MagSqShift  = OriginShift.mag2() ;
-    G4double      currentSafety;
-    G4bool        doCallNav= false;
-    if( MagSqShift >= sqr(fPreviousSafety) )
+    {
-        currentSafety = 0.0 ;
-    }else{
-        currentSafety = fPreviousSafety - std::sqrt(MagSqShift) ;
+    }
-    if( fUseSafetyForOptimisation && (ChordAB_Length <= currentSafety) )
+    {
-       // The Step is guaranteed to be taken
-       LinearStepLength = ChordAB_Length;
-       intersects = false;
-       NewSafety= currentSafety;
-#if 0
-       G4cout << " G4PropagatorInField does not call Navigator::ComputeStep " << G4endl ;
-       G4cout << "    step= " << LinearStepLength << " safety= " << NewSafety << G4endl;
-       G4cout << "    safety: Origin = " << fPreviousSftOrigin << " val= " << fPreviousSafety << G4endl;
-#endif
+    }
-    else
+    {
-       doCallNav= true;
-       // Check whether any volumes are encountered by the chord AB
-       // G4cout << " G4PropagatorInField calling Navigator::ComputeStep " << G4endl ;
-       LinearStepLength =
-        fNavigator->ComputeStep( StartPointA, ChordAB_Dir,
-                                 ChordAB_Length, NewSafety );
-       intersects = (LinearStepLength <= ChordAB_Length);
-       // G4Navigator contracts to return k_infinity if len==asked
-       // and it did not find a surface boundary at that length
-       LinearStepLength = std::min( LinearStepLength, ChordAB_Length);
-       // G4cout << " G4PiF got step= " << LinearStepLength << " safety= " << NewSafety << G4endl;
-       // Save the last calculated safety!
-       fPreviousSftOrigin = StartPointA;
-       fPreviousSafety= NewSafety;
-       if( intersects ){
-          // Intersection Point of chord AB and either volume A's surface
-          //                                or a daughter volume's surface ..
-          IntersectionPoint = StartPointA + LinearStepLength * ChordAB_Dir;
+       }
+    }
-#ifdef DEBUG_INTERSECTS_CHORD
-    // printIntersection(
-    // StartPointA, EndPointB, LinearStepLength, IntersectionPoint, NewSafety
-    G4cout << " G4PropagatorInField::IntersectChord reports " << G4endl;
-    G4cout << " PiF-IC> "
-           << "Start="  << std::setw(12) << StartPointA       << " "
-           << "End= "   << std::setw(8) << EndPointB         << " "
-           << "StepIn=" << std::setw(8) << LinearStepLength  << " "
-           << "NewSft=" << std::setw(8) << NewSafety << " "
-           << "CallNav=" << doCallNav      << "  "
-           << "Intersects " << intersects     << "  ";
-    if( intersects )
-      G4cout << "IntrPt=" << std::setw(8) << IntersectionPoint << " " ;
-    G4cout << G4endl;
-#endif
-    return intersects;
+}
-// --------------------- oooo000000000000oooo ----------------------------
-G4FieldTrack G4PropagatorInField::
-ReEstimateEndpoint( const G4FieldTrack &CurrentStateA,
-                    const G4FieldTrack &EstimatedEndStateB,
-                          G4double      linearDistSq,
-                          G4double      curveDist
+                  )
+{
-  // G4double checkCurveDist= EstimatedEndStateB.GetCurveLength()
-  //   - CurrentStateA.GetCurveLength();
-  // G4double checkLinDistSq= (EstimatedEndStateB.GetPosition()
-  //                    - CurrentStateA.GetPosition() ).mag2();
-  G4FieldTrack newEndPoint( CurrentStateA );
-  G4MagInt_Driver* integrDriver= GetChordFinder()->GetIntegrationDriver();
-  G4FieldTrack retEndPoint( CurrentStateA );
-  G4bool goodAdvance;
-  G4int  itrial=0;
-  const G4int no_trials= 20;
-  G4double endCurveLen= EstimatedEndStateB.GetCurveLength();
-  do
+  {
-     G4double currentCurveLen= newEndPoint.GetCurveLength();
-     G4double advanceLength= endCurveLen - currentCurveLen ;
-     if (std::abs(advanceLength)<kCarTolerance)
+     {
-       advanceLength=(EstimatedEndStateB.GetPosition()
-                     -newEndPoint.GetPosition()).mag();
+     }
-     goodAdvance=
-       integrDriver->AccurateAdvance(newEndPoint, advanceLength, fEpsilonStep);
-     //              ***************
+  }
-  while( !goodAdvance && (++itrial < no_trials) );
-  if( goodAdvance )
+  {
-    retEndPoint= newEndPoint;
+  }
-  else
+  {
-    retEndPoint= EstimatedEndStateB; // Could not improve without major work !!
+  }
-  //  All the work is done
-  //   below are some diagnostics only -- before the return!
-  //
-  static const G4String MethodName("G4PropagatorInField::ReEstimateEndpoint");
-#ifdef G4VERBOSE
-  G4int  latest_good_trials=0;
-  if( itrial > 1)
+  {
-    if( fVerboseLevel > 0 )
+    {
-      G4cout << MethodName << " called - goodAdv= " << goodAdvance
-             << " trials = " << itrial
-             << " previous good= " << latest_good_trials
-             << G4endl;
+    }
-    latest_good_trials=0;
+  }
-  else
+  {
-    latest_good_trials++;
+  }
-#endif
-#ifdef G4DEBUG_FIELD
-  G4double lengthDone = newEndPoint.GetCurveLength()
-                      - CurrentStateA.GetCurveLength();
-  if( !goodAdvance )
+  {
-    if( fVerboseLevel >= 3 )
+    {
-      G4cout << MethodName << "> AccurateAdvance failed " ;
-      G4cout << " in " << itrial << " integration trials/steps. " << G4endl;
-      G4cout << " It went only " << lengthDone << " instead of " << curveDist
-             << " -- a difference of " << curveDist - lengthDone  << G4endl;
-      G4cout << " ReEstimateEndpoint> Reset endPoint to original value!"
-             << G4endl;
+    }
+  }
-  static G4int noInaccuracyWarnings = 0;
-  G4int maxNoWarnings = 10;
-  if (  (noInaccuracyWarnings < maxNoWarnings )
-       || (fVerboseLevel > 1) )
+    {
-      G4cerr << "G4PropagatorInField::LocateIntersectionPoint():"
-             << G4endl
-             << " Warning: Integration inaccuracy requires"
-             <<   " an adjustment in the step's endpoint."  << G4endl
-             << "   Two mid-points are further apart than their"
-             <<   " curve length difference"                << G4endl
-             << "   Dist = "       << std::sqrt(linearDistSq)
-             << " curve length = " << curveDist             << G4endl;
-      G4cerr << " Correction applied is "
-             << (newEndPoint.GetPosition()-EstimatedEndStateB.GetPosition()).mag()
-             << G4endl;
+    }
-#else
-  // Statistics on the RMS value of the corrections
-  static G4int    noCorrections=0;
-  static G4double sumCorrectionsSq = 0;
-  noCorrections++;
-  if( goodAdvance )
+  {
-    sumCorrectionsSq += (EstimatedEndStateB.GetPosition() -
-                         newEndPoint.GetPosition()).mag2();
+  }
-  linearDistSq -= curveDist; // To use linearDistSq ... !
-#endif
-  return retEndPoint;
+}
 // Access the points which have passed through the filter. The
 // points are stored as ThreeVectors for the initial impelmentation

trunk/source/geometry/navigation/src/G4ReplicaNavigation.cc

r850	r921
26	26	//
27	27	// $Id: G4ReplicaNavigation.cc,v 1.19 2008/04/28 15:39:55 gcosmo Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4SafetyHelper.cc

-              r831
+              r921
 // ********************************************************************
 //
 // $Id: G4SafetyHelper.cc,v 1.15 2007/11/14 10:04:21 gcosmo Exp $
+// $Id: G4SafetyHelper.cc,v 1.16 2008/10/24 14:00:03 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 //
 …
+    {
       // Safety for mass geometry
       fLastSafety = fpMassNavigator->ComputeSafety(position);
+      fLastSafety = fpMassNavigator->ComputeSafety(position,true);
+    }
     else
+    {
       // Safety for all geometries
       fLastSafety = fpPathFinder->ComputeSafety( position );
+      fLastSafety = fpPathFinder->ComputeSafety(position);
+    }
     newSafety = fLastSafety;

trunk/source/geometry/navigation/src/G4TransportationManager.cc

r850	r921
26	26	//
27	27	// $Id: G4TransportationManager.cc,v 1.15 2007/04/12 11:51:48 vnivanch Exp $
28		// GEANT4 tag $Name: ~~HEAD~~ $
	28	// GEANT4 tag $Name: geant4-09-02-cand-01 $
29	29	//
30	30	//

trunk/source/geometry/navigation/src/G4VoxelNavigation.cc

-              r850
+              r921
 //
 //
 // $Id: G4VoxelNavigation.cc,v 1.7 2007/05/11 13:43:59 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4VoxelNavigation.cc,v 1.9 2008/11/14 18:26:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
                 G4String solidResponse = "-kInside-";
                 if (insideIntPt == kOutside)
                   solidResponse = "-kOutside-";
+                  { solidResponse = "-kOutside-"; }
                 else if (insideIntPt == kSurface)
                   solidResponse = "-kSurface-";
+                  { solidResponse = "-kSurface-"; }
                 if( fVerbose == 1 )
+                {
 …
                          << "    For point p: " << intersectionPoint
                          << ", considered as 'intersection' point." << G4endl;
+                }
+                G4double safetyIn= -1, safetyOut= -1;  //  Set to invalid values
+                G4double newDistIn= -1,  newDistOut= -1;
+                if( insideIntPt != kInside )
+                {
+                  safetyIn= sampleSolid->DistanceToIn(intersectionPoint);
+                  newDistIn= sampleSolid->DistanceToIn(intersectionPoint,
+                                                       sampleDirection);
+                }
+                if( insideIntPt != kOutside )
+                {
+                  safetyOut= sampleSolid->DistanceToOut(intersectionPoint);
+                  newDistOut= sampleSolid->DistanceToOut(intersectionPoint,
+                                                         sampleDirection);
+                }
                 if( insideIntPt != kSurface )
 …
                          << " for this point !" << G4endl;
                   G4cout << "          Point = " << intersectionPoint << G4endl;
+                  G4cout << "          Safety values: " << G4endl;
                   if ( insideIntPt != kInside )
                     G4cout << "        DistanceToIn(p) = "
                            << sampleSolid->DistanceToIn(intersectionPoint)
+                  {
+                    G4cout << "          DistanceToIn(p)  = " << safetyIn
                            << G4endl;
+                  if ( insideIntPt != kOutside )
+                    G4cout << "        DistanceToOut(p) = "
+                           << sampleSolid->DistanceToOut(intersectionPoint)
+                  }
+                  if ( insideIntPt != kOutside )
+                  {
+                    G4cout << "          DistanceToOut(p) = " << safetyOut
                            << G4endl;
+                  }
                   G4Exception("G4VoxelNavigation::ComputeStep()",
                               "InaccurateDistanceToIn", JustWarning,
                               "Navigator gets conflicting response from Solid.");
+                              "Conflicting response from Solid.");
                   G4cout.precision(oldcoutPrec);
+                }
+                else
+                {
+                  // If it is on the surface, *ensure* that either DistanceToIn
+                  // or DistanceToOut returns a finite value ( >= Tolerance).
+                  //
+                  if( std::max( newDistIn, newDistOut ) <= kCarTolerance )
+                  {
+                    G4cout << "ERROR - G4VoxelNavigation::ComputeStep()"
+                       << G4endl
+                       << "  Identified point for which the solid "
+                       << sampleSolid->GetName() << G4endl
+                       << "  has MAJOR problem:  " << G4endl
+                       << "  --> Both DistanceToIn(p,v) and DistanceToOut(p,v) "
+                       << "return Zero, an equivalent value or negative value."
+                       << G4endl;
+                    G4cout << "    Solid: " << sampleSolid << G4endl;
+                    G4cout << "    Point p= " << intersectionPoint << G4endl;
+                    G4cout << "    Direction v= " << sampleDirection << G4endl;
+                    G4cout << "    DistanceToIn(p,v)     = " << newDistIn
+                           << G4endl;
+                    G4cout << "    DistanceToOut(p,v,..) = " << newDistOut
+                           << G4endl;
+                    G4cout << "    Safety values: " << G4endl;
+                    G4cout << "      DistanceToIn(p)  = " << safetyIn
+                           << G4endl;
+                    G4cout << "      DistanceToOut(p) = " << safetyOut
+                           << G4endl;
+                    G4Exception("G4VoxelNavigation::ComputeStep()",
+                              "DistanceToInAndOutAreZero", FatalException,
+                              "Zero from both Solid DistanceIn and Out(p,v).");
+                  }
+                }
+              }

trunk/source/geometry/solids/CSG/History

-              r850
+              r921
 $Id: History,v 1.105 2008/07/07 10:43:04 gcosmo Exp $
+$Id: History,v 1.109 2008/11/21 09:50:20 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Nov 21, 2008  G.Cosmo                    geom-csg-V09-01-08
+- G4Sphere: defined Get/SetInnerRadius() accessors to be compliant with
+  other CSG solids and allow consistent treatment in persistency code...
+Nov 06, 2008  G.Cosmo                    geom-csg-V09-01-07
+- G4Tubs, G4Cons: implemented caching of trigonometric values, now directly
+  computed inside modifiers for Phi angles and required for parametrised
+  cases. Improvement bringing up to 20% speedup in normal tracking for
+  tube/cone-sections placements.
+Nov 05, 2008  G.Cosmo                    geom-csg-V09-01-06
+- G4Cons: implemented first speed improvements and corrections from joint
+  code review of G4Cons class. Cached computation for half-tolerance and
+  use of Boolean flag for identifying if full-cone or section.
+- G4Tubs: more refinements to previous review; corrected implementation
+  of constructor to conform to implementation as in G4Cons. Fixed issue in
+  SetDeltaPhi() method after changes introduced in the previous tag.
+Sep 18, 2008  T.Nikitina                 geom-csg-V09-01-05
+- G4Tubs: implemented first speed improvements and corrections from joint
+  code review of G4Tubs class. Cached computation for half-tolerance and
+  use of Boolean flag for identifying if full-tube or section.
 Jul 07, 2008  V.Grichine                 geom-csg-V09-01-04

trunk/source/geometry/solids/CSG/include/G4Cons.hh

-              r850
+              r921
 //
 //
 // $Id: G4Cons.hh,v 1.18 2007/05/18 07:38:00 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Cons.hh,v 1.21 2008/11/06 11:04:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //  fDPhi  delta angle of the segment in radians
 //
+//  fPhiFullCone   Boolean variable used for indicate the Phi Section
+//
 //   Note:
 //      Internally fSPhi & fDPhi are adjusted so that fDPhi<=2PI,
 …
   public:  // with description
         G4Cons(const G4String& pName,
                      G4double pRmin1, G4double pRmax1,
                      G4double pRmin2, G4double pRmax2,
                      G4double pDz,
                      G4double pSPhi, G4double pDPhi);
+    G4Cons(const G4String& pName,
+                 G4double pRmin1, G4double pRmax1,
+                 G4double pRmin2, G4double pRmax2,
+                 G4double pDz,
+                 G4double pSPhi, G4double pDPhi);
         virtual ~G4Cons() ;
   // Accessors
         inline G4double    GetInnerRadiusMinusZ() const;
         inline G4double    GetOuterRadiusMinusZ() const;
         inline G4double    GetInnerRadiusPlusZ()  const;
         inline G4double    GetOuterRadiusPlusZ()  const;
         inline G4double    GetZHalfLength()       const;
         inline G4double    GetStartPhiAngle () const;
         inline G4double    GetDeltaPhiAngle () const;
   // Modifiers
         inline void    SetInnerRadiusMinusZ( G4double Rmin1 );
         inline void    SetOuterRadiusMinusZ( G4double Rmax1 );
         inline void    SetInnerRadiusPlusZ ( G4double Rmin2 );
         inline void    SetOuterRadiusPlusZ ( G4double Rmax2 );
+    virtual ~G4Cons() ;
+    // Accessors
+    inline G4double    GetInnerRadiusMinusZ() const;
+    inline G4double    GetOuterRadiusMinusZ() const;
+    inline G4double    GetInnerRadiusPlusZ()  const;
+    inline G4double    GetOuterRadiusPlusZ()  const;
+    inline G4double    GetZHalfLength()       const;
+    inline G4double    GetStartPhiAngle () const;
+    inline G4double    GetDeltaPhiAngle () const;
+    // Modifiers
+    inline void    SetInnerRadiusMinusZ( G4double Rmin1 );
+    inline void    SetOuterRadiusMinusZ( G4double Rmax1 );
+    inline void    SetInnerRadiusPlusZ ( G4double Rmin2 );
+    inline void    SetOuterRadiusPlusZ ( G4double Rmax2 );
         inline void    SetZHalfLength      ( G4double newDz );
         inline void    SetStartPhiAngle    ( G4double newSPhi);
         inline void    SetDeltaPhiAngle    ( G4double newDPhi);
   // Other methods for solid
         inline G4double    GetCubicVolume();
         inline G4double    GetSurfaceArea();
         void ComputeDimensions(G4VPVParameterisation* p,
                                const G4int n,
                                const G4VPhysicalVolume* pRep);
         G4bool CalculateExtent(const EAxis pAxis,
                                const G4VoxelLimits& pVoxelLimit,
                                const G4AffineTransform& pTransform,
                                      G4double& pmin, G4double& pmax) const;
         EInside Inside(const G4ThreeVector& p) const;
         G4ThreeVector SurfaceNormal(const G4ThreeVector& p) const;
         G4double DistanceToIn(const G4ThreeVector& p,
                                const G4ThreeVector& v) const;
         G4double DistanceToIn(const G4ThreeVector& p) const;
         G4double DistanceToOut(const G4ThreeVector& p,
                                const G4ThreeVector& v,
                                const G4bool calcNorm=G4bool(false),
                                      G4bool *validNorm=0,
                                      G4ThreeVector *n=0) const;
         G4double DistanceToOut(const G4ThreeVector& p) const;
         G4GeometryType  GetEntityType() const;
+    inline void    SetZHalfLength      ( G4double newDz );
+    inline void    SetStartPhiAngle    ( G4double newSPhi);
+    inline void    SetDeltaPhiAngle    ( G4double newDPhi);
+    // Other methods for solid
+    inline G4double    GetCubicVolume();
+    inline G4double    GetSurfaceArea();
+    void ComputeDimensions(G4VPVParameterisation* p,
+                           const G4int n,
+                           const G4VPhysicalVolume* pRep);
+    G4bool CalculateExtent(const EAxis pAxis,
+                           const G4VoxelLimits& pVoxelLimit,
+                           const G4AffineTransform& pTransform,
+                                 G4double& pmin, G4double& pmax) const;
+    EInside Inside(const G4ThreeVector& p) const;
+    G4ThreeVector SurfaceNormal(const G4ThreeVector& p) const;
+    G4double DistanceToIn (const G4ThreeVector& p,
+                           const G4ThreeVector& v) const;
+    G4double DistanceToIn (const G4ThreeVector& p) const;
+    G4double DistanceToOut(const G4ThreeVector& p,
+                           const G4ThreeVector& v,
+                           const G4bool calcNorm=G4bool(false),
+                                 G4bool *validNorm=0,
+                                 G4ThreeVector *n=0) const;
+    G4double DistanceToOut(const G4ThreeVector& p) const;
+    G4GeometryType  GetEntityType() const;
         G4ThreeVector GetPointOnSurface() const;
+    G4ThreeVector GetPointOnSurface() const;
         std::ostream& StreamInfo(std::ostream& os) const;
   // Visualisation functions
         void          DescribeYourselfTo( G4VGraphicsScene& scene ) const;
         G4Polyhedron* CreatePolyhedron() const;
         G4NURBS*      CreateNURBS() const;
+    std::ostream& StreamInfo(std::ostream& os) const;
+    // Visualisation functions
+    void          DescribeYourselfTo( G4VGraphicsScene& scene ) const;
+    G4Polyhedron* CreatePolyhedron() const;
+    G4NURBS*      CreateNURBS() const;
   public:  // without description
+        G4Cons(__void__&);
+          // Fake default constructor for usage restricted to direct object
+          // persistency for clients requiring preallocation of memory for
+          // persistifiable objects.
+        //  Old access functions
+        inline G4double    GetRmin1() const;
+        inline G4double    GetRmax1() const;
+        inline G4double    GetRmin2() const;
+        inline G4double    GetRmax2() const;
+        inline G4double    GetDz()    const;
+        inline G4double    GetSPhi() const;
+        inline G4double    GetDPhi() const;
+    G4Cons(__void__&);
+      //
+      // Fake default constructor for usage restricted to direct object
+      // persistency for clients requiring preallocation of memory for
+      // persistifiable objects.
+    //  Old access functions
+    inline G4double    GetRmin1() const;
+    inline G4double    GetRmax1() const;
+    inline G4double    GetRmin2() const;
+    inline G4double    GetRmax2() const;
+    inline G4double    GetDz()    const;
+    inline G4double    GetSPhi() const;
+    inline G4double    GetDPhi() const;
   protected:
+        G4ThreeVectorList*
+        CreateRotatedVertices(const G4AffineTransform& pTransform) const;
+        // Used by distanceToOut
+        enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
+        // used by normal
+        enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
+    G4ThreeVectorList*
+    CreateRotatedVertices(const G4AffineTransform& pTransform) const;
+    G4double fRmin1, fRmin2, fRmax1, fRmax2, fDz, fSPhi, fDPhi;
+    G4bool fPhiFullCone;
+    // Used by distanceToOut
+    enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
+    // used by normal
+    enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
   private:
+        G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
+          // Algorithm for SurfaceNormal() following the original
+          // specification for points not on the surface
+    inline void Initialise();
+      // Reset relevant values to zero
+    inline void InitializeTrigonometry();
+      //
+      // Recompute relevant trigonometric values and cache them
+    G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
+      //
+      // Algorithm for SurfaceNormal() following the original
+      // specification for points not on the surface
   private:
+        G4double kRadTolerance, kAngTolerance;
+        G4double fRmin1,fRmin2,
+                 fRmax1,fRmax2,
+                 fDz,
+                 fSPhi,fDPhi;
+    G4double kRadTolerance, kAngTolerance;
+      //
+      // Radial and angular tolerances
+    G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
+             sinSPhi, cosSPhi, sinEPhi, cosEPhi;
+      //
+      // Cached trigonometric values
 };

trunk/source/geometry/solids/CSG/include/G4Cons.icc

-              r850
+              r921
 //
 //
 // $Id: G4Cons.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Cons.icc,v 1.8 2008/11/06 10:55:40 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // --------------------------------------------------------------------
 …
 inline
+G4double G4Cons::GetInnerRadiusMinusZ() const
+{
+  return fRmin1 ;
+}
+inline
+G4double G4Cons::GetOuterRadiusMinusZ() const
+{
+  return fRmax1 ;
+}
+inline
+G4double G4Cons::GetInnerRadiusPlusZ() const
+{
+  return fRmin2 ;
+}
+inline
+G4double G4Cons::GetOuterRadiusPlusZ() const
+{
+  return fRmax2 ;
+}
+inline
+G4double G4Cons::GetZHalfLength() const
+{
+  return fDz ;
+}
+inline
+G4double G4Cons::GetStartPhiAngle() const
+{
+  return fSPhi ;
+}
+inline
+G4double G4Cons::GetDeltaPhiAngle() const
+{
+  return fDPhi;
+}
+inline
+void G4Cons::SetInnerRadiusMinusZ( G4double Rmin1 )
+{
+  fRmin1= Rmin1 ;
+void G4Cons::Initialise()
+{
   fCubicVolume= 0.;
   fSurfaceArea= 0.;
 …
+}
+inline
+void G4Cons::InitializeTrigonometry()
+{
+  G4double hDPhi = 0.5*fDPhi;                       // half delta phi
+  G4double cPhi  = fSPhi + hDPhi;
+  G4double ePhi  = fSPhi + fDPhi;
+  sinCPhi    = std::sin(cPhi);
+  cosCPhi    = std::cos(cPhi);
+  cosHDPhiIT = std::cos(hDPhi - 0.5*kAngTolerance); // inner/outer tol half dphi
+  cosHDPhiOT = std::cos(hDPhi + 0.5*kAngTolerance);
+  sinSPhi = std::sin(fSPhi);
+  cosSPhi = std::cos(fSPhi);
+  sinEPhi = std::sin(ePhi);
+  cosEPhi = std::cos(ePhi);
+}
+inline
+G4double G4Cons::GetInnerRadiusMinusZ() const
+{
+  return fRmin1 ;
+}
+inline
+G4double G4Cons::GetOuterRadiusMinusZ() const
+{
+  return fRmax1 ;
+}
+inline
+G4double G4Cons::GetInnerRadiusPlusZ() const
+{
+  return fRmin2 ;
+}
+inline
+G4double G4Cons::GetOuterRadiusPlusZ() const
+{
+  return fRmax2 ;
+}
+inline
+G4double G4Cons::GetZHalfLength() const
+{
+  return fDz ;
+}
+inline
+G4double G4Cons::GetStartPhiAngle() const
+{
+  return fSPhi ;
+}
+inline
+G4double G4Cons::GetDeltaPhiAngle() const
+{
+  return fDPhi;
+}
+inline
+void G4Cons::SetInnerRadiusMinusZ( G4double Rmin1 )
+{
+  fRmin1= Rmin1 ;
+  Initialise();
+}
 inline
 void G4Cons::SetOuterRadiusMinusZ( G4double Rmax1 )
+{
   fRmax1= Rmax1 ;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+}
 …
+{
   fRmin2= Rmin2 ;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+}
 …
+{
   fRmax2= Rmax2 ;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+}
 …
+{
   fDz= newDz ;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+}
 …
+{
   fSPhi= newSPhi;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+  InitializeTrigonometry();
+}
 void G4Cons::SetDeltaPhiAngle ( G4double newDPhi )
+{
+  if ( newDPhi >= twopi-kAngTolerance*0.5 )
+  {
+    fPhiFullCone = true;
+  }
+  else if ( newDPhi > 0 )
+  {
+    fPhiFullCone = false;
+  }
+  else
+  {
+     G4cerr << "ERROR - G4Cons()::SetDeltaPhiAngle() : " << GetName() << G4endl
+            << "        Negative delta-Phi ! - " << newDPhi << G4endl;
+     G4Exception("G4Cons::SetDeltaPhiAngle()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+  }
   fDPhi=  newDPhi;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialise();
+  InitializeTrigonometry();
+}
 …
                          + 0.5*(fRmax1*fRmax1-fRmin1*fRmin1
                                +fRmax2*fRmax2-fRmin2*fRmin2 ));
     if(fDPhi < twopi )
+    if(!fPhiFullCone)
+    {
       fSurfaceArea = fSurfaceArea+4*fDz*(mmax-mmin);

trunk/source/geometry/solids/CSG/include/G4Sphere.hh

-              r850
+              r921
 //
 //
 // $Id: G4Sphere.hh,v 1.20 2007/05/18 07:38:00 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Sphere.hh,v 1.21 2008/11/21 09:50:05 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     // Accessors
     inline G4double GetInsideRadius   () const;
+    inline G4double GetInnerRadius    () const;
     inline G4double GetOuterRadius    () const;
     inline G4double GetStartPhiAngle  () const;
 …
     // Modifiers
     inline void SetInsideRadius   (G4double newRmin);
+    inline void SetInnerRadius    (G4double newRMin);
     inline void SetOuterRadius    (G4double newRmax);
     inline void SetStartPhiAngle  (G4double newSphi);
 …
     inline G4double  GetSTheta() const;
     inline G4double  GetDTheta() const;
+    inline G4double  GetInsideRadius() const;
+    inline void SetInsideRadius(G4double newRmin);
   protected:

trunk/source/geometry/solids/CSG/include/G4Sphere.icc

-              r850
+              r921
 //
 //
 // $Id: G4Sphere.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Sphere.icc,v 1.8 2008/11/21 09:50:05 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // --------------------------------------------------------------------
 …
 inline
+G4double G4Sphere::GetInnerRadius() const
+{
+  return fRmin;
+}
+inline
 G4double G4Sphere::GetOuterRadius() const
+{
 …
 inline
 void G4Sphere::SetInsideRadius(G4double newRmin)
+{
+  fRmin= newRmin;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+}
+inline
+void G4Sphere::SetInnerRadius(G4double newRmin)
+{
   fRmin= newRmin;

trunk/source/geometry/solids/CSG/include/G4Tubs.hh

-              r850
+              r921
 //
 //
 // $Id: G4Tubs.hh,v 1.17 2007/05/18 07:38:00 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Tubs.hh,v 1.21 2008/11/06 10:55:40 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //   A tube or tube segment with curved sides parallel to
 //   the z-axis. The tube has a specified half-length along
 //   the z axis, about which it is centred, and a given
+//   the z-axis, about which it is centered, and a given
 //   minimum and maximum radius. A minimum radius of 0
 //   signifies a filled tube /cylinder. The tube segment is
+//   corresponds to filled tube /cylinder. The tube segment is
 //   specified by starting and delta angles for phi, with 0
 //   being the +x axis, PI/2 the +y axis.
 …
 //
 //   fDPhi  Delta angle of the segment.
+//
+//   fPhiFullTube   Boolean variable used for indicate the Phi Section
 // History:
 …
     inline void SetStartPhiAngle (G4double newSPhi);
     inline void SetDeltaPhiAngle (G4double newDPhi);
     // Methods for solid
 …
     G4Tubs(__void__&);
+      //
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for
 …
       // for G4VSolid:: ClipCrossSection and ClipBetweenSections
+    G4double fRMin,fRMax,fDz,fSPhi,fDPhi;
+    // Used by distanceToOut
+    G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
+    G4bool fPhiFullTube;
+      // Used by distanceToOut
     enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
     // used by normal
+      // Used by normal
     enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
 …
   private:
+    inline void Initialize();
+      //
+      // Reset relevant values to zero
+    inline void InitializeTrigonometry();
+      //
+      // Recompute relevant trigonometric values and cache them
     G4ThreeVector ApproxSurfaceNormal( const G4ThreeVector& p ) const;
+      //
       // Algorithm for SurfaceNormal() following the original
       // specification for points not on the surface
 …
     G4double kRadTolerance, kAngTolerance;
+      //
       // Radial and angular tolerances
+    G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
+             sinSPhi, cosSPhi, sinEPhi, cosEPhi;
+      //
+      // Cached trigonometric values
 };

trunk/source/geometry/solids/CSG/include/G4Tubs.icc

-              r850
+              r921
 //
 //
 // $Id: G4Tubs.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Tubs.icc,v 1.11 2008/11/06 10:55:40 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // --------------------------------------------------------------------
 …
+}
+inline
+void G4Tubs::Initialize()
+{
+  fCubicVolume = 0.;
+  fSurfaceArea = 0.;
+  fpPolyhedron = 0;
+}
+inline
+void G4Tubs::InitializeTrigonometry()
+{
+  G4double hDPhi = 0.5*fDPhi;                       // half delta phi
+  G4double cPhi  = fSPhi + hDPhi;
+  G4double ePhi  = fSPhi + fDPhi;
+  sinCPhi    = std::sin(cPhi);
+  cosCPhi    = std::cos(cPhi);
+  cosHDPhiIT = std::cos(hDPhi - 0.5*kAngTolerance); // inner/outer tol half dphi
+  cosHDPhiOT = std::cos(hDPhi + 0.5*kAngTolerance);
+  sinSPhi = std::sin(fSPhi);
+  cosSPhi = std::cos(fSPhi);
+  sinEPhi = std::sin(ePhi);
+  cosEPhi = std::cos(ePhi);
+}
 inline
 void G4Tubs::SetInnerRadius (G4double newRMin)
+{
   fRMin= newRMin;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialize();
+}
 …
+{
   fRMax= newRMax;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialize();
+}
 …
+{
   fDz= newDz;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialize();
+}
 …
+{
   fSPhi= newSPhi;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialize();
+  InitializeTrigonometry();
+}
 …
 void G4Tubs::SetDeltaPhiAngle (G4double newDPhi)
+{
+  if ( newDPhi >= twopi-kAngTolerance*0.5 )
+  {
+    fPhiFullTube = true;
+  }
+  else if ( newDPhi > 0 )
+  {
+    fPhiFullTube = false;
+  }
+  else
+  {
+     G4cerr << "ERROR - G4Tubs()::SetDeltaPhiAngle() : " << GetName() << G4endl
+            << "        Negative delta-Phi ! - " << newDPhi << G4endl;
+     G4Exception("G4Tubs::SetDeltaPhiAngle()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+  }
   fDPhi= newDPhi;
+  fCubicVolume= 0.;
+  fSurfaceArea= 0.;
+  fpPolyhedron = 0;
+  Initialize();
+  InitializeTrigonometry();
+}
 …
+  {
     fSurfaceArea = fDPhi*(fRMin+fRMax)*(2*fDz+fRMax-fRMin);
     if (fDPhi < twopi)
+    if (!fPhiFullTube)
+    {
       fSurfaceArea = fSurfaceArea + 4*fDz*(fRMax-fRMin);

trunk/source/geometry/solids/CSG/src/G4Cons.cc

-              r850
+              r921
 //
 //
 // $Id: G4Cons.cc,v 1.56 2008/02/20 08:56:16 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Cons.cc,v 1.60 2008/11/06 15:26:53 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   if ( pDz > 0 )
+    fDz = pDz ;
+  {
+    fDz = pDz;
+  }
   else
+  {
 …
   // Check radii
   if ( pRmin1 < pRmax1 && pRmin2 < pRmax2 && pRmin1 >= 0 && pRmin2 >= 0 )
+  if ( (pRmin1<pRmax1) && (pRmin2<pRmax2) && (pRmin1>=0) && (pRmin2>=0) )
+  {
 …
     fRmin2 = pRmin2 ;
     fRmax2 = pRmax2 ;
     if( (pRmin1 == 0.0 && pRmin2 > 0.0) ) fRmin1 = 1e3*kRadTolerance ;
     if( (pRmin2 == 0.0 && pRmin1 > 0.0) ) fRmin2 = 1e3*kRadTolerance ;
+    if( (pRmin1 == 0.0) && (pRmin2 > 0.0) ) { fRmin1 = 1e3*kRadTolerance ; }
+    if( (pRmin2 == 0.0) && (pRmin1 > 0.0) ) { fRmin2 = 1e3*kRadTolerance ; }
+  }
   else
 …
+  }
+  // Check angles
+  if ( pDPhi >= twopi )
+  fPhiFullCone = true;
+  if ( pDPhi >= twopi-kAngTolerance*0.5 ) // Check angles
+  {
     fDPhi=twopi;
 …
   else
+  {
+    if ( pDPhi > 0 ) fDPhi = pDPhi ;
+    fPhiFullCone = false;
+    if ( pDPhi > 0 )
+    {
+      fDPhi = pDPhi;
+    }
     else
+    {
 …
              << pDPhi << G4endl;
       G4Exception("G4Cons::G4Cons()", "InvalidSetup",
+                  FatalException, "Invalid pDPhi.") ;
+    }
+    // Ensure pSPhi in 0-2PI or -2PI-0 range if shape crosses 0
+    if ( pSPhi < 0 ) fSPhi = twopi - std::fmod(std::fabs(pSPhi),twopi) ;
+    else             fSPhi = std::fmod(pSPhi,twopi) ;
+    if (fSPhi + fDPhi > twopi) fSPhi -= twopi ;
+  }
+                  FatalException, "Invalid dphi.");
+    }
+    // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+    if ( pSPhi < 0 )
+    {
+      fSPhi = twopi - std::fmod(std::fabs(pSPhi),twopi);
+    }
+    else
+    {
+      fSPhi = std::fmod(pSPhi,twopi) ;
+    }
+    if ( fSPhi+fDPhi > twopi )
+    {
+      fSPhi -= twopi ;
+    }
+  }
+  InitializeTrigonometry();
+}
 …
   G4double r2, rl, rh, pPhi, tolRMin, tolRMax; // rh2, rl2 ;
   EInside in;
+  if (std::fabs(p.z()) > fDz + kCarTolerance*0.5 ) return in = kOutside;
+  else if(std::fabs(p.z()) >= fDz - kCarTolerance*0.5 )   in = kSurface;
+  else                                                    in = kInside;
+  static const G4double halfCarTolerance=kCarTolerance*0.5;
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
+  static const G4double halfAngTolerance=kAngTolerance*0.5;
+  if (std::fabs(p.z()) > fDz + halfCarTolerance )  { return in = kOutside; }
+  else if(std::fabs(p.z()) >= fDz - halfCarTolerance )    { in = kSurface; }
+  else                                                    { in = kInside;  }
   r2 = p.x()*p.x() + p.y()*p.y() ;
 …
   // rh2 = rh*rh;
   tolRMin = rl - kRadTolerance*0.5 ;
   if ( tolRMin < 0 ) tolRMin = 0 ;
   tolRMax = rh + kRadTolerance*0.5 ;
   if ( r2 < tolRMin*tolRMin || r2 > tolRMax*tolRMax ) return in = kOutside;
   if (rl) tolRMin = rl + kRadTolerance*0.5 ;
   else    tolRMin = 0.0 ;
   tolRMax         = rh - kRadTolerance*0.5 ;
+  tolRMin = rl - halfRadTolerance;
+  if ( tolRMin < 0 )  { tolRMin = 0; }
+  tolRMax = rh + halfRadTolerance;
+  if ( (r2<tolRMin*tolRMin) || (r2>tolRMax*tolRMax) ) { return in = kOutside; }
+  if (rl) { tolRMin = rl + halfRadTolerance; }
+  else    { tolRMin = 0.0; }
+  tolRMax = rh - halfRadTolerance;
   if (in == kInside) // else it's kSurface already
+  {
+     if (r2 < tolRMin*tolRMin || r2 >= tolRMax*tolRMax) in = kSurface;
+    //  if (r2 <= tolRMin*tolRMin || r2-rh2 >= -rh*kRadTolerance) in = kSurface;
+  }
+  if ( ( fDPhi < twopi - kAngTolerance ) &&
+       ( (p.x() != 0.0 ) || (p.y() != 0.0) ) )
+     if ( (r2 < tolRMin*tolRMin) || (r2 >= tolRMax*tolRMax) ) { in = kSurface; }
+  }
+  if ( !fPhiFullCone && ((p.x() != 0.0) || (p.y() != 0.0)) )
+  {
     pPhi = std::atan2(p.y(),p.x()) ;
     if ( pPhi < fSPhi - kAngTolerance*0.5  )             pPhi += twopi ;
     else if ( pPhi > fSPhi + fDPhi + kAngTolerance*0.5 ) pPhi -= twopi;
+    if ( pPhi < fSPhi - halfAngTolerance  )             { pPhi += twopi; }
+    else if ( pPhi > fSPhi + fDPhi + halfAngTolerance ) { pPhi -= twopi; }
     if ( (pPhi < fSPhi - kAngTolerance*0.5) ||
          (pPhi > fSPhi + fDPhi + kAngTolerance*0.5) )   return in = kOutside;
+    if ( (pPhi < fSPhi - halfAngTolerance) ||
+         (pPhi > fSPhi + fDPhi + halfAngTolerance) )  { return in = kOutside; }
     else if (in == kInside)  // else it's kSurface anyway already
+    {
         if ( (pPhi < fSPhi + kAngTolerance*0.5) ||
              (pPhi > fSPhi + fDPhi - kAngTolerance*0.5) )  in = kSurface ;
+    }
+  }
   else if( fDPhi < twopi - kAngTolerance )  in = kSurface ;
+       if ( (pPhi < fSPhi + halfAngTolerance) ||
+            (pPhi > fSPhi + fDPhi - halfAngTolerance) )  { in = kSurface; }
+    }
+  }
+  else if ( !fPhiFullCone )  { in = kSurface; }
   return in ;
 …
                     G4double&          pMax  ) const
+{
   if ( !pTransform.IsRotated() &&
         fDPhi == twopi && fRmin1 == 0 && fRmin2 == 0 )
+  if ( !pTransform.IsRotated() && (fDPhi == twopi)
+    && (fRmin1 == 0) && (fRmin2 == 0) )
+  {
     // Special case handling for unrotated solid cones
 …
     if (pVoxelLimit.IsZLimited())
+    {
       if( zMin > pVoxelLimit.GetMaxZExtent() + kCarTolerance ||
           zMax < pVoxelLimit.GetMinZExtent() - kCarTolerance   )
+      if( (zMin > pVoxelLimit.GetMaxZExtent() + kCarTolerance) ||
+          (zMax < pVoxelLimit.GetMinZExtent() - kCarTolerance)  )
+      {
         return false ;
 …
     if (pVoxelLimit.IsXLimited())
+    {
       if ( xMin > pVoxelLimit.GetMaxXExtent() + kCarTolerance ||
            xMax < pVoxelLimit.GetMinXExtent() - kCarTolerance    )
+      if ( (xMin > pVoxelLimit.GetMaxXExtent() + kCarTolerance) ||
+           (xMax < pVoxelLimit.GetMinXExtent() - kCarTolerance)  )
+      {
         return false ;
 …
     if (pVoxelLimit.IsYLimited())
+    {
       if ( yMin > pVoxelLimit.GetMaxYExtent() + kCarTolerance ||
            yMax < pVoxelLimit.GetMinYExtent() - kCarTolerance     )
+      if ( (yMin > pVoxelLimit.GetMaxYExtent() + kCarTolerance) ||
+           (yMax < pVoxelLimit.GetMinYExtent() - kCarTolerance)  )
+      {
         return false ;
 …
         yoff2 = yMax - yoffset ;
         if (yoff1 >= 0 && yoff2 >= 0) // Y limits cross max/min x => no change
+        {
+        if ((yoff1 >= 0) && (yoff2 >= 0)) // Y limits cross max/min x
+        {                                 // => no change
           pMin = xMin ;
           pMax = xMax ;
 …
         xoff2 = xMax - xoffset ;
         if (xoff1 >= 0 && xoff2 >= 0 ) // X limits cross max/min y => no change
+        {
+        if ((xoff1 >= 0) && (xoff2 >= 0) ) // X limits cross max/min y
+        {                                  // => no change
           pMin = yMin ;
           pMax = yMax ;
 …
     for ( i = 0 ; i < noEntries ; i += 4 )
+    {
       ClipCrossSection(vertices,i,pVoxelLimit,pAxis,pMin,pMax) ;
+      ClipCrossSection(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
+    }
     for ( i = 0 ; i < noBetweenSections4 ; i += 4 )
+    {
       ClipBetweenSections(vertices,i,pVoxelLimit,pAxis,pMin,pMax) ;
+      ClipBetweenSections(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
+    }
     if ( pMin != kInfinity || pMax != -kInfinity )
+    if ( (pMin != kInfinity) || (pMax != -kInfinity) )
+    {
       existsAfterClip = true ;
 …
   G4double tanRMin, secRMin, pRMin, widRMin;
   G4double tanRMax, secRMax, pRMax, widRMax;
+  G4double delta = 0.5*kCarTolerance, dAngle = 0.5*kAngTolerance;
+  static const G4double delta  = 0.5*kCarTolerance;
+  static const G4double dAngle = 0.5*kAngTolerance;
   G4ThreeVector norm, sumnorm(0.,0.,0.), nZ = G4ThreeVector(0.,0.,1.0);
+  G4ThreeVector norm, sumnorm(0.,0.,0.), nZ = G4ThreeVector(0.,0.,1.);
   G4ThreeVector nR, nr(0.,0.,0.), nPs, nPe;
 …
   distRMax = std::fabs(pRMax - widRMax)/secRMax;
   if (fDPhi < twopi)   //  &&  rho ) // Protected against (0,0,z)
+  if (!fPhiFullCone)   // Protected against (0,0,z)
+  {
     if ( rho )
 …
       pPhi = std::atan2(p.y(),p.x());
       if(pPhi  < fSPhi-delta)           pPhi     += twopi;
       else if(pPhi > fSPhi+fDPhi+delta) pPhi     -= twopi;
+      if (pPhi  < fSPhi-delta)            { pPhi += twopi; }
+      else if (pPhi > fSPhi+fDPhi+delta)  { pPhi -= twopi; }
       distSPhi = std::fabs( pPhi - fSPhi );
       distEPhi = std::fabs(pPhi - fSPhi - fDPhi);
+      distEPhi = std::fabs( pPhi - fSPhi - fDPhi );
+    }
     else if( !(fRmin1) || !(fRmin2) )
 …
       distEPhi = 0.;
+    }
     nPs = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
     nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
+    nPs = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0);
+    nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0);
+  }
   if ( rho > delta )
+  {
+    nR = G4ThreeVector(p.x()/rho/secRMax,p.y()/rho/secRMax,-tanRMax/secRMax);
+    if (fRmin1 || fRmin2) nr = G4ThreeVector(-p.x()/rho/secRMin,-p.y()/rho/secRMin,tanRMin/secRMin);
+    nR = G4ThreeVector(p.x()/rho/secRMax, p.y()/rho/secRMax, -tanRMax/secRMax);
+    if (fRmin1 || fRmin2)
+    {
+      nr = G4ThreeVector(-p.x()/rho/secRMin,-p.y()/rho/secRMin,tanRMin/secRMin);
+    }
+  }
 …
     sumnorm += nR;
+  }
   if( (fRmin1 || fRmin2) && distRMin <= delta )
+  if( (fRmin1 || fRmin2) && (distRMin <= delta) )
+  {
     noSurfaces ++;
     sumnorm += nr;
+  }
   if( fDPhi < twopi )
+  if( !fPhiFullCone )
+  {
     if (distSPhi <= dAngle)
 …
+  {
     noSurfaces ++;
     if ( p.z() >= 0.)  sumnorm += nZ;
     else               sumnorm -= nZ;
+    if ( p.z() >= 0.)  { sumnorm += nZ; }
+    else               { sumnorm -= nZ; }
+  }
   if ( noSurfaces == 0 )
 …
      norm = ApproxSurfaceNormal(p);
+  }
+  else if ( noSurfaces == 1 ) norm = sumnorm;
+  else                        norm = sumnorm.unit();
+  else if ( noSurfaces == 1 )  { norm = sumnorm; }
+  else                         { norm = sumnorm.unit(); }
   return norm ;
+}
 //////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
 //
 // Algorithm for SurfaceNormal() following the original specification
 …
+    }
+  }
   if ( fDPhi < twopi && rho )  // Protected against (0,0,z)
+  if ( !fPhiFullCone && rho )  // Protected against (0,0,z)
+  {
     phi = std::atan2(p.y(),p.x()) ;
     if (phi < 0) phi += twopi ;
     if (fSPhi < 0) distSPhi = std::fabs(phi - (fSPhi + twopi))*rho ;
     else           distSPhi = std::fabs(phi - fSPhi)*rho ;
+    if (phi < 0)  { phi += twopi; }
+    if (fSPhi < 0)  { distSPhi = std::fabs(phi - (fSPhi + twopi))*rho; }
+    else            { distSPhi = std::fabs(phi - fSPhi)*rho; }
     distEPhi = std::fabs(phi - fSPhi - fDPhi)*rho ;
 …
     if (distSPhi < distEPhi)
+    {
       if (distSPhi < distMin) side = kNSPhi ;
+      if (distSPhi < distMin)  { side = kNSPhi; }
+    }
     else
+    {
       if (distEPhi < distMin) side = kNEPhi ;
+      if (distEPhi < distMin)  { side = kNEPhi; }
+    }
+  }
 …
     case kNRMin:      // Inner radius
       rho *= secRMin ;
       norm = G4ThreeVector(-p.x()/rho,-p.y()/rho,tanRMin/secRMin) ;
+      norm = G4ThreeVector(-p.x()/rho, -p.y()/rho, tanRMin/secRMin) ;
       break ;
     case kNRMax:      // Outer radius
       rho *= secRMax ;
       norm = G4ThreeVector(p.x()/rho,p.y()/rho,-tanRMax/secRMax) ;
+      norm = G4ThreeVector(p.x()/rho, p.y()/rho, -tanRMax/secRMax) ;
       break ;
     case kNZ:      // +/- dz
       if (p.z() > 0) norm = G4ThreeVector(0,0,1) ;
       else           norm = G4ThreeVector(0,0,-1) ;
+      if (p.z() > 0)  { norm = G4ThreeVector(0,0,1);  }
+      else            { norm = G4ThreeVector(0,0,-1); }
       break ;
     case kNSPhi:
       norm = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0) ;
+      norm = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0) ;
       break ;
     case kNEPhi:
       norm=G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0) ;
+      norm=G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0) ;
       break ;
     default:
 …
 //
 // NOTE:
-// - Precalculations for phi trigonometry are Done `just in time'
 // - `if valid' implies tolerant checking of intersection points
 // - z, phi intersection from Tubs
 …
   G4double snxt = kInfinity ;      // snxt = default return value
+  G4bool seg ;        // true if segmented in phi
+  G4double hDPhi,hDPhiOT,hDPhiIT,cosHDPhiOT=0.,cosHDPhiIT=0. ;
+          // half dphi + outer tolerance
+  G4double cPhi,sinCPhi=0.,cosCPhi=0. ;  // central phi
+  static const G4double halfCarTolerance=kCarTolerance*0.5;
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
   G4double tanRMax,secRMax,rMaxAv,rMaxOAv ;  // Data for cones
 …
   G4double nt1,nt2,nt3 ;
   G4double Comp ;
-  G4double cosSPhi,sinSPhi ;    // Trig for phi start intersect
-  G4double ePhi,cosEPhi,sinEPhi ;  // for phi end intersect
-  //
-  // Set phi divided flag and precalcs
-  //
-  if (fDPhi < twopi)
+  {
-    seg        = true ;
-    hDPhi      = 0.5*fDPhi ;    // half delta phi
-    cPhi       = fSPhi + hDPhi ; ;
-    hDPhiOT    = hDPhi + 0.5*kAngTolerance ;  // outers tol' half delta phi
-    hDPhiIT    = hDPhi - 0.5*kAngTolerance ;
-    sinCPhi    = std::sin(cPhi) ;
-    cosCPhi    = std::cos(cPhi) ;
-    cosHDPhiOT = std::cos(hDPhiOT) ;
-    cosHDPhiIT = std::cos(hDPhiIT) ;
+  }
-  else     seg = false ;
   // Cone Precalcs
 …
   rMinAv  = (fRmin1 + fRmin2)*0.5 ;
   if (rMinAv > kRadTolerance*0.5)
+  {
     rMinOAv = rMinAv - kRadTolerance*0.5 ;
     rMinIAv = rMinAv + kRadTolerance*0.5 ;
+  if (rMinAv > halfRadTolerance)
+  {
+    rMinOAv = rMinAv - halfRadTolerance ;
+    rMinIAv = rMinAv + halfRadTolerance ;
+  }
   else
 …
   secRMax = std::sqrt(1.0 + tanRMax*tanRMax) ;
   rMaxAv  = (fRmax1 + fRmax2)*0.5 ;
   rMaxOAv = rMaxAv + kRadTolerance*0.5 ;
+  rMaxOAv = rMaxAv + halfRadTolerance ;
   // Intersection with z-surfaces
   tolIDz = fDz - kCarTolerance*0.5 ;
   tolODz = fDz + kCarTolerance*0.5 ;
+  tolIDz = fDz - halfCarTolerance ;
+  tolODz = fDz + halfCarTolerance ;
   if (std::fabs(p.z()) >= tolIDz)
 …
       s = (std::fabs(p.z()) - fDz)/std::fabs(v.z()) ;  // Z intersect distance
       if( s < 0.0 ) s = 0.0 ;                  // negative dist -> zero
+      if( s < 0.0 )  { s = 0.0; }                      // negative dist -> zero
       xi   = p.x() + s*v.x() ;  // Intersection coords
       yi   = p.y() + s*v.y() ;
       rhoi2 = xi*xi + yi*yi   ;
+      rhoi2 = xi*xi + yi*yi  ;
       // Check validity of intersection
 …
       if (v.z() > 0)
+      {
         tolORMin  = fRmin1 - 0.5*kRadTolerance*secRMin ;
         tolIRMin  = fRmin1 + 0.5*kRadTolerance*secRMin ;
         tolIRMax  = fRmax1 - 0.5*kRadTolerance*secRMin ;
         tolORMax2 = (fRmax1 + 0.5*kRadTolerance*secRMax)*
                     (fRmax1 + 0.5*kRadTolerance*secRMax) ;
+        tolORMin  = fRmin1 - halfRadTolerance*secRMin ;
+        tolIRMin  = fRmin1 + halfRadTolerance*secRMin ;
+        tolIRMax  = fRmax1 - halfRadTolerance*secRMin ;
+        tolORMax2 = (fRmax1 + halfRadTolerance*secRMax)*
+                    (fRmax1 + halfRadTolerance*secRMax) ;
+      }
       else
+      {
         tolORMin  = fRmin2 - 0.5*kRadTolerance*secRMin ;
         tolIRMin  = fRmin2 + 0.5*kRadTolerance*secRMin ;
         tolIRMax  = fRmax2 - 0.5*kRadTolerance*secRMin ;
         tolORMax2 = (fRmax2 + 0.5*kRadTolerance*secRMax)*
                     (fRmax2 + 0.5*kRadTolerance*secRMax) ;
+        tolORMin  = fRmin2 - halfRadTolerance*secRMin ;
+        tolIRMin  = fRmin2 + halfRadTolerance*secRMin ;
+        tolIRMax  = fRmax2 - halfRadTolerance*secRMin ;
+        tolORMax2 = (fRmax2 + halfRadTolerance*secRMax)*
+                    (fRmax2 + halfRadTolerance*secRMax) ;
+      }
       if ( tolORMin > 0 )
 …
         tolIRMin2 = 0.0 ;
+      }
       if ( tolIRMax > 0 )   tolIRMax2 = tolIRMax*tolIRMax ;
       else                  tolIRMax2 = 0.0 ;
+      if ( tolIRMax > 0 )  { tolIRMax2 = tolIRMax*tolIRMax; }
+      else                 { tolIRMax2 = 0.0; }
+      if (tolIRMin2 <= rhoi2 && rhoi2 <= tolIRMax2)
+      {
+  if ( seg && rhoi2 )
+  {
+    // Psi = angle made with central (average) phi of shape
+    cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+    if (cosPsi >= cosHDPhiIT) return s ;
+  }
+  else return s ;
+      }
+      /*
+      else if (tolORMin2 <= rhoi2 && rhoi2 <= tolORMax2)
+      {
+  if ( seg && rhoi2 )
+  {
+    // Psi = angle made with central (average) phi of shape
+    cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+    if (cosPsi >= cosHDPhiIT) return s ;
+  }
+  else return s ;
+      }
+      */
+      if ( (tolIRMin2 <= rhoi2) && (rhoi2 <= tolIRMax2) )
+      {
+        if ( !fPhiFullCone && rhoi2 )
+        {
+          // Psi = angle made with central (average) phi of shape
+          cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+          if (cosPsi >= cosHDPhiIT)  { return s; }
+        }
+        else
+        {
+          return s;
+        }
+      }
+    }
     else  // On/outside extent, and heading away  -> cannot intersect
 …
   if (std::fabs(nt1) > kRadTolerance)  // Equation quadratic => 2 roots
+  {
       b = nt2/nt1 ;
       c = nt3/nt1 ;
       d = b*b-c   ;
     if ( nt3 > rout*kRadTolerance*secRMax || rout < 0 )
+    b = nt2/nt1;
+    c = nt3/nt1;
+    d = b*b-c  ;
+    if ( (nt3 > rout*kRadTolerance*secRMax) || (rout < 0) )
+    {
       // If outside real cone (should be rho-rout>kRadTolerance*0.5
       // NOT rho^2 etc) saves a std::sqrt() at expense of accuracy
       if (d >= 0)
+      {
         if (rout < 0 && nt3 <= 0 )
+        if ((rout < 0) && (nt3 <= 0))
+        {
           // Inside `shadow cone' with -ve radius
 …
         else
+        {
           if ( b <= 0 && c >= 0 ) // both >=0, try smaller root
+          if ((b <= 0) && (c >= 0)) // both >=0, try smaller root
+          {
             s = -b - std::sqrt(d) ;
 …
             // Z ok. Check phi intersection if reqd
             if ( ! seg )  return s ;
+            if ( fPhiFullCone )  { return s; }
             else
+            {
 …
               cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
               if ( cosPsi >= cosHDPhiIT ) return s ;
+              if ( cosPsi >= cosHDPhiIT )  { return s; }
+            }
+          }
 …
       // check not inside, and heading through G4Cons (-> 0 to in)
+      if ( t3  > (rin + kRadTolerance*0.5*secRMin)*
+                 (rin + kRadTolerance*0.5*secRMin) &&
+           nt2 < 0                                 &&
+           d >= 0                                  &&
+           //  nt2 < -kCarTolerance*secRMax/2/fDz                  &&
+           // t2 < std::sqrt(t3)*v.z()*tanRMax                          &&
+           // d > kCarTolerance*secRMax*(rout-b*tanRMax*v.z())/nt1 &&
+           std::fabs(p.z()) <= tolIDz )
+      if ( ( t3  > (rin + halfRadTolerance*secRMin)*
+                   (rin + halfRadTolerance*secRMin) )
+        && (nt2 < 0) && (d >= 0) && (std::fabs(p.z()) <= tolIDz) )
+      {
         // Inside cones, delta r -ve, inside z extent
         if (seg)
+        if ( !fPhiFullCone )
+        {
           cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(t3) ;
           if (cosPsi >= cosHDPhiIT) return 0.0 ;
+        }
         else  return 0.0 ;
+          if (cosPsi >= cosHDPhiIT)  { return 0.0; }
+        }
+        else  { return 0.0; }
+      }
+    }
 …
       s = -0.5*nt3/nt2 ;
       if ( s < 0 )   return kInfinity ;   // travel away
+      if ( s < 0 )  { return kInfinity; }   // travel away
       else  // s >= 0,  If 'forwards'. Check z intersection
+      {
         zi = p.z() + s*v.z() ;
         if (std::fabs(zi) <= tolODz && nt2 < 0)
+        if ((std::fabs(zi) <= tolODz) && (nt2 < 0))
+        {
           // Z ok. Check phi intersection if reqd
           if ( ! seg ) return s ;
+          if ( fPhiFullCone )  { return s; }
           else
+          {
 …
             cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
             if (cosPsi >= cosHDPhiIT) return s ;
+            if (cosPsi >= cosHDPhiIT)  { return s; }
+          }
+        }
 …
             if ( std::fabs(zi) <= tolODz )
+            {
               if ( seg )
+              if ( !fPhiFullCone )
+              {
                 xi     = p.x() + s*v.x() ;
 …
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
                 if (cosPsi >= cosHDPhiIT) snxt = s ;
+                if (cosPsi >= cosHDPhiIT)  { snxt = s; }
+              }
               else return s ;
+              else  { return s; }
+            }
+          }
 …
           ri = rMinAv + zi*tanRMin ;
           if ( ri >= 0 )
+          if ( ri > 0 )
+          {
             if ( s >= 0 && std::fabs(zi) <= tolODz )  // s > 0
+            if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s > 0
+            {
               if ( seg )
+              if ( !fPhiFullCone )
+              {
                 xi     = p.x() + s*v.x() ;
 …
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
                 if (cosPsi >= cosHDPhiOT) snxt = s ;
+                if (cosPsi >= cosHDPhiOT)  { snxt = s; }
+              }
               else  return s ;
+              else  { return s; }
+            }
+          }
 …
             ri = rMinAv + zi*tanRMin ;
             if ( s >= 0 && ri >= 0 && std::fabs(zi) <= tolODz ) // s>0
+            if ( (s >= 0) && (ri > 0) && (std::fabs(zi) <= tolODz) ) // s>0
+            {
               if ( seg )
+              if ( !fPhiFullCone )
+              {
                 xi     = p.x() + s*v.x() ;
 …
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
                 if (cosPsi >= cosHDPhiIT) snxt = s ;
+                if (cosPsi >= cosHDPhiIT)  { snxt = s; }
+              }
               else  return s ;
+              else  { return s; }
+            }
+          }
 …
             // Inside inner real cone, heading outwards, inside z range
             if ( seg )
+            if ( !fPhiFullCone )
+            {
               cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(t3) ;
               if (cosPsi >= cosHDPhiIT)  return 0.0 ;
+              if (cosPsi >= cosHDPhiIT)  { return 0.0; }
+            }
             else  return 0.0 ;
+            else  { return 0.0; }
+          }
           else
 …
                 zi = p.z() + s*v.z() ;
                 if ( s >= 0 && std::fabs(zi) <= tolODz )  // s>0
+                if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s>0
+                {
                   if ( seg )
+                  if ( !fPhiFullCone )
+                  {
                     xi     = p.x() + s*v.x() ;
 …
                     cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
                     if ( cosPsi >= cosHDPhiIT )  snxt = s ;
+                    if ( cosPsi >= cosHDPhiIT )  { snxt = s; }
+                  }
                   else return s ;
+                  else  { return s; }
+                }
+              }
               else  return kInfinity ;
+              else  { return kInfinity; }
+            }
+          }
 …
             zi = p.z() + s*v.z() ;
             if ( s >= 0 && std::fabs(zi) <= tolODz )  // s>0
+            if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s>0
+            {
               if ( seg )
+              if ( !fPhiFullCone )
+              {
                 xi     = p.x() + s*v.x();
 …
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri;
                 if (cosPsi >= cosHDPhiIT) snxt = s ;
+                if (cosPsi >= cosHDPhiIT)  { snxt = s; }
+              }
               else  return s ;
+              else  { return s; }
+            }
+          }
 …
   //         -> Should use some form of loop Construct
+  if ( seg )
+  {
+    // First phi surface (`S'tarting phi)
+    sinSPhi = std::sin(fSPhi) ;
+    cosSPhi = std::cos(fSPhi) ;
+  if ( !fPhiFullCone )
+  {
+    // First phi surface (starting phi)
     Comp    = v.x()*sinSPhi - v.y()*cosSPhi ;
 …
       Dist = (p.y()*cosSPhi - p.x()*sinSPhi) ;
       if (Dist < kCarTolerance*0.5)
+      if (Dist < halfCarTolerance)
+      {
         s = Dist/Comp ;
 …
         if ( s < snxt )
+        {
           if ( s < 0 ) s = 0.0 ;
+          if ( s < 0 )  { s = 0.0; }
           zi = p.z() + s*v.z() ;
 …
             tolORMax2 = (rMaxOAv + zi*tanRMax)*(rMaxOAv + zi*tanRMax) ;
             if ( rhoi2 >= tolORMin2 && rhoi2 <= tolORMax2 )
+            if ( (rhoi2 >= tolORMin2) && (rhoi2 <= tolORMax2) )
+            {
               // z and r intersections good - check intersecting with
               // correct half-plane
               if ((yi*cosCPhi - xi*sinCPhi) <= 0 ) snxt = s ;
+            }
+              if ((yi*cosCPhi - xi*sinCPhi) <= 0 )  { snxt = s; }
+            }
+          }
+        }
+      }
+    }
+    // Second phi surface (`E'nding phi)
+    ePhi    = fSPhi + fDPhi ;
+    sinEPhi = std::sin(ePhi) ;
+    cosEPhi = std::cos(ePhi) ;
+    }
+    // Second phi surface (Ending phi)
     Comp    = -(v.x()*sinEPhi - v.y()*cosEPhi) ;
 …
+    {
       Dist = -(p.y()*cosEPhi - p.x()*sinEPhi) ;
       if (Dist < kCarTolerance*0.5)
+      if (Dist < halfCarTolerance)
+      {
         s = Dist/Comp ;
 …
         if ( s < snxt )
+        {
           if ( s < 0 )  s = 0.0 ;
+          if ( s < 0 )  { s = 0.0; }
           zi = p.z() + s*v.z() ;
 …
             tolORMax2 = (rMaxOAv + zi*tanRMax)*(rMaxOAv + zi*tanRMax) ;
             if ( rhoi2 >= tolORMin2 && rhoi2 <= tolORMax2 )
+            if ( (rhoi2 >= tolORMin2) && (rhoi2 <= tolORMax2) )
+            {
               // z and r intersections good - check intersecting with
               // correct half-plane
               if ( (yi*cosCPhi - xi*sinCPhi) >= 0.0 )  snxt = s ;
+            }
+              if ( (yi*cosCPhi - xi*sinCPhi) >= 0.0 )  { snxt = s; }
+            }
+          }
+        }
 …
+    }
+  }
+  if (snxt < kCarTolerance*0.5) snxt = 0.;
+#ifdef consdebug
+  G4cout.precision(24);
+  G4cout<<"G4Cons::DistanceToIn(p,v) "<<G4endl;
+  G4cout<<"position = "<<p<<G4endl;
+  G4cout<<"direction = "<<v<<G4endl;
+  G4cout<<"distance = "<<snxt<<G4endl;
+#endif
+  if (snxt < halfCarTolerance)  { snxt = 0.; }
   return snxt ;
 …
 G4double G4Cons::DistanceToIn(const G4ThreeVector& p) const
+{
   G4double safe=0.0, rho, safeR1, safeR2, safeZ ;
+  G4double safe=0.0, rho, safeR1, safeR2, safeZ, safePhi, cosPsi ;
   G4double tanRMin, secRMin, pRMin ;
   G4double tanRMax, secRMax, pRMax ;
-  G4double phiC, cosPhiC, sinPhiC, safePhi, ePhi ;
-  G4double cosPsi ;
   rho   = std::sqrt(p.x()*p.x() + p.y()*p.y()) ;
 …
     safeR2  = (rho - pRMax)/secRMax ;
     if ( safeR1 > safeR2) safe = safeR1 ;
     else                  safe = safeR2 ;
+    if ( safeR1 > safeR2) { safe = safeR1; }
+    else                  { safe = safeR2; }
+  }
   else
 …
     safe    = (rho - pRMax)/secRMax ;
+  }
+  if ( safeZ > safe ) safe = safeZ ;
+  if ( fDPhi < twopi && rho )
+  {
+    phiC    = fSPhi + fDPhi*0.5 ;
+    cosPhiC = std::cos(phiC) ;
+    sinPhiC = std::sin(phiC) ;
+  if ( safeZ > safe )  { safe = safeZ; }
+  if ( !fPhiFullCone && rho )
+  {
     // Psi=angle from central phi to point
     cosPsi = (p.x()*cosPhiC + p.y()*sinPhiC)/rho ;
+    cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/rho ;
     if ( cosPsi < std::cos(fDPhi*0.5) ) // Point lies outside phi range
+    {
       if ( (p.y()*cosPhiC - p.x()*sinPhiC) <= 0.0 )
+      {
         safePhi = std::fabs(p.x()*std::sin(fSPhi) - p.y()*std::cos(fSPhi)) ;
+      if ( (p.y()*cosCPhi - p.x()*sinCPhi) <= 0.0 )
+      {
+        safePhi = std::fabs(p.x()*std::sin(fSPhi)-p.y()*std::cos(fSPhi));
+      }
       else
+      {
+        ePhi    = fSPhi + fDPhi ;
+        safePhi = std::fabs(p.x()*std::sin(ePhi) - p.y()*std::cos(ePhi)) ;
+      }
+      if ( safePhi > safe ) safe = safePhi ;
+    }
+  }
+  if ( safe < 0.0 ) safe = 0.0 ;
+        safePhi = std::fabs(p.x()*sinEPhi-p.y()*cosEPhi);
+      }
+      if ( safePhi > safe )  { safe = safePhi; }
+    }
+  }
+  if ( safe < 0.0 )  { safe = 0.0; }
   return safe ;
 …
 ///////////////////////////////////////////////////////////////
 //
 // Calculate distance to surface of shape from `inside', allowing for tolerance
+// Calculate distance to surface of shape from 'inside', allowing for tolerance
 // - Only Calc rmax intersection if no valid rmin intersection
 G4double G4Cons::DistanceToOut( const G4ThreeVector& p,
               const G4ThreeVector& v,
               const G4bool calcNorm,
                     G4bool *validNorm,
                     G4ThreeVector *n) const
+                                const G4ThreeVector& v,
+                                const G4bool calcNorm,
+                                      G4bool *validNorm,
+                                      G4ThreeVector *n) const
+{
   ESide side = kNull, sider = kNull, sidephi = kNull;
+  static const G4double halfCarTolerance=kCarTolerance*0.5;
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
+  static const G4double halfAngTolerance=kAngTolerance*0.5;
   G4double snxt,sr,sphi,pdist ;
 …
   // Vars for phi intersection:
-  G4double sinSPhi, cosSPhi, ePhi, sinEPhi, cosEPhi ;
-  G4double cPhi, sinCPhi, cosCPhi ;
   G4double pDistS, compS, pDistE, compE, sphi2, xi, yi, risec, vphi ;
   G4double zi, ri, deltaRoi2 ;
 …
     pdist = fDz - p.z() ;
     if (pdist > kCarTolerance*0.5)
+    if (pdist > halfCarTolerance)
+    {
       snxt = pdist/v.z() ;
 …
         *validNorm = true ;
+      }
       return snxt = 0.0 ;
+      return  snxt = 0.0;
+    }
+  }
 …
     pdist = fDz + p.z() ;
     if ( pdist > kCarTolerance*0.5)
+    if ( pdist > halfCarTolerance)
+    {
       snxt = -pdist/v.z() ;
 …
                 - fRmax1*(fRmax1 + kRadTolerance*secRMax);
+  }
+  else deltaRoi2 = 1.0 ;
+  if ( nt1 && deltaRoi2 > 0.0 )
+  else
+  {
+    deltaRoi2 = 1.0;
+  }
+  if ( nt1 && (deltaRoi2 > 0.0) )
+  {
     // Equation quadratic => 2 roots : second root must be leaving
 …
+    {
       // Check if on outer cone & heading outwards
       // NOTE: Should use rho-rout>-kRadtolerance*0.5
+      // NOTE: Should use rho-rout>-kRadTolerance*0.5
       if (nt3 > -kRadTolerance*0.5 && nt2 >= 0 )
+      if (nt3 > -halfRadTolerance && nt2 >= 0 )
+      {
         if (calcNorm)
 …
           risec      = std::sqrt(t3)*secRMax ;
           *validNorm = true ;
           *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax) ;
+          *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax);
+        }
         return snxt=0 ;
 …
         ri    = tanRMax*zi + rMaxAv ;
+        if ( (ri >= 0) && (-kRadTolerance*0.5 <= sr) &&
+                          ( sr <= kRadTolerance*0.5)     )
+        if ((ri >= 0) && (-halfRadTolerance <= sr) && (sr <= halfRadTolerance))
+        {
           // An intersection within the tolerance
 …
           sidetol = kRMax ;
+        }
         if ( (ri < 0) || (sr < kRadTolerance*0.5) )
+        if ( (ri < 0) || (sr < halfRadTolerance) )
+        {
           // Safety: if both roots -ve ensure that sr cannot `win'
 …
           ri  = tanRMax*zi + rMaxAv ;
+          if (ri >= 0 && sr2 > kRadTolerance*0.5)  sr = sr2 ;
+          if ((ri >= 0) && (sr2 > halfRadTolerance))
+          {
+            sr = sr2;
+          }
           else
+          {
             sr = kInfinity ;
+            if(    (-kRadTolerance*0.5 <= sr2)
+                && ( sr2 <= kRadTolerance*0.5)  )
+            if( (-halfRadTolerance <= sr2) && ( sr2 <= halfRadTolerance) )
+            {
               // An intersection within the tolerance.
 …
       if ( calcNorm )
+      {
         risec      = std::sqrt(t3)*secRMax ;
         *validNorm = true ;
         *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax) ;
+        risec      = std::sqrt(t3)*secRMax;
+        *validNorm = true;
+        *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax);
+      }
       return snxt = 0.0 ;
+    }
+  }
   else if ( nt2 && deltaRoi2 > 0.0 )
+  else if ( nt2 && (deltaRoi2 > 0.0) )
+  {
     // Linear case (only one intersection) => point outside outer cone
 …
     if ( calcNorm )
+    {
       risec      = std::sqrt(t3)*secRMax ;
       *validNorm = true ;
       *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax) ;
+      risec      = std::sqrt(t3)*secRMax;
+      *validNorm = true;
+      *n         = G4ThreeVector(p.x()/risec,p.y()/risec,-tanRMax/secRMax);
+    }
     return snxt = 0.0 ;
 …
   // Check possible intersection within tolerance
   if ( slentol <= kCarTolerance*0.5 )
+  if ( slentol <= halfCarTolerance )
+  {
     // An intersection within the tolerance was found.
 …
     // Calculate a normal vector,  as below
     xi    = p.x() + slentol*v.x() ;
     yi    = p.y() + slentol*v.y() ;
     risec = std::sqrt(xi*xi + yi*yi)*secRMax ;
     G4ThreeVector Normal = G4ThreeVector(xi/risec,yi/risec,-tanRMax/secRMax) ;
+    xi    = p.x() + slentol*v.x();
+    yi    = p.y() + slentol*v.y();
+    risec = std::sqrt(xi*xi + yi*yi)*secRMax;
+    G4ThreeVector Normal = G4ThreeVector(xi/risec,yi/risec,-tanRMax/secRMax);
     if ( Normal.dot(v) > 0 )    // We will leave the Cone immediatelly
 …
+    }
     else // On the surface, but not heading out so we ignore this intersection
     {    //                                    (as it is within tolerance).
+    {    //                                        (as it is within tolerance).
       slentol = kInfinity ;
+    }
 …
       d = b*b - c ;
       if (d >= 0.0 )
+      if ( d >= 0.0 )
+      {
         // NOTE: should be rho-rin<kRadTolerance*0.5,
 …
           if ( nt2 < 0.0 )
+          {
             if (calcNorm)  *validNorm = false ;
             return          snxt      = 0.0 ;
+            if (calcNorm)  { *validNorm = false; }
+            return          snxt      = 0.0;
+          }
+        }
 …
           ri  = tanRMin*zi + rMinAv ;
+          if( (ri >= 0.0) && (-kRadTolerance*0.5 <= sr2) &&
+                             ( sr2 <= kRadTolerance*0.5)      )
+          if( (ri>=0.0)&&(-halfRadTolerance<=sr2)&&(sr2<=halfRadTolerance) )
+          {
             // An intersection within the tolerance
 …
             sidetol = kRMax ;
+          }
           if( (ri<0) || (sr2 < kRadTolerance*0.5) )
+          if( (ri<0) || (sr2 < halfRadTolerance) )
+          {
             sr3 = -b + std::sqrt(d) ;
 …
             //         distancetoout
             if  ( sr3 > kCarTolerance*0.5 )
+            if  ( sr3 > halfRadTolerance )
+            {
               if( sr3 < sr )
 …
+              }
+            }
             else if ( sr3 > -kCarTolerance*0.5 )
+            else if ( sr3 > -halfRadTolerance )
+            {
               // Intersection in tolerance. Store to check if it's good
 …
+            }
+          }
           else if ( sr2 < sr && sr2 > kCarTolerance*0.5 )
+          else if ( (sr2 < sr) && (sr2 > halfCarTolerance) )
+          {
             sr    = sr2 ;
             sider = kRMin ;
+          }
           else if (sr2 > -kCarTolerance*0.5)
+          else if (sr2 > -halfCarTolerance)
+          {
             // Intersection in tolerance. Store to check if it's good
 …
             sidetol = kRMin ;
+          }
           if( slentol <= kCarTolerance*0.5  )
+          if( slentol <= halfCarTolerance  )
+          {
             // An intersection within the tolerance was found.
 …
             if( Normal.dot(v) > 0 )
+            {
+              // We will leave the Cone immediatelly
+              // We will leave the cone immediately
               if( calcNorm )
+              {
 …
   // Phi Intersection
+  if ( fDPhi < twopi )
+  {
+    sinSPhi = std::sin(fSPhi) ;
+    cosSPhi = std::cos(fSPhi) ;
+    ePhi    = fSPhi + fDPhi ;
+    sinEPhi = std::sin(ePhi) ;
+    cosEPhi = std::cos(ePhi) ;
+    cPhi    = fSPhi + fDPhi*0.5 ;
+    sinCPhi = std::sin(cPhi) ;
+    cosCPhi = std::cos(cPhi) ;
+  if ( !fPhiFullCone )
+  {
     // add angle calculation with correction
+      // of the  difference in domain of atan2 and Sphi
+        vphi = std::atan2(v.y(),v.x()) ;
+         if ( vphi < fSPhi - kAngTolerance*0.5  )             vphi += twopi ;
+         else if ( vphi > fSPhi + fDPhi + kAngTolerance*0.5 ) vphi -= twopi;
+    // of the difference in domain of atan2 and Sphi
+    vphi = std::atan2(v.y(),v.x()) ;
+    if ( vphi < fSPhi - halfAngTolerance  )              { vphi += twopi; }
+    else if ( vphi > fSPhi + fDPhi + halfAngTolerance )  { vphi -= twopi; }
     if ( p.x() || p.y() )   // Check if on z axis (rho not needed later)
+    {
 …
       sidephi = kNull ;
+      if( ( (fDPhi <= pi) && ( (pDistS <= 0.5*kCarTolerance)
+                              && (pDistE <= 0.5*kCarTolerance) ) )
+         || ( (fDPhi >  pi) && !((pDistS >  0.5*kCarTolerance)
+                              && (pDistE >  0.5*kCarTolerance) ) )  )
+        {
+          // Inside both phi *full* planes
+          if ( compS < 0 )
+      if( ( (fDPhi <= pi) && ( (pDistS <= halfCarTolerance)
+                            && (pDistE <= halfCarTolerance) ) )
+         || ( (fDPhi >  pi) && !((pDistS >  halfCarTolerance)
+                              && (pDistE >  halfCarTolerance) ) )  )
+      {
+        // Inside both phi *full* planes
+        if ( compS < 0 )
+        {
+          sphi = pDistS/compS ;
+          if (sphi >= -halfCarTolerance)
+          {
+            sphi = pDistS/compS ;
+            if (sphi >= -0.5*kCarTolerance)
+            xi = p.x() + sphi*v.x() ;
+            yi = p.y() + sphi*v.y() ;
+            // Check intersecting with correct half-plane
+            // (if not -> no intersect)
+            //
+            if ( (std::abs(xi)<=kCarTolerance)
+              && (std::abs(yi)<=kCarTolerance) )
+            {
+              xi = p.x() + sphi*v.x() ;
+              yi = p.y() + sphi*v.y() ;
+              // Check intersecting with correct half-plane
+              // (if not -> no intersect)
+              //
+               if((std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance)){
+                 sidephi= kSPhi;
+                if(((fSPhi-0.5*kAngTolerance)<=vphi)&&((ePhi+0.5*kAngTolerance)>=vphi))
+                    { sphi = kInfinity; }
+              sidephi= kSPhi;
+              if ( ( fSPhi-halfAngTolerance <= vphi )
+                && ( fSPhi+fDPhi+halfAngTolerance >=vphi ) )
+              {
+                sphi = kInfinity;
+              }
+              else
+              if ((yi*cosCPhi-xi*sinCPhi)>=0)
+              {
+                sphi = kInfinity ;
+              }
+              else
+              {
+                sidephi = kSPhi ;
+                if ( pDistS > -kCarTolerance*0.5 )
+                {
+                  sphi = 0.0 ; // Leave by sphi immediately
+                }
+              }
+            }
+            else
+            if ( (yi*cosCPhi-xi*sinCPhi)>=0 )
+            {
+              sphi = kInfinity ;
+            }
             else
+            {
+              sphi = kInfinity ;
+            }
+              sidephi = kSPhi ;
+              if ( pDistS > -halfCarTolerance )
+              {
+                sphi = 0.0 ; // Leave by sphi immediately
+              }
+            }
+          }
           else
 …
             sphi = kInfinity ;
+          }
+          if ( compE < 0 )
+        }
+        else
+        {
+          sphi = kInfinity ;
+        }
+        if ( compE < 0 )
+        {
+          sphi2 = pDistE/compE ;
+          // Only check further if < starting phi intersection
+          //
+          if ( (sphi2 > -halfCarTolerance) && (sphi2 < sphi) )
+          {
+            sphi2 = pDistE/compE ;
+            // Only check further if < starting phi intersection
+            //
+            if ( (sphi2 > -0.5*kCarTolerance) && (sphi2 < sphi) )
+            xi = p.x() + sphi2*v.x() ;
+            yi = p.y() + sphi2*v.y() ;
+            // Check intersecting with correct half-plane
+            if ( (std::abs(xi)<=kCarTolerance)
+              && (std::abs(yi)<=kCarTolerance) )
+            {
+              xi = p.x() + sphi2*v.x() ;
+              yi = p.y() + sphi2*v.y() ;
+              // Check intersecting with correct half-plane
+               if((std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance)){
+               // Leaving via ending phi
+                if(!(((fSPhi-0.5*kAngTolerance)<=vphi)&&((ePhi+0.5*kAngTolerance)>=vphi))){
+                  sidephi = kEPhi ;
+                  if ( pDistE <= -kCarTolerance*0.5 ) sphi = sphi2 ;
+                  else                                sphi = 0.0 ;
+                  }
+                }
+             else // Check intersecting with correct half-plane
+              if ( (yi*cosCPhi-xi*sinCPhi) >= 0)
+              // Leaving via ending phi
+              if(!( (fSPhi-halfAngTolerance <= vphi)
+                 && (fSPhi+fDPhi+halfAngTolerance >= vphi) ) )
+              {
-                // Leaving via ending phi
                 sidephi = kEPhi ;
                 if ( pDistE <= -kCarTolerance*0.5 ) sphi = sphi2 ;
                 else                                sphi = 0.0 ;
+                if ( pDistE <= -halfCarTolerance )  { sphi = sphi2; }
+                else                                { sphi = 0.0; }
+              }
+            }
+            else // Check intersecting with correct half-plane
+            if ( yi*cosCPhi-xi*sinCPhi >= 0 )
+            {
+              // Leaving via ending phi
+              sidephi = kEPhi ;
+              if ( pDistE <= -halfCarTolerance )  { sphi = sphi2; }
+              else                                { sphi = 0.0; }
+            }
+          }
+        }
+        else
+        {
+          sphi = kInfinity ;
+        }
+      }
+      else
+      {
+        sphi = kInfinity ;
+      }
+    }
     else
 …
       // within phi of shape, Step limited by rmax, else Step =0
+      // vphi = std::atan2(v.y(),v.x()) ;
+      // if ( fSPhi < vphi && vphi < fSPhi + fDPhi ) sphi = kInfinity ;
+       if ( ((fSPhi-0.5*kAngTolerance) <= vphi) && (vphi <=( fSPhi + fDPhi)+0.5*kAngTolerance) )
+         {
+          sphi = kInfinity ;
+        }
+      if ( (fSPhi-halfAngTolerance <= vphi)
+        && (vphi <= fSPhi+fDPhi+halfAngTolerance) )
+      {
+        sphi = kInfinity ;
+      }
       else
+      {
 …
     if ( sphi < snxt )  // Order intersecttions
+    {
         snxt=sphi ;
         side=sidephi ;
+      snxt=sphi ;
+      side=sidephi ;
+    }
+  }
 …
+  {
     switch(side)
+    {
+      case kRMax:
+          // Note: returned vector not normalised
+          // (divide by frmax for unit vector)
+    {                     // Note: returned vector not normalised
+      case kRMax:         // (divide by frmax for unit vector)
         xi         = p.x() + snxt*v.x() ;
         yi         = p.y() + snxt*v.y() ;
 …
         break ;
       case kRMin:
         *validNorm=false ;  // Rmin is inconvex
+        *validNorm = false ;  // Rmin is inconvex
         break ;
       case kSPhi:
         if ( fDPhi <= pi )
+        {
           *n         = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0) ;
+          *n         = G4ThreeVector(sinSPhi, -cosSPhi, 0);
           *validNorm = true ;
+        }
+        else   *validNorm = false ;
+        else
+        {
+          *validNorm = false ;
+        }
         break ;
       case kEPhi:
         if ( fDPhi <= pi )
+        {
           *n         = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0) ;
+          *n = G4ThreeVector(-sinEPhi, cosEPhi, 0);
           *validNorm = true ;
+        }
+        else  *validNorm = false ;
+        else
+        {
+          *validNorm = false ;
+        }
         break ;
       case kPZ:
 …
         G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
         G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
         G4cout << "pho at z = "   << std::sqrt( p.x()*p.x()+p.y()*p.y() )/mm << " mm"
                << G4endl << G4endl ;
+        G4cout << "pho at z = "   << std::sqrt( p.x()*p.x()+p.y()*p.y() )/mm
+               << " mm" << G4endl << G4endl ;
         if( p.x() != 0. || p.x() != 0.)
+        {
            G4cout << "point phi = "   << std::atan2(p.y(),p.x())/degree << " degree"
                   << G4endl << G4endl ;
+           G4cout << "point phi = "   << std::atan2(p.y(),p.x())/degree
+                  << " degree" << G4endl << G4endl ;
+        }
         G4cout << "Direction:" << G4endl << G4endl ;
 …
+    }
+  }
+  if (snxt < kCarTolerance*0.5) snxt = 0.;
+#ifdef consdebug
+  G4cout.precision(24);
+  G4cout<<"G4Cons::DistanceToOut(p,v,...) "<<G4endl;
+  G4cout<<"position = "<<p<<G4endl;
+  G4cout<<"direction = "<<v<<G4endl;
+  G4cout<<"distance = "<<snxt<<G4endl;
+#endif
+  if (snxt < halfCarTolerance)  { snxt = 0.; }
   return snxt ;
+}
 …
 G4double G4Cons::DistanceToOut(const G4ThreeVector& p) const
+{
+  G4double safe=0.0,rho,safeR1,safeR2,safeZ ;
+  G4double tanRMin,secRMin,pRMin ;
+  G4double tanRMax,secRMax,pRMax ;
+  G4double safePhi,phiC,cosPhiC,sinPhiC,ePhi ;
+  G4double safe=0.0, rho, safeR1, safeR2, safeZ, safePhi;
+  G4double tanRMin, secRMin, pRMin;
+  G4double tanRMax, secRMax, pRMax;
 #ifdef G4CSGDEBUG
 …
     G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
     G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
     G4cout << "pho at z = "   << std::sqrt( p.x()*p.x()+p.y()*p.y() )/mm << " mm"
            << G4endl << G4endl ;
     if( p.x() != 0. || p.x() != 0.)
+    {
       G4cout << "point phi = "   << std::atan2(p.y(),p.x())/degree << " degree"
              << G4endl << G4endl ;
+    }
     G4Exception("G4Cons::DistanceToOut(p)", "Notification", JustWarning,
                 "Point p is outside !?" );
+    G4cout << "pho at z = "   << std::sqrt( p.x()*p.x()+p.y()*p.y() )/mm
+           << " mm" << G4endl << G4endl ;
+    if( (p.x() != 0.) || (p.x() != 0.) )
+    {
+      G4cout << "point phi = "   << std::atan2(p.y(),p.x())/degree
+             << " degree" << G4endl << G4endl ;
+    }
+    G4Exception("G4Cons::DistanceToOut(p)", "Notification",
+                JustWarning, "Point p is outside !?" );
+  }
 #endif
 …
     safeR1  = (rho - pRMin)/secRMin ;
+  }
+  else safeR1 = kInfinity ;
+  else
+  {
+    safeR1 = kInfinity ;
+  }
   tanRMax = (fRmax2 - fRmax1)*0.5/fDz ;
 …
   safeR2  = (pRMax - rho)/secRMax ;
   if (safeR1 < safeR2) safe = safeR1 ;
   else                 safe = safeR2 ;
   if (safeZ < safe)    safe = safeZ  ;
+  if (safeR1 < safeR2)  { safe = safeR1; }
+  else                  { safe = safeR2; }
+  if (safeZ < safe)     { safe = safeZ ; }
   // Check if phi divided, Calc distances closest phi plane
   if (fDPhi < twopi)
+  if (!fPhiFullCone)
+  {
     // Above/below central phi of G4Cons?
+    phiC    = fSPhi + fDPhi*0.5 ;
+    cosPhiC = std::cos(phiC) ;
+    sinPhiC = std::sin(phiC) ;
+    if ( (p.y()*cosPhiC - p.x()*sinPhiC) <= 0 )
+    {
+      safePhi = -(p.x()*std::sin(fSPhi) - p.y()*std::cos(fSPhi)) ;
+    if ( (p.y()*cosCPhi - p.x()*sinCPhi) <= 0 )
+    {
+      safePhi = -(p.x()*sinSPhi - p.y()*cosSPhi) ;
+    }
     else
+    {
       ePhi    = fSPhi + fDPhi ;
       safePhi = (p.x()*std::sin(ePhi) - p.y()*std::cos(ePhi)) ;
+    }
     if (safePhi < safe) safe = safePhi ;
+  }
+  if ( safe < 0 ) safe = 0 ;
   return safe ;
+      safePhi = (p.x()*sinEPhi - p.y()*cosEPhi) ;
+    }
+    if (safePhi < safe)  { safe = safePhi; }
+  }
+  if ( safe < 0 )  { safe = 0; }
+  return safe ;
+}
 …
   meshAngle = fDPhi/(noCrossSections - 1) ;
-  // G4double RMax = (fRmax2 >= fRmax1) ? fRmax2 : fRmax1  ;
   meshRMax1 = fRmax1/std::cos(meshAngle*0.5) ;
   meshRMax2 = fRmax2/std::cos(meshAngle*0.5) ;
 …
   // on the x axis. Will give better extent calculations when not rotated.
   if (fDPhi == twopi && fSPhi == 0.0 )
+  if ( fPhiFullCone && (fSPhi == 0.0) )
+  {
     sAngle = -meshAngle*0.5 ;
 …
       rMaxY2 = meshRMax2*sinCrossAngle ;
-      // G4double RMin = (fRmin2 <= fRmin1) ? fRmin2 : fRmin1  ;
       rMinX1 = fRmin1*cosCrossAngle ;
       rMinY1 = fRmin1*sinCrossAngle ;
 …
                 "Error in allocation of vertices. Out of memory !");
+  }
   return vertices ;
+}
 …
   rRand2 = RandFlat::shoot(fRmin2,fRmax2);
   if(fSPhi == 0. && fDPhi == twopi){ Afive = 0.; }
+  if ( (fSPhi == 0.) && fPhiFullCone )  { Afive = 0.; }
   chose  = RandFlat::shoot(0.,Aone+Atwo+Athree+Afour+2.*Afive);
 …
   else if( (chose >= Aone + Atwo) && (chose < Aone + Atwo + Athree) )
+  {
     return G4ThreeVector (rRand1*cosu,rRand1*sinu,-1*fDz);
+    return G4ThreeVector (rRand1*cosu, rRand1*sinu, -1*fDz);
+  }
   else if( (chose >= Aone + Atwo + Athree)

trunk/source/geometry/solids/CSG/src/G4Tubs.cc

-              r850
+              r921
 //
 //
 // $Id: G4Tubs.cc,v 1.68 2008/06/23 13:37:39 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Tubs.cc,v 1.74 2008/11/06 15:26:53 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
                 "Invalid Z half-length");
+  }
   if ( pRMin < pRMax && pRMin >= 0 ) // Check radii
+  if ( (pRMin < pRMax) && (pRMin >= 0) ) // Check radii
+  {
     fRMin = pRMin ;
 …
                 "Invalid radii.");
+  }
+  if ( pDPhi >= twopi ) // Check angles
+  fPhiFullTube = true;
+  if ( pDPhi >= twopi-kAngTolerance*0.5 ) // Check angles
+  {
     fDPhi=twopi;
+    fSPhi=0;
+  }
   else
+  {
+    fPhiFullTube = false;
     if ( pDPhi > 0 )
+    {
 …
              << "        Negative delta-Phi ! - "
              << pDPhi << G4endl;
+      G4Exception("G4Tubs::G4Tubs()", "InvalidSetup", FatalException,
+                  "Invalid dphi.");
+    }
+  }
+  // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+  fSPhi = pSPhi;
+  if ( fSPhi < 0 )
+  {
+    fSPhi = twopi - std::fmod(std::fabs(fSPhi),twopi) ;
+  }
+  else
+  {
+    fSPhi = std::fmod(fSPhi,twopi) ;
+  }
+  if (fSPhi + fDPhi > twopi )
+  {
+    fSPhi -= twopi ;
+  }
+      G4Exception("G4Tubs::G4Tubs()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+    }
+    // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+    if ( pSPhi < 0 )
+    {
+      fSPhi = twopi - std::fmod(std::fabs(pSPhi),twopi);
+    }
+    else
+    {
+      fSPhi = std::fmod(pSPhi,twopi) ;
+    }
+    if ( fSPhi+fDPhi > twopi )
+    {
+      fSPhi -= twopi ;
+    }
+  }
+  InitializeTrigonometry();
+}
 …
         yoff2 = yMax    - yoffset ;
         if ( yoff1 >= 0 && yoff2 >= 0 ) // Y limits cross max/min x => no change
+        {
+        if ( (yoff1 >= 0) && (yoff2 >= 0) ) // Y limits cross max/min x
+        {                                   // => no change
           pMin = xMin ;
           pMax = xMax ;
 …
         xoff2 = xMax - xoffset ;
         if ( xoff1 >= 0 && xoff2 >= 0 ) // X limits cross max/min y => no change
+        {
+        if ( (xoff1 >= 0) && (xoff2 >= 0) ) // X limits cross max/min y
+        {                                   // => no change
           pMin = yMin ;
           pMax = yMax ;
 …
     noEntries = vertices->size() ;
     noBetweenSections4 = noEntries - 4 ;
+    /*
+    G4cout << "vertices = " << noEntries << "\t"
+           << "v-4 = " << noBetweenSections4 << G4endl;
+    G4cout << G4endl;
+    for(i = 0 ; i < noEntries ; i++ )
+    {
+      G4cout << i << "\t" << "v.x = " << ((*vertices)[i]).x() << "\t"
+                          << "v.y = " << ((*vertices)[i]).y() << "\t"
+                          << "v.z = " << ((*vertices)[i]).z() << "\t" << G4endl;
+    }
+    G4cout << G4endl;
+    G4cout << "ClipCrossSection" << G4endl;
+    */
     for (i = 0 ; i < noEntries ; i += 4 )
+    {
+      // G4cout << "section = " << i << G4endl;
+      ClipCrossSection(vertices,i,pVoxelLimit,pAxis,pMin,pMax) ;
+    }
+    // G4cout << "ClipBetweenSections" << G4endl;
+      ClipCrossSection(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
+    }
     for (i = 0 ; i < noBetweenSections4 ; i += 4 )
+    {
+      // G4cout << "between sections = " << i << G4endl;
+      ClipBetweenSections(vertices,i,pVoxelLimit,pAxis,pMin,pMax) ;
+    }
+    if (pMin != kInfinity || pMax != -kInfinity )
+      ClipBetweenSections(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
+    }
+    if ((pMin != kInfinity) || (pMax != -kInfinity) )
+    {
       existsAfterClip = true ;
 …
   G4double r2,pPhi,tolRMin,tolRMax;
   EInside in = kOutside ;
+  if (std::fabs(p.z()) <= fDz - kCarTolerance*0.5)
+  static const G4double halfCarTolerance=kCarTolerance*0.5;
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
+  static const G4double halfAngTolerance=kAngTolerance*0.5;
+  if (std::fabs(p.z()) <= fDz - halfCarTolerance)
+  {
     r2 = p.x()*p.x() + p.y()*p.y() ;
     if (fRMin) { tolRMin = fRMin + kRadTolerance*0.5 ; }
+    if (fRMin) { tolRMin = fRMin + halfRadTolerance ; }
     else       { tolRMin = 0 ; }
     tolRMax = fRMax - kRadTolerance*0.5 ;
+    tolRMax = fRMax - halfRadTolerance ;
     if (r2 >= tolRMin*tolRMin && r2 <= tolRMax*tolRMax)
+    {
       if ( fDPhi == twopi )
+    if ((r2 >= tolRMin*tolRMin) && (r2 <= tolRMax*tolRMax))
+    {
+      if ( fPhiFullTube )
+      {
         in = kInside ;
 …
         // if not inside, try outer tolerant phi boundaries
+        pPhi = std::atan2(p.y(),p.x()) ;
+        if ((tolRMin==0)&&(p.x()==0)&&(p.y()==0))
+        if ((tolRMin==0)&&(p.x()<=halfCarTolerance)&&(p.y()<=halfCarTolerance))
+        {
           in=kSurface;
 …
         else
+        {
+          if ( pPhi < -kAngTolerance*0.5 )  { pPhi += twopi; } // 0<=pPhi<2pi
+          pPhi = std::atan2(p.y(),p.x()) ;
+          if ( pPhi < -halfAngTolerance )  { pPhi += twopi; } // 0<=pPhi<2pi
           if ( fSPhi >= 0 )
+          {
             if ( (std::abs(pPhi) < kAngTolerance*0.5)
               && (std::abs(fSPhi + fDPhi - twopi) < kAngTolerance*0.5) )
+            if ( (std::abs(pPhi) < halfAngTolerance)
+              && (std::abs(fSPhi + fDPhi - twopi) < halfAngTolerance) )
+            {
               pPhi += twopi ; // 0 <= pPhi < 2pi
+            }
             if ( (pPhi >= fSPhi + kAngTolerance*0.5)
               && (pPhi <= fSPhi + fDPhi - kAngTolerance*0.5) )
+            if ( (pPhi >= fSPhi + halfAngTolerance)
+              && (pPhi <= fSPhi + fDPhi - halfAngTolerance) )
+            {
               in = kInside ;
+            }
             else if ( (pPhi >= fSPhi - kAngTolerance*0.5)
                    && (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
+            else if ( (pPhi >= fSPhi - halfAngTolerance)
+                   && (pPhi <= fSPhi + fDPhi + halfAngTolerance) )
+            {
               in = kSurface ;
 …
           else  // fSPhi < 0
+          {
             if ( (pPhi <= fSPhi + twopi - kAngTolerance*0.5)
               && (pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5) ) {;}
             else if ( (pPhi <= fSPhi + twopi + kAngTolerance*0.5)
                    && (pPhi >= fSPhi + fDPhi  - kAngTolerance*0.5) )
+            if ( (pPhi <= fSPhi + twopi - halfAngTolerance)
+              && (pPhi >= fSPhi + fDPhi  + halfAngTolerance) ) {;} //kOutside
+            else if ( (pPhi <= fSPhi + twopi + halfAngTolerance)
+                   && (pPhi >= fSPhi + fDPhi  - halfAngTolerance) )
+            {
               in = kSurface ;
 …
     else  // Try generous boundaries
+    {
       tolRMin = fRMin - kRadTolerance*0.5 ;
       tolRMax = fRMax + kRadTolerance*0.5 ;
+      tolRMin = fRMin - halfRadTolerance ;
+      tolRMax = fRMax + halfRadTolerance ;
       if ( tolRMin < 0 )  { tolRMin = 0; }
 …
       if ( (r2 >= tolRMin*tolRMin) && (r2 <= tolRMax*tolRMax) )
+      {
         if ( fDPhi == twopi || r2 == 0 ) // Continuous in phi or on z-axis
+        {
+        if (fPhiFullTube || (r2 <=halfRadTolerance*halfRadTolerance) )
+        {                        // Continuous in phi or on z-axis
           in = kSurface ;
+        }
 …
           pPhi = std::atan2(p.y(),p.x()) ;
           if ( pPhi < -kAngTolerance*0.5 )  { pPhi += twopi; } // 0<=pPhi<2pi
+          if ( pPhi < -halfAngTolerance)  { pPhi += twopi; } // 0<=pPhi<2pi
           if ( fSPhi >= 0 )
+          {
             if ( (std::abs(pPhi) < kAngTolerance*0.5)
               && (std::abs(fSPhi + fDPhi - twopi) < kAngTolerance*0.5) )
+            if ( (std::abs(pPhi) < halfAngTolerance)
+              && (std::abs(fSPhi + fDPhi - twopi) < halfAngTolerance) )
+            {
               pPhi += twopi ; // 0 <= pPhi < 2pi
+            }
             if ( (pPhi >= fSPhi - kAngTolerance*0.5)
               && (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
+            if ( (pPhi >= fSPhi - halfAngTolerance)
+              && (pPhi <= fSPhi + fDPhi + halfAngTolerance) )
+            {
               in = kSurface ;
 …
           else  // fSPhi < 0
+          {
             if ( (pPhi <= fSPhi + twopi - kAngTolerance*0.5)
               && (pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5) ) {;}
+            if ( (pPhi <= fSPhi + twopi - halfAngTolerance)
+              && (pPhi >= fSPhi + fDPhi + halfAngTolerance) ) {;} // kOutside
             else
+            {
 …
+    }
+  }
   else if (std::fabs(p.z()) <= fDz + kCarTolerance*0.5)
+  else if (std::fabs(p.z()) <= fDz + halfCarTolerance)
   {                                          // Check within tolerant r limits
     r2      = p.x()*p.x() + p.y()*p.y() ;
     tolRMin = fRMin - kRadTolerance*0.5 ;
     tolRMax = fRMax + kRadTolerance*0.5 ;
+    tolRMin = fRMin - halfRadTolerance ;
+    tolRMax = fRMax + halfRadTolerance ;
     if ( tolRMin < 0 )  { tolRMin = 0; }
 …
     if ( (r2 >= tolRMin*tolRMin) && (r2 <= tolRMax*tolRMax) )
+    {
       if (fDPhi == twopi || r2 == 0 ) // Continuous in phi or on z-axis
+      {
+      if (fPhiFullTube || (r2 <=halfRadTolerance*halfRadTolerance))
+      {                        // Continuous in phi or on z-axis
         in = kSurface ;
+      }
 …
         pPhi = std::atan2(p.y(),p.x()) ;
         if ( pPhi < -kAngTolerance*0.5 )  { pPhi += twopi; }  // 0<=pPhi<2pi
+        if ( pPhi < -halfAngTolerance )  { pPhi += twopi; }  // 0<=pPhi<2pi
         if ( fSPhi >= 0 )
+        {
           if ( (std::abs(pPhi) < kAngTolerance*0.5)
             && (std::abs(fSPhi + fDPhi - twopi) < kAngTolerance*0.5) )
+          if ( (std::abs(pPhi) < halfAngTolerance)
+            && (std::abs(fSPhi + fDPhi - twopi) < halfAngTolerance) )
+          {
             pPhi += twopi ; // 0 <= pPhi < 2pi
+          }
           if ( (pPhi >= fSPhi - kAngTolerance*0.5)
             && (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
+          if ( (pPhi >= fSPhi - halfAngTolerance)
+            && (pPhi <= fSPhi + fDPhi + halfAngTolerance) )
+          {
             in = kSurface;
 …
         else  // fSPhi < 0
+        {
           if ( (pPhi <= fSPhi + twopi - kAngTolerance*0.5)
             && (pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5) ) {;}
+          if ( (pPhi <= fSPhi + twopi - halfAngTolerance)
+            && (pPhi >= fSPhi + fDPhi  + halfAngTolerance) ) {;}
           else
+          {
 …
 G4ThreeVector G4Tubs::SurfaceNormal( const G4ThreeVector& p ) const
+{ G4int noSurfaces = 0;
+{
+  G4int noSurfaces = 0;
   G4double rho, pPhi;
-  G4double delta   = 0.5*kCarTolerance, dAngle = 0.5*kAngTolerance;
   G4double distZ, distRMin, distRMax;
   G4double distSPhi = kInfinity, distEPhi = kInfinity;
+  static const G4double halfCarTolerance = 0.5*kCarTolerance;
+  static const G4double halfAngTolerance = 0.5*kAngTolerance;
   G4ThreeVector norm, sumnorm(0.,0.,0.);
   G4ThreeVector nZ = G4ThreeVector(0, 0, 1.0);
 …
   distZ    = std::fabs(std::fabs(p.z()) - fDz);
   if (fDPhi < twopi)   //  &&  rho ) // Protected against (0,0,z)
+  {
     if ( rho )
+  if (!fPhiFullTube)    // Protected against (0,0,z)
+  {
+    if ( rho > halfCarTolerance )
+    {
       pPhi = std::atan2(p.y(),p.x());
       if(pPhi  < fSPhi-delta)           { pPhi += twopi; }
       else if(pPhi > fSPhi+fDPhi+delta) { pPhi -= twopi; }
       distSPhi = std::fabs( pPhi - fSPhi );
+      if(pPhi  < fSPhi- halfCarTolerance)           { pPhi += twopi; }
+      else if(pPhi > fSPhi+fDPhi+ halfCarTolerance) { pPhi -= twopi; }
+      distSPhi = std::fabs(pPhi - fSPhi);
       distEPhi = std::fabs(pPhi - fSPhi - fDPhi);
+    }
 …
     nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
+  }
   if ( rho > delta )   { nR = G4ThreeVector(p.x()/rho,p.y()/rho,0); }
   if( distRMax <= delta )
+  if ( rho > halfCarTolerance ) { nR = G4ThreeVector(p.x()/rho,p.y()/rho,0); }
+  if( distRMax <= halfCarTolerance )
+  {
     noSurfaces ++;
     sumnorm += nR;
+  }
   if( fRMin && distRMin <= delta )
+  if( fRMin && (distRMin <= halfCarTolerance) )
+  {
     noSurfaces ++;
 …
   if( fDPhi < twopi )
+  {
     if (distSPhi <= dAngle)  // delta)
+    if (distSPhi <= halfAngTolerance)
+    {
       noSurfaces ++;
       sumnorm += nPs;
+    }
     if (distEPhi <= dAngle) // delta)
+    if (distEPhi <= halfAngTolerance)
+    {
       noSurfaces ++;
 …
+    }
+  }
   if (distZ <= delta)
+  if (distZ <= halfCarTolerance)
+  {
     noSurfaces ++;
 …
   else if ( noSurfaces == 1 )  { norm = sumnorm; }
   else                         { norm = sumnorm.unit(); }
   return norm;
+}
 …
+    }
+  }
   if (fDPhi < twopi  &&  rho ) // Protected against (0,0,z)
+  if (!fPhiFullTube  &&  rho ) // Protected against (0,0,z)
+  {
     phi = std::atan2(p.y(),p.x()) ;
 …
     case kNRMin : // Inner radius
+    {
       norm = G4ThreeVector(-p.x()/rho,-p.y()/rho,0) ;
+      norm = G4ThreeVector(-p.x()/rho, -p.y()/rho, 0) ;
       break ;
+    }
     case kNRMax : // Outer radius
+    {
       norm = G4ThreeVector(p.x()/rho,p.y()/rho,0) ;
+      norm = G4ThreeVector(p.x()/rho, p.y()/rho, 0) ;
       break ;
+    }
     case kNZ : //    + or - dz
+    {
       if ( p.z() > 0 ) norm = G4ThreeVector(0,0,1)  ;
       else             norm = G4ThreeVector(0,0,-1) ;
+      if ( p.z() > 0 )  { norm = G4ThreeVector(0,0,1) ; }
+      else              { norm = G4ThreeVector(0,0,-1); }
       break ;
+    }
     case kNSPhi:
+    {
       norm = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0) ;
+      norm = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0) ;
       break ;
+    }
     case kNEPhi:
+    {
       norm = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0) ;
+      norm = G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0) ;
       break;
+    }
 …
 //
 // NOTE:
+// - Precalculations for phi trigonometry are Done `just in time'
+// - `if valid' implies tolerant checking of intersection points
+// - 'if valid' implies tolerant checking of intersection points
 G4double G4Tubs::DistanceToIn( const G4ThreeVector& p,
                                const G4ThreeVector& v  ) const
+{
+  G4double snxt = kInfinity ;  // snxt = default return value
+  // Precalculated trig for phi intersections - used by r,z intersections to
+  //                                            check validity
+  G4bool seg ;        // true if segmented
+  G4double hDPhi, hDPhiOT, hDPhiIT, cosHDPhiOT=0., cosHDPhiIT=0. ;
+          // half dphi + outer tolerance
+  G4double cPhi, sinCPhi=0., cosCPhi=0. ;  // central phi
+  G4double tolORMin2, tolIRMax2 ;  // `generous' radii squared
+  G4double snxt = kInfinity ;      // snxt = default return value
+  G4double tolORMin2, tolIRMax2 ;  // 'generous' radii squared
   G4double tolORMax2, tolIRMin2, tolODz, tolIDz ;
+  static const G4double halfCarTolerance = 0.5*kCarTolerance;
+  static const G4double halfRadTolerance = 0.5*kRadTolerance;
   // Intersection point variables
   //
+  G4double Dist, s, xi, yi, zi, rho2, inum, iden, cosPsi ;
+  G4double t1, t2, t3, b, c, d ;   // Quadratic solver variables
+  G4double Comp ;
+  G4double cosSPhi, sinSPhi ;    // Trig for phi start intersect
+  G4double ePhi, cosEPhi, sinEPhi ;  // for phi end intersect
+  // Set phi divided flag and precalcs
+  if ( fDPhi < twopi )
+  {
+    seg        = true ;
+    hDPhi      = 0.5*fDPhi ;    // half delta phi
+    cPhi       = fSPhi + hDPhi ;
+    hDPhiOT    = hDPhi + 0.5*kAngTolerance ;  // outers tol' half delta phi
+    hDPhiIT    = hDPhi - 0.5*kAngTolerance ;
+    sinCPhi    = std::sin(cPhi) ;
+    cosCPhi    = std::cos(cPhi) ;
+    cosHDPhiOT = std::cos(hDPhiOT) ;
+    cosHDPhiIT = std::cos(hDPhiIT) ;
+  }
+  else
+  {
+    seg = false  ;
+  }
+  G4double Dist, s, xi, yi, zi, rho2, inum, iden, cosPsi, Comp ;
+  G4double t1, t2, t3, b, c, d ;     // Quadratic solver variables
   // Calculate tolerant rmin and rmax
   if (fRMin > kRadTolerance)
+  {
     tolORMin2 = (fRMin - 0.5*kRadTolerance)*(fRMin - 0.5*kRadTolerance) ;
     tolIRMin2 = (fRMin + 0.5*kRadTolerance)*(fRMin + 0.5*kRadTolerance) ;
+    tolORMin2 = (fRMin - halfRadTolerance)*(fRMin - halfRadTolerance) ;
+    tolIRMin2 = (fRMin + halfRadTolerance)*(fRMin + halfRadTolerance) ;
+  }
   else
 …
     tolIRMin2 = 0.0 ;
+  }
   tolORMax2 = (fRMax + 0.5*kRadTolerance)*(fRMax + 0.5*kRadTolerance) ;
   tolIRMax2 = (fRMax - 0.5*kRadTolerance)*(fRMax - 0.5*kRadTolerance) ;
+  tolORMax2 = (fRMax + halfRadTolerance)*(fRMax + halfRadTolerance) ;
+  tolIRMax2 = (fRMax - halfRadTolerance)*(fRMax - halfRadTolerance) ;
   // Intersection with Z surfaces
   tolIDz = fDz - kCarTolerance*0.5 ;
   tolODz = fDz + kCarTolerance*0.5 ;
+  tolIDz = fDz - halfCarTolerance ;
+  tolODz = fDz + halfCarTolerance ;
   if (std::fabs(p.z()) >= tolIDz)
 …
     if ( p.z()*v.z() < 0 )    // at +Z going in -Z or visa versa
+    {
       s = (std::fabs(p.z()) - fDz)/std::fabs(v.z()) ;     // Z intersect distance
+      s = (std::fabs(p.z()) - fDz)/std::fabs(v.z()) ;   // Z intersect distance
       if(s < 0.0)  { s = 0.0; }
 …
       // Check validity of intersection
       if (tolIRMin2 <= rho2 && rho2 <= tolIRMax2)
+      {
         if (seg && rho2)
+      if ((tolIRMin2 <= rho2) && (rho2 <= tolIRMax2))
+      {
+        if (!fPhiFullTube && rho2)
+        {
           // Psi = angle made with central (average) phi of shape
 …
           iden   = std::sqrt(rho2) ;
           cosPsi = inum/iden ;
           if (cosPsi >= cosHDPhiIT) return s ;
+          if (cosPsi >= cosHDPhiIT)  { return s ; }
+        }
         else
 …
     else
+    {
       if ( snxt<kCarTolerance*0.5 )  { snxt=0; }
+      if ( snxt<halfCarTolerance )  { snxt=0; }
       return snxt ;  // On/outside extent, and heading away
                      // -> cannot intersect
 …
     b = t2/t1 ;
     c = t3 - fRMax*fRMax ;
     if (t3 >= tolORMax2 && t2<0)   // This also handles the tangent case
+    if ((t3 >= tolORMax2) && (t2<0))   // This also handles the tangent case
+    {
       // Try outer cylinder intersection
 …
             // Z ok. Check phi intersection if reqd
             //
             if (!seg)
+            if (fPhiFullTube)
+            {
               return s ;
 …
               yi     = p.y() + s*v.y() ;
               cosPsi = (xi*cosCPhi + yi*sinCPhi)/fRMax ;
               if (cosPsi >= cosHDPhiIT) return s ;
+              if (cosPsi >= cosHDPhiIT)  { return s ; }
+            }
           }  //  end if std::fabs(zi)
 …
       // check not inside, and heading through tubs (-> 0 to in)
       if (t3 > tolIRMin2 && t2 < 0 && std::fabs(p.z()) <= tolIDz)
+      if ((t3 > tolIRMin2) && (t2 < 0) && (std::fabs(p.z()) <= tolIDz))
+      {
         // Inside both radii, delta r -ve, inside z extent
         if (seg)
+        if (!fPhiFullTube)
+        {
           inum   = p.x()*cosCPhi + p.y()*sinCPhi ;
 …
                 snxt = c/(-b+std::sqrt(d)); // using safe solution
                                             // for quadratic equation
                 if ( snxt<kCarTolerance*0.5 ) { snxt=0; }
+                if ( snxt < halfCarTolerance ) { snxt=0; }
                 return snxt ;
+              }
 …
               snxt= c/(-b+std::sqrt(d)); // using safe solution
                                          // for quadratic equation
               if ( snxt<kCarTolerance*0.5 ) { snxt=0; }
+              if ( snxt < halfCarTolerance ) { snxt=0; }
               return snxt ;
+            }
 …
+            }
+          }
         } // end if   (seg)
+        } // end if   (!fPhiFullTube)
       }   // end if   (t3>tolIRMin2)
     }     // end if   (Inside Outer Radius)
 …
         s = -b + std::sqrt(d) ;
         if (s >= -0.5*kCarTolerance)  // check forwards
+        if (s >= -halfCarTolerance)  // check forwards
+        {
           // Check z intersection
 …
             // Z ok. Check phi
             //
             if ( !seg )
+            if ( fPhiFullTube )
+            {
               return s ;
 …
   //         -> use some form of loop Construct ?
   //
   if ( seg )
+  if ( !fPhiFullTube )
+  {
     // First phi surface (Starting phi)
+    sinSPhi = std::sin(fSPhi) ;
+    cosSPhi = std::cos(fSPhi) ;
+    //
     Comp    = v.x()*sinSPhi - v.y()*cosSPhi ;
 …
       Dist = (p.y()*cosSPhi - p.x()*sinSPhi) ;
       if ( Dist < kCarTolerance*0.5 )
+      if ( Dist < halfCarTolerance )
+      {
         s = Dist/Comp ;
 …
               // - check intersecting with correct half-plane
               //
               if ((yi*cosCPhi-xi*sinCPhi) <= 0) snxt = s ;
+            }
+              if ((yi*cosCPhi-xi*sinCPhi) <= halfCarTolerance) { snxt = s; }
+            }
+          }
+        }
 …
+    }
+    // Second phi surface (`E'nding phi)
+    ePhi    = fSPhi + fDPhi ;
+    sinEPhi = std::sin(ePhi) ;
+    cosEPhi = std::cos(ePhi) ;
+    // Second phi surface (Ending phi)
     Comp    = -(v.x()*sinEPhi - v.y()*cosEPhi) ;
 …
       Dist = -(p.y()*cosEPhi - p.x()*sinEPhi) ;
       if ( Dist < kCarTolerance*0.5 )
+      if ( Dist < halfCarTolerance )
+      {
         s = Dist/Comp ;
 …
               // - check intersecting with correct half-plane
               //
               if ( (yi*cosCPhi-xi*sinCPhi) >= 0 )  { snxt = s; }
+            }
+              if ( (yi*cosCPhi-xi*sinCPhi) >= 0 ) { snxt = s; }
+            }                         //?? >=-halfCarTolerance
+          }
+        }
+      }
     }         //  Comp < 0
   }           //  seg != 0
   if ( snxt<kCarTolerance*0.5 )  { snxt=0; }
+  }           //  !fPhiFullTube
+  if ( snxt<halfCarTolerance )  { snxt=0; }
   return snxt ;
+}
 …
+{
   G4double safe=0.0, rho, safe1, safe2, safe3 ;
   G4double phiC, cosPhiC, sinPhiC, safePhi, ePhi, cosPsi ;
+  G4double safePhi, cosPsi ;
   rho   = std::sqrt(p.x()*p.x() + p.y()*p.y()) ;
 …
   if ( safe3 > safe )  { safe = safe3; }
+  if (fDPhi < twopi && rho)
+  {
+    phiC    = fSPhi + fDPhi*0.5 ;
+    cosPhiC = std::cos(phiC) ;
+    sinPhiC = std::sin(phiC) ;
+  if ( (!fPhiFullTube) && (rho) )
+  {
     // Psi=angle from central phi to point
     //
     cosPsi = (p.x()*cosPhiC + p.y()*sinPhiC)/rho ;
+    cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/rho ;
     if ( cosPsi < std::cos(fDPhi*0.5) )
+    {
       // Point lies outside phi range
       if ( (p.y()*cosPhiC - p.x()*sinPhiC) <= 0 )
+      {
         safePhi = std::fabs(p.x()*std::sin(fSPhi) - p.y()*std::cos(fSPhi)) ;
+      if ( (p.y()*cosCPhi - p.x()*sinCPhi) <= 0 )
+      {
+        safePhi = std::fabs(p.x()*sinSPhi - p.y()*cosSPhi) ;
+      }
       else
+      {
+        ePhi    = fSPhi + fDPhi ;
+        safePhi = std::fabs(p.x()*std::sin(ePhi) - p.y()*std::cos(ePhi)) ;
+        safePhi = std::fabs(p.x()*sinEPhi - p.y()*cosEPhi) ;
+      }
       if ( safePhi > safe )  { safe = safePhi; }
 …
                                       G4ThreeVector *n    ) const
+{
   ESide side = kNull , sider = kNull, sidephi = kNull ;
   G4double snxt, sr = kInfinity, sphi = kInfinity, pdist ;
+  ESide side=kNull , sider=kNull, sidephi=kNull ;
+  G4double snxt, sr=kInfinity, sphi=kInfinity, pdist ;
   G4double deltaR, t1, t2, t3, b, c, d2, roMin2 ;
+  static const G4double halfCarTolerance = kCarTolerance*0.5;
+  static const G4double halfAngTolerance = kAngTolerance*0.5;
   // Vars for phi intersection:
-  G4double sinSPhi, cosSPhi, ePhi, sinEPhi, cosEPhi ;
-  G4double cPhi, sinCPhi, cosCPhi ;
   G4double pDistS, compS, pDistE, compE, sphi2, xi, yi, vphi, roi2 ;
 …
+  {
     pdist = fDz - p.z() ;
     if ( pdist > kCarTolerance*0.5 )
+    if ( pdist > halfCarTolerance )
+    {
       snxt = pdist/v.z() ;
 …
     pdist = fDz + p.z() ;
     if ( pdist > kCarTolerance*0.5 )
+    if ( pdist > halfCarTolerance )
+    {
       snxt = -pdist/v.z() ;
 …
   // Radial Intersections
   //
   // Find intersction with cylinders at rmax/rmin
+  // Find intersection with cylinders at rmax/rmin
   // Intersection point (xi,yi,zi) on line x=p.x+t*v.x etc.
   //
 …
         b     = t2/t1 ;
         c     = deltaR/t1 ;
         d2= b*b-c;
         if(d2>=0.){sr    = -b + std::sqrt(d2);}
         else{sr=0.;};
+        d2    = b*b-c;
+        if( d2 >= 0 ) { sr = -b + std::sqrt(d2); }
+        else          { sr = 0.; }
         sider = kRMax ;
+      }
 …
         if ( calcNorm )
+        {
-          // if ( p.x() || p.y() )
-          // {
-          //  *n=G4ThreeVector(p.x(),p.y(),0);
-          // }
-          // else
-          // {
-          //  *n=v;
-          // }
           *n         = G4ThreeVector(p.x()/fRMax,p.y()/fRMax,0) ;
           *validNorm = true ;
 …
           c     = deltaR/t1 ;
           d2    = b*b-c;
           if(d2>=0.)
+          if( d2 >=0. )
+          {
             sr     = -b + std::sqrt(d2) ;
 …
+          }
           else // Case: On the border+t2<kRadTolerance
                //       (v is perpendiculair to the surface)
+               //       (v is perpendicular to the surface)
+          {
             if (calcNorm)
 …
         c      = deltaR/t1;
         d2     = b*b-c;
         if(d2>=0.)
+        if( d2 >= 0 )
+        {
           sr     = -b + std::sqrt(d2) ;
 …
+        }
         else // Case: On the border+t2<kRadTolerance
              //       (v is perpendiculair to the surface)
+             //       (v is perpendicular to the surface)
+        {
           if (calcNorm)
 …
     // Phi Intersection
+    if ( fDPhi < twopi )
+    {
+      sinSPhi = std::sin(fSPhi) ;
+      cosSPhi = std::cos(fSPhi) ;
+      ePhi    = fSPhi + fDPhi ;
+      sinEPhi = std::sin(ePhi) ;
+      cosEPhi = std::cos(ePhi) ;
+      cPhi    = fSPhi + fDPhi*0.5 ;
+      sinCPhi = std::sin(cPhi) ;
+      cosCPhi = std::cos(cPhi) ;
+    if ( !fPhiFullTube )
+    {
       // add angle calculation with correction
       // of the difference in domain of atan2 and Sphi
       //
       vphi = std::atan2(v.y(),v.x()) ;
       if ( vphi < fSPhi - kAngTolerance*0.5  )             { vphi += twopi; }
       else if ( vphi > fSPhi + fDPhi + kAngTolerance*0.5 ) { vphi -= twopi; }
+      if ( vphi < fSPhi - halfAngTolerance  )             { vphi += twopi; }
+      else if ( vphi > fSPhi + fDPhi + halfAngTolerance ) { vphi -= twopi; }
 …
         compS   = -sinSPhi*v.x() + cosSPhi*v.y() ;
         compE   =  sinEPhi*v.x() - cosEPhi*v.y() ;
         sidephi = kNull;
         if( ( (fDPhi <= pi) && ( (pDistS <= 0.5*kCarTolerance)
                               && (pDistE <= 0.5*kCarTolerance) ) )
          || ( (fDPhi >  pi) && !((pDistS >  0.5*kCarTolerance)
                               && (pDistE >  0.5*kCarTolerance) ) )  )
+        if( ( (fDPhi <= pi) && ( (pDistS <= halfCarTolerance)
+                              && (pDistE <= halfCarTolerance) ) )
+         || ( (fDPhi >  pi) && !((pDistS >  halfCarTolerance)
+                              && (pDistE >  halfCarTolerance) ) )  )
+        {
           // Inside both phi *full* planes
 …
             sphi = pDistS/compS ;
             if (sphi >= -0.5*kCarTolerance)
+            if (sphi >= -halfCarTolerance)
+            {
               xi = p.x() + sphi*v.x() ;
 …
               // (if not -> no intersect)
               //
+              if((std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance))
+                { sidephi = kSPhi;
+                if (((fSPhi-0.5*kAngTolerance)<=vphi)
+                   &&((ePhi+0.5*kAngTolerance)>=vphi))
+              if( (std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance) )
+              {
+                sidephi = kSPhi;
+                if (((fSPhi-halfAngTolerance)<=vphi)
+                   &&((fSPhi+fDPhi+halfAngTolerance)>=vphi))
+                {
                   sphi = kInfinity;
+                }
+              }
               else if ((yi*cosCPhi-xi*sinCPhi)>=0)
+              else if ( yi*cosCPhi-xi*sinCPhi >=0 )
+              {
                 sphi = kInfinity ;
 …
+              {
                 sidephi = kSPhi ;
                 if ( pDistS > -kCarTolerance*0.5 )
+                if ( pDistS > -halfCarTolerance )
+                {
                   sphi = 0.0 ; // Leave by sphi immediately
 …
             // Only check further if < starting phi intersection
             //
             if ( (sphi2 > -0.5*kCarTolerance) && (sphi2 < sphi) )
+            if ( (sphi2 > -halfCarTolerance) && (sphi2 < sphi) )
+            {
               xi = p.x() + sphi2*v.x() ;
 …
                 // Leaving via ending phi
                 //
                 if(!(((fSPhi-0.5*kAngTolerance)<=vphi)
                     &&((ePhi+0.5*kAngTolerance)>=vphi)))
+                if( !((fSPhi-halfAngTolerance <= vphi)
+                     &&(fSPhi+fDPhi+halfAngTolerance >= vphi)) )
+                {
                   sidephi = kEPhi ;
                   if ( pDistE <= -kCarTolerance*0.5 )  { sphi = sphi2 ; }
                   else                                 { sphi = 0.0 ; }
+                  if ( pDistE <= -halfCarTolerance )  { sphi = sphi2 ; }
+                  else                                { sphi = 0.0 ;   }
+                }
+              }
 …
                 //
                 sidephi = kEPhi ;
                 if ( pDistE <= -kCarTolerance*0.5 ) { sphi = sphi2 ; }
                 else                                { sphi = 0.0 ; }
+                if ( pDistE <= -halfCarTolerance ) { sphi = sphi2 ; }
+                else                               { sphi = 0.0 ;   }
+              }
+            }
 …
         // On z axis + travel not || to z axis -> if phi of vector direction
         // within phi of shape, Step limited by rmax, else Step =0
-        // vphi = std::atan2(v.y(),v.x()) ;//defined previosly
-        // G4cout<<"In axis vphi="<<vphi
-        //       <<" Sphi="<<fSPhi<<" Ephi="<<ePhi<<G4endl;
-        // old  if ( (fSPhi < vphi) && (vphi < fSPhi + fDPhi) )
-        // new : correction for if statement, must be '<='
         if ( ((fSPhi-0.5*kAngTolerance) <= vphi)
            && (vphi <=( ePhi+0.5*kAngTolerance) ))
+        if ( (fSPhi - halfAngTolerance <= vphi)
+           && (vphi <= fSPhi + fDPhi + halfAngTolerance ) )
+        {
           sphi = kInfinity ;
 …
         if ( fDPhi <= pi )
+        {
           *n         = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0) ;
+          *n         = G4ThreeVector(sinSPhi,-cosSPhi,0) ;
           *validNorm = true ;
+        }
 …
         if (fDPhi <= pi)
+        {
           *n = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0) ;
+          *n = G4ThreeVector(-sinEPhi,cosEPhi,0) ;
           *validNorm = true ;
+        }
 …
       case kPZ:
         *n=G4ThreeVector(0,0,1) ;
         *validNorm=true ;
+        *n         = G4ThreeVector(0,0,1) ;
+        *validNorm = true ;
         break ;
 …
+    }
+  }
   if ( snxt<kCarTolerance*0.5 )  { snxt=0 ; }
+  if ( snxt<halfCarTolerance )  { snxt=0 ; }
   return snxt ;
 …
 G4double G4Tubs::DistanceToOut( const G4ThreeVector& p ) const
+{
+  G4double safe=0.0, rho, safeR1, safeR2, safeZ ;
+  G4double safePhi, phiC, cosPhiC, sinPhiC, ePhi ;
+  G4double safe=0.0, rho, safeR1, safeR2, safeZ, safePhi ;
   rho = std::sqrt(p.x()*p.x() + p.y()*p.y()) ;
 …
   // Check if phi divided, Calc distances closest phi plane
   //
+  if ( fDPhi < twopi )
+  {
+    // Above/below central phi of Tubs?
+    phiC    = fSPhi + fDPhi*0.5 ;
+    cosPhiC = std::cos(phiC) ;
+    sinPhiC = std::sin(phiC) ;
+    if ( (p.y()*cosPhiC - p.x()*sinPhiC) <= 0 )
+    {
+      safePhi = -(p.x()*std::sin(fSPhi) - p.y()*std::cos(fSPhi)) ;
+  if ( !fPhiFullTube )
+  {
+    if ( p.y()*cosCPhi-p.x()*sinCPhi <= 0 )
+    {
+      safePhi = -(p.x()*sinSPhi - p.y()*cosSPhi) ;
+    }
     else
+    {
+      ePhi    = fSPhi + fDPhi ;
+      safePhi = (p.x()*std::sin(ePhi) - p.y()*std::cos(ePhi)) ;
+      safePhi = (p.x()*sinEPhi - p.y()*cosEPhi) ;
+    }
     if (safePhi < safe)  { safe = safePhi ; }
 …
   // on the x axis. Will give better extent calculations when not rotated.
   if (fDPhi == pi*2.0 && fSPhi == 0 )  { sAngle = -meshAngle*0.5 ; }
   else                                 { sAngle =  fSPhi ; }
+  if (fPhiFullTube && (fSPhi == 0) )  { sAngle = -meshAngle*0.5 ; }
+  else                                { sAngle =  fSPhi ; }
   vertices = new G4ThreeVectorList();
 …
   if (fRMin != 0)
+  {
     if (fDPhi >= twopi)
+    if (fPhiFullTube)
+    {
       pNURBS = new G4NURBStube (fRMin,fRMax,fDz) ;
 …
   else
+  {
     if (fDPhi >= twopi)
+    if (fPhiFullTube)
+    {
       pNURBS = new G4NURBScylinder (fRMax,fDz) ;

trunk/source/geometry/solids/specific/History

-              r850
+              r921
 $Id: History,v 1.145 2008/08/12 08:57:31 gcosmo Exp $
+$Id: History,v 1.150 2008/11/21 09:26:53 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+-Nov-2008, G.Cosmo (geom-specific-V09-01-19)
+- Added missing accessors to G4EllipticalCone, required for detector
+  persistency.
+-Nov-2008, G.Cosmo (geom-specific-V09-01-18)
+- Corrected initialisation of algorithm in G4TriangularFacet constructor.
+-Oct-2008, I.Hrivnacova (geom-specific-V09-01-17)
+- G4ExtrudedSolid: fixed bug in the decomposition of polygonal sides for
+  quadrangular facets in MakeFacets(). Addresses problem report #1029.
+-Sep-2008, T.Nikitina (geom-specific-V09-01-16)
+- Corrected algorithm in G4TriangularFacet::GetPointOnFace() according to
+  suggestion advanced in problem report #1025. Fixes a problem of false
+  overlaps detection related to G4ExtrudedSolid and G4TessellatedSolid.
+-Sep-2008, G.Cosmo (geom-specific-V09-01-15)
+- G4VFacet: corrected increment of indeces in operator==(), following
+  problem report #1024.
 -Jul-2008, I.Hrivnacova (geom-specific-V09-01-14)

trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh

-              r850
+              r921
 //
 //
 // $Id: G4EllipticalCone.hh,v 1.11 2007/08/20 15:21:40 tnikitin Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EllipticalCone.hh,v 1.12 2008/11/21 09:26:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     //
     inline G4double GetSemiAxisMax () const;
+    inline G4double GetSemiAxisX () const;
+    inline G4double GetSemiAxisY () const;
+    inline G4double GetZMax() const;
     inline G4double GetZTopCut() const;
     inline void SetSemiAxis (G4double x, G4double y, G4double z);

trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc

-              r850
+              r921
 //
 //
 // $Id: G4EllipticalCone.icc,v 1.6 2006/10/20 13:45:20 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EllipticalCone.icc,v 1.7 2008/11/21 09:26:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
+{
   return ySemiAxis > xSemiAxis ? ySemiAxis : xSemiAxis;
+}
+inline
+G4double G4EllipticalCone::GetSemiAxisX () const
+{
+  return xSemiAxis;
+}
+inline
+G4double G4EllipticalCone::GetSemiAxisY () const
+{
+  return ySemiAxis;
+}
+inline
+G4double G4EllipticalCone::GetZMax() const
+{
+  return zheight;
+}

trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExtrudedSolid.cc,v 1.17 2008/08/12 08:54:57 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExtrudedSolid.cc,v 1.18 2008/10/30 11:47:45 ivana Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     good = AddFacet( new G4QuadrangularFacet( GetVertex(fNz-1, 3), GetVertex(fNz-1, 2),
                                               GetVertex(fNz-1, 1), GetVertex(1, 0),
+                                              GetVertex(fNz-1, 1), GetVertex(fNz-1, 0),
                                               ABSOLUTE) );
     if ( ! good ) { return false; }

trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4TriangularFacet.cc,v 1.10 2007/12/10 16:30:35 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4TriangularFacet.cc,v 1.12 2008/11/13 08:25:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
   : G4VFacet()
+{
   if (!tGeomAlg) { tGeomAlg = G4TessellatedGeometryAlgorithms::GetInstance(); }
+  tGeomAlg  = G4TessellatedGeometryAlgorithms::GetInstance();
   P0        = Pt0;
   nVertices = 3;
 …
 G4ThreeVector G4TriangularFacet::GetPointOnFace() const
+{
+  G4double lambda0 = CLHEP::RandFlat::shoot(0.,1.);
+  G4double lambda1 = CLHEP::RandFlat::shoot(0.,lambda0);
+  G4double alpha = CLHEP::RandFlat::shoot(0.,1.);
+  G4double beta = CLHEP::RandFlat::shoot(0.,1);
+  G4double lambda1=alpha*beta;
+  G4double lambda0=alpha-lambda1;
   return (P0 + lambda0*E[0] + lambda1*E[1]);
+}

trunk/source/geometry/solids/specific/src/G4VFacet.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4VFacet.cc,v 1.6 2007/08/23 14:45:03 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4VFacet.cc,v 1.7 2008/09/12 07:16:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
+    {
       coincident = (GetVertex(i)-right.GetVertex(j)).mag2() < tolerance;
     } while (!coincident && j++ < nVertices);
   } while (coincident && i++ < nVertices);
+    } while (!coincident && ++j < nVertices);
+  } while (coincident && ++i < nVertices);
   return coincident;
 …
 std::ostream &G4VFacet::StreamInfo(std::ostream &os) const
+{
   os <<G4endl;
   os <<"***********************************************************************"
      <<G4endl;
   os <<"FACET TYPE       = " <<geometryType <<G4endl;
   os <<"ABSOLUTE VECTORS = " <<G4endl;
   os <<"P0               = " <<P0 <<G4endl;
+  os << G4endl;
+  os << "*********************************************************************"
+     << G4endl;
+  os << "FACET TYPE       = " << geometryType << G4endl;
+  os << "ABSOLUTE VECTORS = " << G4endl;
+  os << "P0               = " << P0 << G4endl;
   for (G4ThreeVectorList::const_iterator it=P.begin(); it!=P.end(); it++)
     os <<"P[" <<it-P.begin()+1 <<"]      = " <<*it <<G4endl;
   os <<"RELATIVE VECTORS = " <<G4endl;
+    { os << "P[" << it-P.begin()+1 << "]      = " << *it << G4endl; }
+  os << "RELATIVE VECTORS = " << G4endl;
   for (G4ThreeVectorList::const_iterator it=E.begin(); it!=E.end(); it++)
     os <<"E[" <<it-E.begin()+1 <<"]      = " <<*it <<G4endl;
   os <<"***********************************************************************"
      <<G4endl;
+    { os << "E[" << it-E.begin()+1 << "]      = " << *it << G4endl; }
+  os << "*********************************************************************"
+     << G4endl;
   return os;

trunk/source/geometry/volumes/History

-              r850
+              r921
 $Id: History,v 1.153 2008/08/19 15:32:14 gcosmo Exp $
+$Id: History,v 1.155 2008/11/13 09:35:03 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Nov 13th, 2008      G.Cosmo - geomvol-V09-01-03
+- Corrected singleton definition for G4ReflectionFactory.
+- Return 'const G4String&' instead of copy in GetVolumesNameExtension().
 Aug 19th, 2008      G.Cosmo - geomvol-V09-01-02

trunk/source/geometry/volumes/include/G4ReflectionFactory.hh

-              r850
+              r921
 //
 //
 // $Id: G4ReflectionFactory.hh,v 1.3 2006/06/29 18:57:39 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ReflectionFactory.hh,v 1.4 2008/11/13 09:33:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     void     SetVolumesNameExtension(const G4String& nameExtension);
     G4String GetVolumesNameExtension() const;
+    const G4String& GetVolumesNameExtension() const;
       // Returns the name extension for the reflected solids
       // and logical volumes.

trunk/source/geometry/volumes/src/G4ReflectionFactory.cc

-              r850
+              r921
 //
 //
 // $Id: G4ReflectionFactory.cc,v 1.6 2007/05/11 13:58:35 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ReflectionFactory.cc,v 1.9 2008/11/13 09:33:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   // ---
   if (!fInstance) new G4ReflectionFactory();
+  if (!fInstance) { fInstance = new G4ReflectionFactory(); }
   return fInstance;
+}
 …
 G4ReflectionFactory::~G4ReflectionFactory()
+{
+  delete fInstance;
+}
 …
 //_____________________________________________________________________________
 G4String G4ReflectionFactory::GetVolumesNameExtension() const
+const G4String& G4ReflectionFactory::GetVolumesNameExtension() const
+{
   return fNameExtension;

trunk/source/global/History

-              r850
+              r921
 $Id: History,v 1.206 2008/09/03 07:21:32 gcosmo Exp $
+$Id: History,v 1.213 2008/12/02 09:16:10 gcosmo Exp $
 -------------------------------------------------------------------
 …
      ----------------------------------------------------------
+Dec 02, 2008  G.Cosmo (global-V09-01-17)
+- Changed date for release 9.2.
+Nov 07, 2008  P.Gumplinger (global-V09-01-16)
+- Removed unnecessary 'const' qualifier from G4PlaneVectorRand() function
+  declaration.
+Nov 07, 2008  G.Cosmo (global-V09-01-15)
+- Added header G4RandomTools.hh, implementing global utility methods for
+  random Lambertian vector and random plane vector. Implementation derived
+  from G4OpBoundaryProcess.
+Oct 14, 2008  V.Ivantchenko (global-V09-01-14)
+- G4PhysicsVector: changed algorithm for computation of second derivatives, to
+  guarantee continuity with first derivative; fixed second derivative at edges
+  of the vector to be the same as in neighboring nodes.
+Sep 22, 2008  G.Cosmo (global-V09-01-13)
+- Corrected initialisation of vectors to conform to definition in
+  G4PhysicsVector, and added protections against empty vectors. (V.Ivantchenko)
+- Corrected definition of copy-constructor and operator=() in G4PhysicsVector
+  and added corresponding definitions in derived classes, where needed.
 Aug 15, 2008  G.Cosmo (global-V09-01-12)
 - Restored original implementation of G4SwapPtr() but using reference of
   pointers as arguments, allowing for unambiguous use from client code.
 Aug 14, 2008  P.Gumplinger (global-V09-01-10)
+Aug 14, 2008  P.Gumplinger (global-V09-01-10, global-V09-01-11)
 - Corrected G4SwapPtr() function in templates.hh (see also problem
   report #1020).

trunk/source/global/management/include/G4LPhysicsFreeVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4LPhysicsFreeVector.hh,v 1.10 2008/04/07 14:18:57 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4LPhysicsFreeVector.hh,v 1.11 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    ~G4LPhysicsFreeVector();
+   G4LPhysicsFreeVector(const G4LPhysicsFreeVector&);
+   G4LPhysicsFreeVector& operator=(const G4LPhysicsFreeVector&);
+     // Copy constructor and assignment operator.
    void PutValues(size_t binNumber, G4double binValue, G4double dataValue);
      // G4PhysicsVector has PutValue() but it is inconvenient.

trunk/source/global/management/include/G4LPhysicsFreeVector.icc

-              r850
+              r921
 //
 //
 // $Id: G4LPhysicsFreeVector.icc,v 1.11 2008/09/06 19:52:16 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4LPhysicsFreeVector.icc,v 1.13 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //
 // F.W. Jones, TRIUMF, 04-JUN-96
-// 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
 // --------------------------------------------------------------------------
 …
   // Want to simultaneously fill the bin and data vectors.
+{
   if(binNumber <= numberOfBin) {
     binVector[binNumber] = binValue;
     dataVector[binNumber]= dataValue;
     if(0 == binNumber) edgeMin = binValue;
     else if( numberOfBin - 1 == binNumber) edgeMax = binValue;
+  }
+   binVector[binNumber] = binValue;
+   dataVector[binNumber] = dataValue;
+   if(binNumber == 0)
+     { edgeMin = binValue; }
+   else if( numberOfBin - 1 == binNumber)
+     { edgeMax = binValue; }
+}

trunk/source/global/management/include/G4PhysicsFreeVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsFreeVector.hh,v 1.10 2006/06/29 19:02:18 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsFreeVector.hh,v 1.12 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //

trunk/source/global/management/include/G4PhysicsLinearVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLinearVector.hh,v 1.10 2006/06/29 19:02:21 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLinearVector.hh,v 1.11 2008/09/22 11:37:09 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
       // Destructor
+    G4PhysicsLinearVector(const G4PhysicsLinearVector&);
+    G4PhysicsLinearVector& operator=(const G4PhysicsLinearVector&);
+      // Copy constructor and assignment operator.
     G4bool Retrieve(std::ifstream& fIn, G4bool ascii);

trunk/source/global/management/include/G4PhysicsLnVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLnVector.hh,v 1.12 2006/06/29 19:02:23 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLnVector.hh,v 1.13 2008/09/22 11:37:09 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
       // Destructor.
+    G4PhysicsLnVector(const G4PhysicsLnVector&);
+    G4PhysicsLnVector& operator=(const G4PhysicsLnVector&);
+      // Copy constructor and assignment operator.
     G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
       // To retrieve persistent data from file stream.

trunk/source/global/management/include/G4PhysicsLogVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLogVector.hh,v 1.11 2006/06/29 19:02:25 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLogVector.hh,v 1.13 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
       // Destructor
+    G4PhysicsLogVector(const G4PhysicsLogVector&);
+    G4PhysicsLogVector& operator=(const G4PhysicsLogVector&);
+      // Copy constructor and assignment operator.
     G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
       // To retrieve persistent data from file stream.
   protected:

trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsOrderedFreeVector.hh,v 1.9 2006/06/29 19:02:28 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsOrderedFreeVector.hh,v 1.11 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 ////////////////////////////////////////////////////////////////////////

trunk/source/global/management/include/G4PhysicsVector.hh

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsVector.hh,v 1.17 2008/04/07 14:18:57 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsVector.hh,v 1.18 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
          // Find the bin# in which theEnergy belongs - pure virtual function
+    void DeleteData();
+    void CopyData(const G4PhysicsVector& vec);
+         // Internal methods for allowing copy of objects
+  protected:
     typedef std::vector<G4double> G4PVDataVector;

trunk/source/global/management/include/G4PhysicsVector.icc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsVector.icc,v 1.14 2008/09/05 18:04:45 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsVector.icc,v 1.17 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //    energy scale, for example like 'log', 'linear', 'free', etc.
 //
-// Modified:
-// 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
 //---------------------------------------------------------------
 …
   if( theEnergy == lastEnergy ) {
-  } else if( theEnergy <= edgeMin ) {
-     lastBin = 0;
-     lastEnergy = theEnergy;
-     lastValue  = dataVector[0];
   } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin]) {
      lastEnergy = theEnergy;
      Interpolation();
+  } else if( theEnergy <= edgeMin ) {
+     lastBin = 0;
+     lastEnergy = edgeMin;
+     lastValue  = dataVector[0];
   } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin-1]) {
 …
  void G4PhysicsVector::PutValue(size_t binNumber, G4double theValue)
+{
+  if(binNumber < numberOfBin) {
+    dataVector[binNumber] = theValue;
+    // Fill the bin which is hidden to user with theValue. This is to
+    // handle correctly when Energy=theEmax in getValue.
+    if(binNumber==numberOfBin-1) { dataVector[binNumber+1] = theValue; }
+  }
+  dataVector[binNumber] = theValue;
+  // Fill the bin which is hidden to user with theValue. This is to
+  // handle correctly when Energy=theEmax in getValue.
+  if(binNumber==numberOfBin-1) { dataVector[binNumber+1] = theValue; }
+}

trunk/source/global/management/include/G4Version.hh

-              r850
+              r921
 //
 //
 // $Id: G4Version.hh,v 1.16 2008/06/26 06:38:51 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Version.hh,v 1.17 2008/12/02 09:15:58 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // Version information
 …
 #ifndef G4VERSION_TAG
 #define G4VERSION_TAG "$Name: HEAD $"
+#define G4VERSION_TAG "$Name: geant4-09-02-cand-01 $"
 #endif
 …
 #include "G4String.hh"
 static const G4String G4Version = "$Name: HEAD $";
 static const G4String G4Date    = "(4-July-2008)";
+static const G4String G4Version = "$Name: geant4-09-02-cand-01 $";
+static const G4String G4Date    = "(19-December-2008)";
 #endif

trunk/source/global/management/src/G4LPhysicsFreeVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4LPhysicsFreeVector.cc,v 1.17 2008/09/06 19:52:16 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4LPhysicsFreeVector.cc,v 1.22 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 // F.W. Jones, TRIUMF, 04-JUN-96
 //
-// 27-MAR-97 FWJ: first version for Alpha release
-// 05-SEP-2008, V.Ivanchenko : added protections for zero-length vector
 // --------------------------------------------------------------------
 …
    : G4PhysicsVector(), verboseLevel(0)
+{
   type = T_G4LPhysicsFreeVector;
+   type = T_G4LPhysicsFreeVector;
+}
 …
   : G4PhysicsVector(), verboseLevel(0)
+{
   type = T_G4LPhysicsFreeVector;
+   type = T_G4LPhysicsFreeVector;
+  numberOfBin = nbin;
+  if(nbin > 0) {
+    binVector.resize(nbin+1);
+    dataVector.resize(nbin+1);
+    edgeMin = binmin;
+    edgeMax = binmax;
+    for (size_t i=0; i<=numberOfBin; i++) {
+      binVector[i] = binmin;
+      dataVector[i]= 0.0;
+    }
+  }
+   edgeMin = binmin;
+   edgeMax = binmax;
+   numberOfBin = nbin;
+   binVector.reserve(nbin+1);
+   dataVector.reserve(nbin+1);
+   for (size_t i=0; i<=numberOfBin; i++)
+   {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+   }
+}
 …
 G4LPhysicsFreeVector::~G4LPhysicsFreeVector()
+{
+}
+// --------------------------------------------------------------------
+G4LPhysicsFreeVector::G4LPhysicsFreeVector(const G4LPhysicsFreeVector& right)
+  : G4PhysicsVector(right)
+{
+  verboseLevel = right.verboseLevel;
+}
+// --------------------------------------------------------------------
+G4LPhysicsFreeVector&
+G4LPhysicsFreeVector::operator=(const G4LPhysicsFreeVector& right)
+{
+  // Check assignment to self
+  //
+  if(this == &right) { return *this; }
+  DeleteData();
+  CopyData(right);
+  verboseLevel = right.verboseLevel;
+  return *this;
+}

trunk/source/global/management/src/G4PhysicsFreeVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsFreeVector.cc,v 1.10 2006/06/29 19:04:10 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsFreeVector.cc,v 1.12 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
+G4PhysicsFreeVector::G4PhysicsFreeVector()
+G4PhysicsFreeVector::G4PhysicsFreeVector()
+  : G4PhysicsVector()
+{
-  edgeMin = 0.0;
-  edgeMax = 0.0;
-  numberOfBin = 0;
   type = T_G4PhysicsFreeVector;
+}
 G4PhysicsFreeVector::G4PhysicsFreeVector(size_t theNbin)
+  : G4PhysicsVector()
+{
   type = T_G4PhysicsFreeVector;
 …
      dataVector.push_back(0.0);
+  }
-  edgeMin = 0.;
-  edgeMax = 0.;
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
+}
 G4PhysicsFreeVector::G4PhysicsFreeVector(const G4DataVector& theBinVector,
 …
   edgeMin = binVector[0];
   edgeMax = binVector[numberOfBin-1];
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
+}
+G4PhysicsFreeVector::~G4PhysicsFreeVector(){}
+G4PhysicsFreeVector::~G4PhysicsFreeVector()
+{
+}
 void G4PhysicsFreeVector::PutValue( size_t theBinNumber, G4double theBinValue,

trunk/source/global/management/src/G4PhysicsLinearVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLinearVector.cc,v 1.12 2006/06/29 19:04:13 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLinearVector.cc,v 1.14 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //  G4PhysicsLinearVector.cc
 //
+//  History:
+//    02 Dec. 1995, G.Cosmo : Structure created based on object model
+//    15 Feb. 1996, K.Amako : Implemented the 1st version
+//    01 Jul. 1996, K.Amako : Cache mechanism and hidden bin from the
+//                            user introduced.
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
+//  15 Feb 1996 - K.Amako : 1st version
 //
 //--------------------------------------------------------------------
 …
 G4PhysicsLinearVector::G4PhysicsLinearVector()
   : dBin(0.), baseBin(0.)
+  : G4PhysicsVector(), dBin(0.), baseBin(0.)
+{
-  edgeMin = 0.0;
-  edgeMax = 0.0;
-  numberOfBin = 0;
   type = T_G4PhysicsLinearVector;
+}
 G4PhysicsLinearVector::G4PhysicsLinearVector(size_t theNbin)
   : dBin(0.), baseBin(0.)
+  : G4PhysicsVector(), dBin(0.), baseBin(0.)
+{
   type = T_G4PhysicsLinearVector;
 …
   numberOfBin = theNbin;
-  edgeMin = 0.;
-  edgeMax = 0.;
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
   for (size_t i=0; i<=numberOfBin; i++)
+  {
 …
 G4PhysicsLinearVector::G4PhysicsLinearVector(G4double theEmin,
                                              G4double theEmax, size_t theNbin)
+  : dBin((theEmax-theEmin)/theNbin),
+  : G4PhysicsVector(),
+    dBin((theEmax-theEmin)/theNbin),
     baseBin(theEmin/dBin)
+{
 …
   edgeMax = binVector[numberOfBin-1];
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
+}
 …
   return success;
+}
+G4PhysicsLinearVector::G4PhysicsLinearVector(const G4PhysicsLinearVector& right)
+  : G4PhysicsVector(right)
+{
+  dBin = right.dBin;
+  baseBin = right.baseBin;
+}
+G4PhysicsLinearVector&
+G4PhysicsLinearVector::operator=(const G4PhysicsLinearVector& right)
+{
+  // Check assignment to self
+  //
+  if(this == &right) { return *this; }
+  DeleteData();
+  CopyData(right);
+  dBin    = right.dBin;
+  baseBin = right.baseBin;
+  return *this;
+}

trunk/source/global/management/src/G4PhysicsLnVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLnVector.cc,v 1.15 2006/06/29 19:04:15 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLnVector.cc,v 1.17 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //  G4PhysicsLnVector.cc
 //
+//  History:
+//    27 Apr. 1999, M.G. Pia: Created, copying from G4PhysicsLogVector
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
+//  27 Apr 1999 - M.G.Pia: Created from G4PhysicsLogVector
 //
 // --------------------------------------------------------------
 …
 G4PhysicsLnVector::G4PhysicsLnVector()
   : dBin(0.), baseBin(0.)
+  : G4PhysicsVector(), dBin(0.), baseBin(0.)
+{
   type = T_G4PhysicsLnVector;
 …
 G4PhysicsLnVector::G4PhysicsLnVector(size_t theNbin)
   : dBin(0.), baseBin(0.)
+  : G4PhysicsVector(), dBin(0.), baseBin(0.)
+{
   type = T_G4PhysicsLnVector;
 …
   numberOfBin = theNbin;
-  edgeMin = 0.;
-  edgeMax = 0.;
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
   for (size_t i=0; i<=numberOfBin; i++)
+  {
 …
 G4PhysicsLnVector::G4PhysicsLnVector(G4double theEmin,
                                      G4double theEmax, size_t theNbin)
+  : dBin(std::log(theEmax/theEmin)/theNbin),
+  : G4PhysicsVector(),
+    dBin(std::log(theEmax/theEmin)/theNbin),
     baseBin(std::log(theEmin)/dBin)
+{
 …
   edgeMin = binVector[0];
   edgeMax = binVector[numberOfBin-1];
-  lastBin = INT_MAX;
-  lastEnergy = -DBL_MAX;
-  lastValue = DBL_MAX;
+}
 …
   return success;
+}
+G4PhysicsLnVector::G4PhysicsLnVector(const G4PhysicsLnVector& right)
+  : G4PhysicsVector(right)
+{
+  dBin = right.dBin;
+  baseBin = right.baseBin;
+}
+G4PhysicsLnVector&
+G4PhysicsLnVector::operator=(const G4PhysicsLnVector& right)
+{
+  // Check assignment to self
+  //
+  if(this == &right) { return *this; }
+  DeleteData();
+  CopyData(right);
+  dBin    = right.dBin;
+  baseBin = right.baseBin;
+  return *this;
+}

trunk/source/global/management/src/G4PhysicsLogVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsLogVector.cc,v 1.16 2008/09/06 19:52:16 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLogVector.cc,v 1.21 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 //    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
 //    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
 //    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
+//    9  Mar. 2001, H.Kurashige : added PhysicsVector type and Retrieve
 //    05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
 //
 …
   // Add extra one bin (hidden to user) to handle correctly when
   // Energy=theEmax in getValue.
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1);
   numberOfBin = theNbin;
+  if(numberOfBin > 0) {
+    dataVector.resize(theNbin+1);
+    binVector.resize(theNbin+1);
+    edgeMin = 1;
+    edgeMax = numberOfBin;
+    for (size_t i=0; i<=numberOfBin; i++) {
+      binVector[i] = i + 1;
+      dataVector[i]= 0.0;
+    }
+  for (size_t i=0; i<=numberOfBin; i++)
+  {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+  }
+}
 …
   // Add extra one bin (hidden to user) to handle correctly when
   // Energy=theEmax in getValue.
   dataVector.resize(theNbin+1);
   binVector.resize(theNbin+1);
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1);
   numberOfBin = theNbin;
+  if(numberOfBin > 0) {
+    for (size_t i=0; i<=numberOfBin; i++) {
+      binVector[i] = std::pow(10., std::log10(theEmin)+i*dBin);
+      dataVector[i]= 0.0;
+    }
+    edgeMin = binVector[0];
+    edgeMax = binVector[numberOfBin-1];
+  for (size_t i=0; i<numberOfBin+1; i++)
+  {
+    binVector.push_back(std::pow(10., std::log10(theEmin)+i*dBin));
+    dataVector.push_back(0.0);
+  }
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
+}
+G4PhysicsLogVector::~G4PhysicsLogVector(){}
+G4PhysicsLogVector::~G4PhysicsLogVector()
+{
+}
 G4bool G4PhysicsLogVector::Retrieve(std::ifstream& fIn, G4bool ascii)
 …
   return success;
+}
+G4PhysicsLogVector::G4PhysicsLogVector(const G4PhysicsLogVector& right)
+  : G4PhysicsVector(right)
+{
+  dBin = right.dBin;
+  baseBin = right.baseBin;
+}
+G4PhysicsLogVector&
+G4PhysicsLogVector::operator=(const G4PhysicsLogVector& right)
+{
+  // Check assignment to self
+  //
+  if(this == &right) { return *this; }
+  DeleteData();
+  CopyData(right);
+  dBin    = right.dBin;
+  baseBin = right.baseBin;
+  return *this;
+}

trunk/source/global/management/src/G4PhysicsOrderedFreeVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsOrderedFreeVector.cc,v 1.10 2006/06/29 19:04:20 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsOrderedFreeVector.cc,v 1.12 2008/09/22 14:49:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 …
                                                        G4double *Values,
                                                        size_t VectorLength)
+  : G4PhysicsVector()
+{
         type = T_G4PhysicsOrderedFreeVector;
+        lastBin = INT_MAX;
+        lastEnergy = -DBL_MAX;
+        lastValue = DBL_MAX;
+        dataVector.reserve(VectorLength+1);
+        binVector.reserve(VectorLength+1);
         numberOfBin = VectorLength;
 …
         edgeMin = binVector.front();
         edgeMax = binVector.back();
+        binVector.push_back ( binVector[numberOfBin-1] + 1.0 );
+        dataVector.push_back( dataVector[numberOfBin-1] );
+}
 G4PhysicsOrderedFreeVector::G4PhysicsOrderedFreeVector()
+  : G4PhysicsVector()
+{
         type = T_G4PhysicsOrderedFreeVector;
-        lastBin = INT_MAX;
-        lastEnergy = -DBL_MAX;
-        lastValue = DBL_MAX;
-        edgeMin = 0.0;
-        edgeMax = 0.0;
-        numberOfBin = 0;
+}

trunk/source/global/management/src/G4PhysicsVector.cc

-              r850
+              r921
 //
 //
 // $Id: G4PhysicsVector.cc,v 1.22 2008/09/05 18:04:45 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsVector.cc,v 1.27 2008/10/16 12:14:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 G4PhysicsVector::G4PhysicsVector(G4bool spline)
  : type(T_G4PhysicsVector),
    edgeMin(DBL_MAX), edgeMax(0.), numberOfBin(0),
+   edgeMin(0.), edgeMax(0.), numberOfBin(0),
    lastEnergy(0.), lastValue(0.), lastBin(0),
    secDerivative(0), useSpline(spline)
+{
+  binVector.push_back(edgeMin);
+  dataVector.push_back(0.0);
+}
+{}
 // --------------------------------------------------------------
 …
 G4PhysicsVector::~G4PhysicsVector()
+{
   delete [] secDerivative;
+  DeleteData();
+}
 …
 G4PhysicsVector::G4PhysicsVector(const G4PhysicsVector& right)
+{
   *this=right;
+  CopyData(right);
+}
 …
   if (type != right.type)  { return *this; }
+  type = right.type;
+  edgeMin = right.edgeMin;
+  edgeMax = right.edgeMax;
+  numberOfBin = right.numberOfBin;
+  lastEnergy = right.lastEnergy;
+  lastValue = right.lastValue;
+  lastBin = right.lastBin;
+  dataVector = right.dataVector;
+  binVector = right.binVector;
+  secDerivative = right.secDerivative;
+  useSpline = right.useSpline;
+  comment = right.comment;
+  DeleteData();
+  CopyData(right);
   return *this;
+}
 …
+{
   return (this != &right);
+}
+// --------------------------------------------------------------
+void G4PhysicsVector::DeleteData()
+{
+  delete [] secDerivative;
+  secDerivative = 0;
+}
+// --------------------------------------------------------------
+void G4PhysicsVector::CopyData(const G4PhysicsVector& vec)
+{
+  type = vec.type;
+  edgeMin = vec.edgeMin;
+  edgeMax = vec.edgeMax;
+  numberOfBin = vec.numberOfBin;
+  lastEnergy = vec.lastEnergy;
+  lastValue = vec.lastValue;
+  lastBin = vec.lastBin;
+  dataVector = vec.dataVector;
+  binVector = vec.binVector;
+  useSpline = vec.useSpline;
+  comment = vec.comment;
+  if (vec.secDerivative)
+  {
+    secDerivative = new G4double [numberOfBin];
+    for (size_t i=0; i<numberOfBin; i++)
+    {
+       secDerivative[i] = vec.secDerivative[i];
+    }
+  }
+  else
+  {
+    secDerivative = 0;
+  }
+}
 …
   secDerivative = new G4double [numberOfBin];
   secDerivative[0] = 0.0 ;
+  size_t n = numberOfBin-1;
   // cannot compute derivatives for less than 3 points
+  if(3 > numberOfBin) {
+    secDerivative[numberOfBin-1] = 0.0 ;
+  if(3 > numberOfBin)
+  {
+    secDerivative[0] = 0.0;
+    secDerivative[n] = 0.0;
     return;
+  }
+  G4double* u = new G4double [numberOfBin];
+  u[0] = 0.0 ;
+  // Decomposition loop for tridiagonal algorithm. secDerivative[i]
+  // and u[i] are used for temporary storage of the decomposed factors.
+  for(size_t i=1; i<numberOfBin-1; i++)
+  {
+    G4double sig = (binVector[i]-binVector[i-1])
+                 / (binVector[i+1]-binVector[i-1]) ;
+    G4double p = sig*secDerivative[i-1] + 2.0 ;
+    secDerivative[i] = (sig - 1.0)/p ;
+    u[i] = (dataVector[i+1]-dataVector[i])/(binVector[i+1]-binVector[i])
+         - (dataVector[i]-dataVector[i-1])/(binVector[i]-binVector[i-1]) ;
+    u[i] =(6.0*u[i]/(binVector[i+1]-binVector[i-1]) - sig*u[i-1])/p ;
+  }
+  G4double qn = 0.0 ;
+  G4double un = 0.0 ;
+  secDerivative[numberOfBin-1] = (un - qn*u[numberOfBin-2])
+                               / (qn*secDerivative[numberOfBin-2] + 1.0) ;
+  // The back-substitution loop for the triagonal algorithm of solving
+  // a linear system of equations.
+  for(G4int k=numberOfBin-2; k>=0; k--)
+  {
+    secDerivative[k] = secDerivative[k]*secDerivative[k+1] + u[k];
+  }
+  delete [] u;
+  for(size_t i=1; i<n; i++)
+  {
+    secDerivative[i] =
+.0*((dataVector[i+1]-dataVector[i])/(binVector[i+1]-binVector[i]) -
+           (dataVector[i]-dataVector[i-1])/(binVector[i]-binVector[i-1]))
+      /(binVector[i+1]-binVector[i-1]);
+  }
+  secDerivative[n] = secDerivative[n-1];
+  secDerivative[0] = secDerivative[1];
+}

trunk/source/graphics_reps/History

-              r850
+              r921
 cvs log $Id: History,v 1.132 2008/04/28 16:06:06 allison Exp $
+cvs log $Id: History,v 1.133 2008/11/13 09:07:31 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+th November 2008  Gabriele Cosmo  (greps-V09-01-06)
+- HepPolyhedronHype: fixed arrays upper-bound in constructor, responsible
+  for memory corruption in visualization of G4Hype shape.
 th April 2008  John Allison  (greps-V09-01-05)

trunk/source/graphics_reps/src/HepPolyhedron.cc

-              r850
+              r921
 //
 //
 // $Id: HepPolyhedron.cc,v 1.31 2008/04/28 16:06:06 allison Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: HepPolyhedron.cc,v 1.32 2008/11/13 09:05:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   if (sqrtan1<0.||sqrtan2<0.) k += 4;
+  if (k != 0) {
+  if (k != 0)
+  {
     std::cerr << "HepPolyhedronHype: error in input parameters";
     if ((k & 1) != 0) std::cerr << " (radiuses)";
 …
   double k2 = r2*r2;
   double *zz = new double[n + n], *rr = new double[n + n];
+  double *zz = new double[n+n+1], *rr = new double[n+n+1];
   zz[0] = halfZ;
   rr[0] = std::sqrt(sqrtan2*halfZ*halfZ+k2);
   for(int i = 1; i < n - 1; i++)
+  for(int i = 1; i < n-1; i++)
+  {
     zz[i] = zz[i-1] - dz;
+    rr[i] =std::sqrt(sqrtan2*zz[i]*zz[i]+k2) ;
+    rr[i] =std::sqrt(sqrtan2*zz[i]*zz[i]+k2);
+  }
 …
   rr[n-1] = rr[0];
   zz[n] = halfZ;
   rr[n] =  std::sqrt(sqrtan1*halfZ*halfZ+k1);
+   for(int i = n+1; i < n +n; i++)
+  for(int i = n+1; i < n+n; i++)
+  {
     zz[i] = zz[i-1] - dz;
+    rr[i] =std::sqrt(sqrtan1*zz[i]*zz[i]+k1) ;
+    rr[i] =std::sqrt(sqrtan1*zz[i]*zz[i]+k1);
+  }
   zz[n+n] = -halfZ;

trunk/source/interfaces/common/src/G4VBasicShell.cc

-              r850
+              r921
 // From intercoms/src/G4UIcommandTree::FindPath.
+{
+#ifdef G4DEBUG
+  printf("G4VBasicShell::FindMatchingPath %s\n",aCommandPath.c_str());
+#endif
   G4String empty = "";
   if(aTree==NULL) return empty;
 …
   remainingPath.remove(0,pathName.length());
   size_t i = remainingPath.first('/');
+#ifdef G4DEBUG
+  printf("G4VBasicShell::FindMatchingPath remainingPath:%s\n",remainingPath.c_str());
+#endif
   if( i == std::string::npos ) {
+#ifdef G4DEBUG
+  printf("G4VBasicShell::FindMatchingPath npos \n");
+#endif
     // Look for number of matching commands :
     std::vector<G4UIcommand*> commands;
 …
       ss.resize(remainingPath.length());
       if( remainingPath == ss ) commands.push_back(cmd);
+#ifdef G4DEBUG
+      printf("look for command check %s %s \n",ss.c_str(),remainingPath.c_str());
+#endif
+    }
     n_commandEntry = commands.size();
+#ifdef G4DEBUG
+      printf("%d found\n",n_commandEntry);
+#endif
     if(n_commandEntry==1) {
       return (pathName + commands[0]->GetCommandName());

trunk/source/materials/History

-              r850
+              r921
 $Id: History,v 1.127 2008/08/13 16:06:42 vnivanch Exp $
+$Id: History,v 1.131 2008/11/14 15:14:41 gcosmo Exp $
 -------------------------------------------------------------------
 …
      ----------------------------------------------------------
+-11-08 G.Cosmo (materials-V09-01-19)
+- Added SetName() method to G4Element, G4Isotope, G4Material for use
+  in detector persistency. Use "const G4String&" for accessors, instead
+  of implicit copy...
+-11-08 V.Ivanchenko (materials-V09-01-18)
+- G4IronStoppingICRU73, G4MaterialStoppingICRU73,
+  G4SimpleMaterialStoppingICRU73: fixed inline methods.
+-10-08 V.Ivanchenko (materials-V09-01-17)
+- G4IronStoppingICRU73, G4MaterialStoppingICRU73,
+  G4SimpleMaterialStoppingICRU73: renamed ICRU'73 data classes and inlined
+  accessors.
+-10-08 V.Ivanchenko (materials-V09-01-16)
+- G4IronStopping, G4MaterialStopping, G4SimpleMaterialStopping: added
+  ICRU'73 data on stopping powers 25 keV/n - 10 MeV/n
 -08-08 V.Ivanchenko (materials-V09-01-15)
 G4Material - use array size defined in material constructor, extend it if
              a component is a compound material
+- G4Material: use array size defined in material constructor, extend it if
+  a component is a compound material
 -08-08 V.Ivanchenko (materials-V09-01-14)
+- G4NistElementBuilder - use best known parameterisation for total
+                         binding energy of atoms, use standard masses
+                         for lightest stable isotopes
+-G4NistManager and G4NistElementBuilder - added method
+                                          GetTotalElectronBindingEnergy
+-G4Isotope - use AtomicMass instead of NuclearMass
+-G4Element - use G4int(fZeff) everywhere in the class
+- G4NistElementBuilder: use best known parameterisation for total
+  binding energy of atoms, use standard masses for lightest stable isotopes
+- G4NistManager and G4NistElementBuilder: added method
+  GetTotalElectronBindingEnergy().
+- G4Isotope: use AtomicMass instead of NuclearMass.
+- G4Element: use G4int(fZeff) everywhere in the class.
 -07-08 V.Ivanchenko (materials-V09-01-13)
 - G4NistManager - bug introduced in tag (-11) is fixed
+- G4NistManager: fixed bug introduced in tag (-11).
 -07-08 P.Gumplinger (materials-V09-01-12)
 - G4SurfaceProperty and G4OpticalSurface, make them truly Polymorphic
+- G4SurfaceProperty and G4OpticalSurface, make them truly polymorphic.
 -07-08 V.Ivanchenko (materials-V09-01-11)
 - G4NistManager - added inline methods to speed up EM computations
+- G4NistManager: added inline methods to speed up EM computations.
 -07-08 P.Gumplinger (materials-V09-01-10)

trunk/source/materials/include/G4Element.hh

-              r850
+              r921
 //
 //
 // $Id: G4Element.hh,v 1.22 2006/10/17 15:15:46 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Element.hh,v 1.23 2008/11/14 15:14:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 …
   // retrieval methods
   //
   G4String GetName()   const {return fName;};
   G4String GetSymbol() const {return fSymbol;};
   G4double GetZ()      const {return fZeff;};     //atomic number
   G4double GetN()      const {return fNeff;};     //number of nucleons
   G4double GetA()      const {return fAeff;};     //mass of a mole
+  const G4String& GetName()   const {return fName;}
+  const G4String& GetSymbol() const {return fSymbol;}
+  G4double GetZ()      const {return fZeff;}     //atomic number
+  G4double GetN()      const {return fNeff;}     //number of nucleons
+  G4double GetA()      const {return fAeff;}     //mass of a mole
   G4bool   GetNaturalAbandancesFlag();
 …
   //the number of atomic shells in this element:
   //
   G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;};
+  G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;}
   //the binding energy of the shell:
 …
   //number of isotopes constituing this element:
   //
   size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;};
+  size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;}
   //vector of pointers to isotopes constituing this element:
   //
   G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;};
+  G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;}
   //vector of relative abundance of each isotope:
   //
   G4double* GetRelativeAbundanceVector() const
                    {return fRelativeAbundanceVector;};
+                   {return fRelativeAbundanceVector;}
   const G4Isotope* GetIsotope(G4int iso) const
                    {return (*theIsotopeVector)[iso];};
+                   {return (*theIsotopeVector)[iso];}
   //the (static) Table of Elements:
 …
   //the index of this element in the Table:
   //
   size_t GetIndex() const {return fIndexInTable;};
+  size_t GetIndex() const {return fIndexInTable;}
   //return pointer to an element, given its name:
 …
   //count number of materials which use this element
   //
   G4int GetCountUse() const {return fCountUse;};
   void  increaseCountUse()  {fCountUse++;};
   void  decreaseCountUse()  {fCountUse--;};
+  G4int GetCountUse() const {return fCountUse;}
+  void  increaseCountUse()  {fCountUse++;}
+  void  decreaseCountUse()  {fCountUse--;}
   //count elements with same Z
   //
   G4int GetIndexZ() const {return fIndexZ;};
+  G4int GetIndexZ() const {return fIndexZ;}
   //Coulomb correction factor:
   //
   G4double GetfCoulomb() const {return fCoulomb;};
+  G4double GetfCoulomb() const {return fCoulomb;}
   //Tsai formula for the radiation length:
   //
   G4double GetfRadTsai() const {return fRadTsai;};
+  G4double GetfRadTsai() const {return fRadTsai;}
   //pointer to ionisation parameters:
   //
   G4IonisParamElm* GetIonisation() const {return fIonisation;};
+  G4IonisParamElm* GetIonisation() const {return fIonisation;}
   // printing methods
 …
     // persistency for clients requiring preallocation of memory for
     // persistifiable objects.
+  void SetName(const G4String& name)  {fName=name;}
 private:

trunk/source/materials/include/G4Isotope.hh

-              r850
+              r921
 //
 //
 // $Id: G4Isotope.hh,v 1.20 2008/08/11 11:53:11 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Isotope.hh,v 1.21 2008/11/14 15:14:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 …
     // Make an isotope
+    //
     G4Isotope(const G4String& name,             //its name
                     G4int     z,                //atomic number
 …
     // Retrieval methods
+    G4String GetName()  const {return fName;};
+    G4int    GetZ()     const {return fZ;};
+    G4int    GetN()     const {return fN;};
+    G4double GetA()     const {return fA;};
+    //
+    const G4String& GetName()  const {return fName;}
+    G4int    GetZ()     const {return fZ;}
+    G4int    GetN()     const {return fN;}
+    G4double GetA()     const {return fA;}
+    G4int GetCountUse() const {return fCountUse;};
+    void  increaseCountUse()  {fCountUse++;};
+    void  decreaseCountUse()  {fCountUse--;};
+    G4int GetCountUse() const {return fCountUse;}
     static
 …
     size_t GetNumberOfIsotopes();
     size_t GetIndex() const {return fIndexInTable;};
+    size_t GetIndex() const {return fIndexInTable;}
     friend
 …
       // persistifiable objects.
+    void SetName(const G4String& name) {fName=name;}
+    void increaseCountUse()  {fCountUse++;}
+    void decreaseCountUse()  {fCountUse--;}
  private:
     G4Isotope(G4Isotope&);
     G4Isotope& operator=(const G4Isotope&);
  private:

trunk/source/materials/include/G4Material.hh

-              r850
+              r921
 //
 //
 // $Id: G4Material.hh,v 1.26 2008/08/13 16:06:42 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Material.hh,v 1.27 2008/11/14 15:14:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 …
 class G4Material
+{
 public:  // with description
+ public:  // with description
   //
 …
   virtual ~G4Material();
   void SetChemicalFormula(const G4String& chF) {fChemicalFormula=chF;};
+  void SetChemicalFormula (const G4String& chF) {fChemicalFormula=chF;}
   //
   // retrieval methods
   //
+  G4String GetName()            const {return fName;};
+  G4String GetChemicalFormula() const {return fChemicalFormula;};
+  G4double GetDensity()         const {return fDensity;};
+  G4State  GetState()       const {return fState;};
+  G4double GetTemperature() const {return fTemp;};
+  G4double GetPressure()    const {return fPressure;};
+  const G4String& GetName()            const {return fName;}
+  const G4String& GetChemicalFormula() const {return fChemicalFormula;}
+  G4double GetDensity()     const {return fDensity;}
+  G4State  GetState()       const {return fState;}
+  G4double GetTemperature() const {return fTemp;}
+  G4double GetPressure()    const {return fPressure;}
   //number of elements constituing this material:
   size_t GetNumberOfElements()         const {return fNumberOfElements;};
+  size_t GetNumberOfElements()         const {return fNumberOfElements;}
   //vector of pointers to elements constituing this material:
   const
   G4ElementVector* GetElementVector()  const {return theElementVector;};
+  G4ElementVector* GetElementVector()  const {return theElementVector;}
   //vector of fractional mass of each element:
   const  G4double* GetFractionVector() const {return fMassFractionVector;};
+  const  G4double* GetFractionVector() const {return fMassFractionVector;}
   //vector of atom count of each element:
   const  G4int*    GetAtomsVector()    const {return fAtomsVector;};
+  const  G4int*    GetAtomsVector()    const {return fAtomsVector;}
   //return a pointer to an element, given its index in the material:
   const
   G4Element* GetElement(G4int iel) const {return (*theElementVector)[iel];};
+  G4Element* GetElement(G4int iel) const {return (*theElementVector)[iel];}
   //vector of nb of atoms per volume of each element in this material:
   const
   G4double* GetVecNbOfAtomsPerVolume() const {return VecNbOfAtomsPerVolume;};
+  G4double* GetVecNbOfAtomsPerVolume() const {return VecNbOfAtomsPerVolume;}
   //total number of atoms per volume:
   G4double  GetTotNbOfAtomsPerVolume() const {return TotNbOfAtomsPerVolume;};
+  G4double  GetTotNbOfAtomsPerVolume() const {return TotNbOfAtomsPerVolume;}
   //total number of electrons per volume:
   G4double  GetTotNbOfElectPerVolume() const {return TotNbOfElectPerVolume;};
+  G4double  GetTotNbOfElectPerVolume() const {return TotNbOfElectPerVolume;}
   //obsolete names (5-10-98) see the 2 functions above
   const
   G4double* GetAtomicNumDensityVector() const {return VecNbOfAtomsPerVolume;};
   G4double  GetElectronDensity()        const {return TotNbOfElectPerVolume;};
+  G4double* GetAtomicNumDensityVector() const {return VecNbOfAtomsPerVolume;}
+  G4double  GetElectronDensity()        const {return TotNbOfElectPerVolume;}
   // Radiation length:
   G4double         GetRadlen()          const {return fRadlen;};
+  G4double         GetRadlen()          const {return fRadlen;}
   // Nuclear interaction length:
   G4double GetNuclearInterLength()      const {return fNuclInterLen;};
+  G4double GetNuclearInterLength()      const {return fNuclInterLen;}
   // ionisation parameters:
   G4IonisParamMat* GetIonisation()      const {return fIonisation;};
+  G4IonisParamMat* GetIonisation()      const {return fIonisation;}
   // Sandia table:
   G4SandiaTable*   GetSandiaTable()     const {return fSandiaTable;};
+  G4SandiaTable*   GetSandiaTable()     const {return fSandiaTable;}
   //meaningful only for single material:
 …
   //the MaterialPropertiesTable (if any) attached to this material:
   void SetMaterialPropertiesTable(G4MaterialPropertiesTable* anMPT)
                                      {fMaterialPropertiesTable = anMPT;};
+                                     {fMaterialPropertiesTable = anMPT;}
   G4MaterialPropertiesTable* GetMaterialPropertiesTable() const
                                      {return fMaterialPropertiesTable;};
+                                     {return fMaterialPropertiesTable;}
   //the (static) Table of Materials:
 …
   //the index of this material in the Table:
   size_t GetIndex() const {return fIndexInTable;};
+  size_t GetIndex() const {return fIndexInTable;}
   //return  pointer to a material, given its name:
 …
   friend std::ostream& operator<<(std::ostream&, G4MaterialTable);
 public:  // without description
+ public:  // without description
   G4int operator==(const G4Material&) const;
 …
     // persistifiable objects.
+private:
+  void SetName (const G4String& name) {fName=name;}
+ private:
   G4Material(const G4Material&);

trunk/source/particles/GNUmakefile

-              r824
+              r921
 # $Id: GNUmakefile,v 1.4 2004/06/01 15:37:42 gcosmo Exp $
+# $Id: GNUmakefile,v 1.5 2008/11/06 13:17:36 kurasige Exp $
 # --------------------------------------------------------------
 # GNUmakefile for particles library.  Gabriele Cosmo, 4/4/97.
 …
 SUBDIRS = management bosons leptons shortlived
 SUBDIRS += hadrons/mesons hadrons/barions hadrons/ions
 SUBDIRS += utils
+SUBDIRS += adjoint utils
 SUBLIBS = G4partman G4bosons G4leptons G4shortlived
 SUBLIBS += G4mesons G4baryons G4ions
 SUBLIBS += G4partutils
+SUBLIBS += G4partadj G4partutils
 include $(G4INSTALL)/config/globlib.gmk

trunk/source/particles/History

-              r850
+              r921
 $Id: History,v 1.153 2008/08/09 14:16:14 kurasige Exp $
+$Id: History,v 1.162 2008/11/13 08:23:12 kurasige Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+- Nov. 13 2008      H.Kurashige (particles-V09-01-13)
+- Fix magnetic moment for leptons
+- Nov. 10 2008      H.Kurashige (particles-V09-01-12)
+- Fix particle name of G4AdjointPositron
+- Nov. 06 2008      H.Kurashige (particles-V09-01-11)
+- Adding new sub-directory of adjoint and adjoint-particles (Laurent)
+- Oct. 28 2008      H.Kurashige (particles-V09-01-10)
+- Add methods of taking A nd Z arguments as G4double G4NucleiProperties
+- Oct. 23 2008      H.Kurashige (particles-V09-01-09)
+- Add G4NucleiProperties::IsInStableTable
+  (as a replace of G4NucleiPropertiesTable::IsInTable)
+- Change G4NucleiProperties::GetBindingEnergy as 'public'
+- Change G4NucleiProperties::GetMassExcess as 'public'
+- Oct. 22 2008      H.Kurashige (particles-V09-01-08)
+- Fix using raw number of elecrtron mass in calculation of magnetic moment for e+/-
+- Oct. 22  2008    H.Kurashige (particles-V09-01-07)
+- Hide all methods of getting mass of nucleus except for G4NucleiProperties::GetNuclearMass()
+- Cash pointers/masses of light nuclei in G4NucleiProperties
+- Add a table of sum of masses of orbital electrons and their binding energy  in G4NucleiProperties
+- Sep.  18  2008    H.Kurashige (particles-V09-01-06)
+- update mass/width according PDG2008
+- Sep.  17  2008    H.Kurashige (particles-V09-01-05)
+- Avoid direct comparison with string in G4IonTable::IsIon()
 - August 08  2008    H.Kurashige (particles-V09-01-04)
 - Modify G4HtmlPPReporter

trunk/source/particles/hadrons/barions/src/G4AntiLambda.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiLambda.cc,v 1.18 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiLambda.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.115683*GeV,  2.501e-12*MeV,         0.0,
+                 name,    1.115683*GeV,  2.518e-12*MeV,         0.0,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiLambdacPlus.cc,v 1.13 2006/06/29 19:16:22 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiLambdacPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      2.2849*GeV,   3.30e-9*MeV,   -1.*eplus,
+                 name,      2.2849*GeV,   3.32e-9*MeV,   -1.*eplus,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4AntiNeutron.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiNeutron.cc,v 1.22 2008/03/06 15:41:56 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiNeutron.cc,v 1.23 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   anInstance = new G4ParticleDefinition(
                  name, neutron_mass_c2, 7.432e-28*GeV,         0.0,
+                 name, neutron_mass_c2, 7.480e-28*GeV,         0.0,
 ,              +1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiOmegaMinus.cc,v 1.14 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiOmegaMinus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,     1.67245*GeV,  8.02e-12*MeV,       eplus,
+                 name,     1.67245*GeV,  8.07e-12*MeV,       eplus,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiSigmaMinus.cc,v 1.14 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiSigmaMinus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.197449*GeV,  4.45e-12*MeV,       eplus,
+                 name,    1.197449*GeV,  4.48e-12*MeV,       eplus,
 ,              +1,             0,
 ,              +2,             0,

trunk/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiSigmaPlus.cc,v 1.14 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiSigmaPlus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.18937*GeV, 8.209e-12*MeV,   -1.*eplus,
+                 name,    1.18937*GeV, 8.264e-12*MeV,   -1.*eplus,
 ,              +1,             0,
 ,              -2,             0,
              "baryon",               0,            -1,       -3222,
                 false,       0.0802*ns,          NULL,
+                false,      0.08018*ns,          NULL,
                 false,       "sigma");

trunk/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiSigmaZero.cc,v 1.18 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiSigmaZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.192642*GeV,   8.9e-3*MeV,          0.0,
+                 name,    1.192642*GeV,    9.0e-3*MeV,          0.0,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4AntiXiMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiXiMinus.cc,v 1.13 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiXiMinus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.32131*GeV,  4.02e-12*MeV,       eplus,
+                 name,    1.32171*GeV,  4.04e-12*MeV,       eplus,
 ,              +1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/barions/src/G4AntiXiZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiXiZero.cc,v 1.19 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiXiZero.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,     1.31483*GeV,  2.27e-12*MeV,         0.0,
+                 name,     1.31483*GeV,  2.28e-12*MeV,         0.0,
 ,              +1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/barions/src/G4AntiXicPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiXicPlus.cc,v 1.13 2006/06/29 19:16:52 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiXicPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      2.4680*GeV,   1.49e-9*MeV,   -1.*eplus,
+                 name,      2.4680*GeV,   1.50e-9*MeV,   -1.*eplus,
 ,              +1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/barions/src/G4AntiXicZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiXicZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiXicZero.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      2.4710*GeV,    6.0e-9*MeV,         0.0,
+                 name,      2.4710*GeV,    5.9e-9*MeV,         0.0,
 ,              +1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/barions/src/G4Lambda.cc

-              r850
+              r921
 //
 //
 // $Id: G4Lambda.cc,v 1.18 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Lambda.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.115683*GeV,  2.501e-12*MeV,         0.0,
+                 name,    1.115683*GeV,  2.518e-12*MeV,         0.0,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4LambdacPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4LambdacPlus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4LambdacPlus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,     2.28646*GeV,   3.30e-9*MeV,   +1.*eplus,
+                 name,     2.28646*GeV,   3.32e-9*MeV,   +1.*eplus,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4Neutron.cc

-              r850
+              r921
 //
 //
 // $Id: G4Neutron.cc,v 1.22 2008/03/06 15:41:57 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Neutron.cc,v 1.23 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4Ions(
                  name, neutron_mass_c2, 7.432e-28*GeV,         0.0,
+                 name, neutron_mass_c2, 7.480e-28*GeV,         0.0,
 ,              +1,             0,
 ,              -1,             0,
              "baryon",               0,            +1,        2112,
                 false,    886.7*second,          NULL,
+                false,    885.7*second,          NULL,
                 false,       "nucleon",             0,
 .0

trunk/source/particles/hadrons/barions/src/G4OmegaMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4OmegaMinus.cc,v 1.14 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4OmegaMinus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.67245*GeV,  8.02e-12*MeV,    -1*eplus,
+                 name,    1.67245*GeV,  8.07e-12*MeV,    -1*eplus,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4SigmaMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4SigmaMinus.cc,v 1.13 2007/03/11 07:17:34 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4SigmaMinus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.197449*GeV,  4.45e-12*MeV,    -1*eplus,
+                 name,    1.197449*GeV,  4.48e-12*MeV,    -1*eplus,
 ,              +1,             0,
 ,              -2,             0,

trunk/source/particles/hadrons/barions/src/G4SigmaPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4SigmaPlus.cc,v 1.14 2007/03/11 07:17:35 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4SigmaPlus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.18937*GeV, 8.209e-12*MeV,       eplus,
+                 name,    1.18937*GeV, 8.264e-12*MeV,       eplus,
 ,              +1,             0,
 ,              +2,             0,
              "baryon",               0,            +1,        3222,
                 false,       0.0802*ns,          NULL,
+                false,      0.08018*ns,          NULL,
                 false,       "sigma");

trunk/source/particles/hadrons/barions/src/G4SigmaZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4SigmaZero.cc,v 1.18 2007/03/11 07:17:35 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4SigmaZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.192642*GeV,    8.9e-3*MeV,         0.0,
+                 name,    1.192642*GeV,    9.0e-3*MeV,         0.0,
 ,              +1,             0,
 ,               0,             0,

trunk/source/particles/hadrons/barions/src/G4XiMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4XiMinus.cc,v 1.13 2007/03/11 07:17:35 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4XiMinus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,    1.32131*GeV,  4.02e-12*MeV,    -1*eplus,
+                 name,    1.32171*GeV,  4.04e-12*MeV,    -1*eplus,
 ,              +1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/barions/src/G4XiZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4XiZero.cc,v 1.18 2007/03/11 07:17:35 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4XiZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     anInstance = new G4ParticleDefinition(
                  name,     1.31483*GeV,  2.27e-12*MeV,         0.0,
+                 name,     1.31483*GeV,  2.28e-12*MeV,         0.0,
 ,              +1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/barions/src/G4XicPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4XicPlus.cc,v 1.13 2006/06/29 19:17:31 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4XicPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      2.4680*GeV,   1.49e-9*MeV,   +1.*eplus,
+                 name,      2.4680*GeV,   1.50e-9*MeV,   +1.*eplus,
 ,              +1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiBMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiBMesonZero.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      5.2794*GeV, 4.302e-10*MeV,          0.,
+                 name,      5.2794*GeV, 4.331e-10*MeV,          0.,
 ,              -1,             0,
 ,              +1,             0,
               "meson",               0,             0,        -511,
                 false,     1.532e-3*ns,          NULL,
+                false,     1.530e-3*ns,          NULL,
                 false,       "B");
+  }

trunk/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiBsMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiBsMesonZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,     5.3675*GeV,   4.49e-10*MeV,          0.,
+                 name,     5.3663*GeV,   4.65e-10*MeV,          0.,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,        -531,
                 false,     1.466e-3*ns,          NULL,
+                false,     1.470e-3*ns,          NULL,
                 false,       "Bs");
+  }

trunk/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiDMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiDMesonZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    1.8645*GeV,  1.605e-9*MeV,          0.,
+                 name,     1.86484*GeV,  1.616e-9*MeV,          0.,
 ,              -1,             0,
 ,              +1,             0,
               "meson",               0,             0,        -421,
                 false,     0.415e-3*ns,          NULL,
+                false,    0.4101e-3*ns,          NULL,
                 false,       "D");
+  }

trunk/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4AntiKaonZero.cc,v 1.15 2006/06/29 19:19:11 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4AntiKaonZero.cc,v 1.16 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.497672*GeV,       0.0*MeV,         0.0,
+                 name,    0.497614*GeV,       0.0*MeV,         0.0,
 ,              -1,             0,
 ,               1,             0,

trunk/source/particles/hadrons/mesons/src/G4BMesonMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4BMesonMinus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4BMesonMinus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      5.2790*GeV, 4.018e-10*MeV,    -1.*eplus,
+                 name,      5.2790*GeV, 4.045e-10*MeV,    -1.*eplus,
 ,              -1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/mesons/src/G4BMesonPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4BMesonPlus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4BMesonPlus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      5.2790*GeV, 4.018e-10*MeV,   +1.*eplus,
+                 name,      5.2790*GeV, 4.045e-10*MeV,   +1.*eplus,
 ,              -1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/mesons/src/G4BMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4BMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4BMesonZero.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      5.2794*GeV, 4.302e-10*MeV,          0.,
+                 name,      5.2794*GeV, 4.331e-10*MeV,          0.,
 ,              -1,             0,
 ,              -1,             0,
               "meson",               0,             0,         511,
                 false,     1.532e-3*ns,          NULL,
+                false,     1.530e-3*ns,          NULL,
                 false,       "B");
+  }

trunk/source/particles/hadrons/mesons/src/G4BsMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4BsMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4BsMesonZero.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,      5.3675*GeV,  4.49e-10*MeV,          0.,
+                 name,      5.3663*GeV,  4.65e-10*MeV,          0.,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,         531,
                 false,     1.466e-3*ns,          NULL,
+                false,     1.470e-3*ns,          NULL,
                 false,       "Bs");
+  }

trunk/source/particles/hadrons/mesons/src/G4DMesonMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4DMesonMinus.cc,v 1.13 2006/06/29 19:19:26 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4DMesonMinus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    1.8693*GeV,   6.33e-10*MeV,    -1.*eplus,
+                 name,     1.86962*GeV,  6.37e-10*MeV,    -1.*eplus,
 ,              -1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/mesons/src/G4DMesonPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4DMesonPlus.cc,v 1.13 2006/06/29 19:19:28 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4DMesonPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    1.8693*GeV,   6.33e-10*MeV,    +1.*eplus,
+                 name,     1.86962*GeV,  6.37e-10*MeV,    +1.*eplus,
 ,              -1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/mesons/src/G4DMesonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4DMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4DMesonZero.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
    anInstance = new G4ParticleDefinition(
                  name,      1.8645*GeV,  1.605e-9*MeV,          0.,
+                 name,     1.86484*GeV,  1.616e-9*MeV,          0.,
 ,              -1,             0,
 ,              -1,             0,
               "meson",               0,             0,         421,
                 false,     0.415e-3*ns,          NULL,
+                false,    0.4101e-3*ns,          NULL,
              false,           "D"
               );

trunk/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4DsMesonMinus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4DsMesonMinus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
    anInstance = new G4ParticleDefinition(
                  name,      1.9682*GeV,  1.317e-9*MeV,    -1.*eplus,
+                 name,     1.96849*GeV,  1.325e-9*MeV,    -1.*eplus,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,         -431,
                 false,     0.490e-3*ns,          NULL,
+                false,     0.500e-3*ns,          NULL,
              false,           "Ds"
               );

trunk/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4DsMesonPlus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4DsMesonPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
    anInstance = new G4ParticleDefinition(
                  name,   1.9682*GeV,  1.317e-9*MeV,    +1.*eplus,
+                 name,     1.96849*GeV,  1.325e-9*MeV,    +1.*eplus,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,         431,
                 false,     0.490e-3*ns,          NULL,
+                false,     0.500e-3*ns,          NULL,
              false,           "Ds"
               );

trunk/source/particles/hadrons/mesons/src/G4Eta.cc

-              r850
+              r921
 //
 //
 // $Id: G4Eta.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Eta.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,     0.54751*GeV,      1.30*keV,         0.0,
+                 name,    0.547853*GeV,      1.30*keV,         0.0,
 ,              -1,            +1,
 ,               0,            +1,

trunk/source/particles/hadrons/mesons/src/G4EtaPrime.cc

-              r850
+              r921
 //
 //
 // $Id: G4EtaPrime.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EtaPrime.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.95778*GeV,     0.203*MeV,         0.0,
+                 name,    0.95766*GeV,     0.205*MeV,         0.0,
 ,              -1,            +1,
 ,               0,            +1,

trunk/source/particles/hadrons/mesons/src/G4JPsi.cc

-              r850
+              r921
 //
 //
 // $Id: G4JPsi.cc,v 1.17 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4JPsi.cc,v 1.18 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    3.096916*GeV,    0.0934*MeV,          0.,
+                 name,    3.096916*GeV,    0.0932*MeV,          0.,
 ,              -1,            -1,
 ,               0,            -1,

trunk/source/particles/hadrons/mesons/src/G4KaonMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4KaonMinus.cc,v 1.14 2006/06/29 19:19:45 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4KaonMinus.cc,v 1.15 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.493677*GeV,   5.315e-14*MeV,    -1.*eplus,
+                 name,    0.493677*GeV,   5.352e-14*MeV,    -1.*eplus,
 ,              -1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/mesons/src/G4KaonPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4KaonPlus.cc,v 1.13 2006/06/29 19:19:47 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4KaonPlus.cc,v 1.14 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.493677*GeV,  5.315e-14*MeV,    +1.*eplus,
+                 name,    0.493677*GeV,  5.352e-14*MeV,    +1.*eplus,
 ,              -1,             0,
 ,              +1,             0,

trunk/source/particles/hadrons/mesons/src/G4KaonZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4KaonZero.cc,v 1.15 2006/06/29 19:19:49 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4KaonZero.cc,v 1.16 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.497672*GeV,       0.0*MeV,         0.0,
+                 name,    0.497614*GeV,       0.0*MeV,         0.0,
 ,              -1,             0,
 ,              -1,             0,

trunk/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc

-              r850
+              r921
 //
 //
 // $Id: G4KaonZeroLong.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4KaonZeroLong.cc,v 1.19 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.497672*GeV,  1.287e-14*MeV,         0.0,
+                 name,    0.497614*GeV,  1.295e-14*MeV,         0.0,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,         130,
                 false,         51.6*ns,          NULL,
+                false,        51.16*ns,          NULL,
                 false,          "kaon",           130);

trunk/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc

-              r850
+              r921
 //
 //
 // $Id: G4KaonZeroShort.cc,v 1.17 2006/06/29 19:19:54 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4KaonZeroShort.cc,v 1.18 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.497672*GeV,  7.352e-12*MeV,         0.0,
+                 name,    0.497614*GeV,  7.397e-12*MeV,         0.0,
 ,              -1,             0,
 ,               0,             0,
               "meson",               0,             0,         310,
                 false,      0.08953*ns,          NULL,
+                false,      0.08958*ns,          NULL,
                 false,          "kaon",           310);

trunk/source/particles/hadrons/mesons/src/G4PionMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4PionMinus.cc,v 1.11 2006/06/29 19:19:58 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PionMinus.cc,v 1.12 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.1395700*GeV, 2.5284e-14*MeV,    -1.*eplus,
+                 name,    0.1395700*GeV, 2.5452e-14*MeV,    -1.*eplus,
 ,              -1,             0,
 ,              -2,            -1,

trunk/source/particles/hadrons/mesons/src/G4PionPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4PionPlus.cc,v 1.12 2006/06/29 19:20:01 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PionPlus.cc,v 1.13 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.1395700*GeV,  2.5284e-14*MeV,    +1.*eplus,
+                 name,    0.1395700*GeV, 2.5452e-14*MeV,    +1.*eplus,
 ,              -1,             0,
 ,              +2,            -1,

trunk/source/particles/hadrons/mesons/src/G4PionZero.cc

-              r850
+              r921
 //
 //
 // $Id: G4PionZero.cc,v 1.16 2006/06/29 19:20:04 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4PionZero.cc,v 1.17 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    anInstance = new G4ParticleDefinition(
                  name,    0.1349764*GeV,   7.8e-06*MeV,         0.0,
+                 name,    0.1349764*GeV,   7.9e-06*MeV,         0.0,
 ,              -1,            +1,
 ,               0,            -1,

trunk/source/particles/leptons/src/G4Electron.cc

-              r850
+              r921
 //
 //
 // $Id: G4Electron.cc,v 1.15 2008/03/06 15:41:57 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Electron.cc,v 1.17 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
               );
     // Bohr Magnetron
    G4double muB =  -0.5*eplus*hbar_Planck/(0.51099906*MeV/c_squared) ;
+   G4double muB =  -0.5*eplus*hbar_Planck/(electron_mass_c2/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.0011596521859 );
+   anInstance->SetPDGMagneticMoment( muB * 2.* 1.0011596521859 );
+  }

trunk/source/particles/leptons/src/G4MuonMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4MuonMinus.cc,v 1.13 2007/03/15 06:53:57 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4MuonMinus.cc,v 1.15 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
   anInstance = new G4ParticleDefinition(
                  name,   0.1056584*GeV, 2.99591e-16*MeV,  -1.*eplus,
+                 name,   0.1056584*GeV, 3.01594e-16*MeV,  -1.*eplus,
 ,               0,             0,
 ,               0,             0,
 …
    G4double muB =  -0.5*eplus*hbar_Planck/(0.1056584*GeV/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.0011659208);
+   anInstance->SetPDGMagneticMoment( muB * 2. * 1.0011659208);
   //create Decay Table

trunk/source/particles/leptons/src/G4MuonPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4MuonPlus.cc,v 1.13 2007/03/15 06:53:58 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4MuonPlus.cc,v 1.15 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
   anInstance = new G4ParticleDefinition(
                  name,   0.1056584*GeV, 2.99591e-16*MeV,   +1.*eplus,
+                 name,   0.1056584*GeV, 3.01594e-16*MeV,   +1.*eplus,
 ,               0,             0,
 ,               0,             0,
 …
    G4double muB =  0.5*eplus*hbar_Planck/(0.1056584*GeV/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.0011659208);
+   anInstance->SetPDGMagneticMoment( muB * 2.* 1.0011659208);
   //create Decay Table

trunk/source/particles/leptons/src/G4Positron.cc

-              r850
+              r921
 //
 //
 // $Id: G4Positron.cc,v 1.14 2008/03/06 15:41:57 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Positron.cc,v 1.16 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
     // Bohr Magnetron
    G4double muB =  0.5*eplus*hbar_Planck/(0.51099906*MeV/c_squared) ;
+   G4double muB =  0.5*eplus*hbar_Planck/(electron_mass_c2/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.0011596521859 );
+   anInstance->SetPDGMagneticMoment( muB * 2.* 1.0011596521859 );
+  }

trunk/source/particles/leptons/src/G4TauMinus.cc

-              r850
+              r921
 //
 //
 // $Id: G4TauMinus.cc,v 1.16 2007/03/15 06:53:58 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4TauMinus.cc,v 1.18 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
    anInstance = new G4ParticleDefinition(
                  name,     1.77699*GeV,  2.265e-9*MeV,    -1.*eplus,
+                 name,     1.77699*GeV,  2.280e-9*MeV,    -1.*eplus,
 ,               0,             0,
 ,               0,             0,
 …
    G4double muB =  -0.5*eplus*hbar_Planck/(1.77699*GeV/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.00116);
+   anInstance->SetPDGMagneticMoment( muB * 2. * 1.00116);
   //create Decay Table

trunk/source/particles/leptons/src/G4TauPlus.cc

-              r850
+              r921
 //
 //
 // $Id: G4TauPlus.cc,v 1.16 2007/03/15 06:53:58 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4TauPlus.cc,v 1.18 2008/11/13 08:23:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   //             shortlived      subType    anti_encoding
    anInstance = new G4ParticleDefinition(
                  name,     1.77699*GeV,  2.265e-9*MeV,     1.*eplus,
+                 name,     1.77699*GeV,  2.280e-9*MeV,     1.*eplus,
 ,               0,             0,
 ,               0,             0,
 …
    G4double muB =  0.5*eplus*hbar_Planck/(1.77699*GeV/c_squared) ;
    anInstance->SetPDGMagneticMoment( muB * 1.00116);
+   anInstance->SetPDGMagneticMoment( muB * 2.* 1.00116);
   //create Decay Table

trunk/source/particles/management/include/G4ParticleDefinition.hh

-              r890
+              r921
 //
 //
 // $Id: G4ParticleDefinition.hh,v 1.33 2008/11/14 16:26:30 kurasige Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4ParticleDefinition.hh,v 1.32 2008/03/22 06:03:40 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
       G4double GetPDGMagneticMoment() const { return thePDGMagneticMoment; }
+      void     SetPDGMagneticMoment(G4double mageticMoment);
+      G4double CalculateAnomaly()  const;
+      // gives the anomaly of magnetic moment for spin 1/2 particles
+  void SetPDGMagneticMoment(G4double mageticMoment);
       const G4String& GetParticleType() const { return theParticleType; }

trunk/source/particles/management/include/G4ParticleDefinition.icc

-              r890
+              r921
 //
 //
 // $Id: G4ParticleDefinition.icc,v 1.13 2008/11/14 16:26:30 kurasige Exp $
 // GEANT4 tag $Name:  $
+// $Id: G4ParticleDefinition.icc,v 1.12 2007/03/11 07:17:35 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 …
+}
+inline
+  G4double G4ParticleDefinition::CalculateAnomaly()  const
+{
+   // gives the anomaly of magnetic moment for spin 1/2 particles
+   if (thePDGiSpin==1) {
+     G4double muB = 0.5*eplus*hbar_Planck/(thePDGMass/c_squared);
+     return 0.5*fabs(thePDGMagneticMoment/muB - 2.*thePDGCharge/eplus);
+   } else {
+     return 0.0;
+   }
+}

trunk/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExcitedDeltaConstructor.cc,v 1.11 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExcitedDeltaConstructor.cc,v 1.12 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 const G4double G4ExcitedDeltaConstructor::width[] = {
 .0*MeV, 145.0*MeV, 300.0*MeV, 200.0*MeV, 330.0*MeV,
 .0*MeV, 200.0*MeV, 360.0*MeV, 280.0*MeV
+.0*MeV, 200.0*MeV, 360.0*MeV, 290.0*MeV
 };

trunk/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExcitedLambdaConstructor.cc,v 1.11 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExcitedLambdaConstructor.cc,v 1.12 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 const G4double G4ExcitedLambdaConstructor::mass[] = {
 .4065*GeV,1.5195*GeV, 1.600*GeV, 1.670*GeV,  1.690*GeV,
+.406*GeV,1.5195*GeV, 1.600*GeV, 1.670*GeV,  1.690*GeV,
 .800*GeV, 1.810*GeV, 1.820*GeV, 1.830*GeV,  1.890*GeV,
 .100*GeV, 2.110*GeV

trunk/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExcitedMesonConstructor.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExcitedMesonConstructor.cc,v 1.20 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
+{
   {  1.2295*GeV, 1.170*GeV, 1.386*GeV, 1.272*GeV,  1.273*GeV },
   {   1.474*GeV, 1.350*GeV,       0.0, 1.414*GeV,  1.414*GeV },
   {   1.230*GeV,1.2818*GeV,1.4263*GeV, 1.402*GeV,  1.402*GeV },
   {  1.3183*GeV,1.2754*GeV, 1.525*GeV,1.4256*GeV, 1.4256*GeV },
+  {   1.474*GeV, 1.350*GeV,       0.0, 1.420*GeV,  1.420*GeV },
+  {   1.230*GeV,1.2818*GeV,1.4263*GeV, 1.403*GeV,  1.403*GeV },
+  {  1.3183*GeV,1.2751*GeV, 1.525*GeV,1.4256*GeV, 1.4256*GeV },
   {  1.6724*GeV, 1.617*GeV, 1.842*GeV, 1.773*GeV,  1.773*GeV },
   {   1.720*GeV, 1.670*GeV,       0.0, 1.717*GeV,  1.717*GeV },
   {  1.6888*GeV, 1.667*GeV, 1.854*GeV, 1.776*GeV,  1.776*GeV },
   {   1.300*GeV, 1.294*GeV, 1.476*GeV, 1.460*GeV,  1.460*GeV },
   {   1.459*GeV, 1.425*GeV, 1.680*GeV, 1.414*GeV,  1.414*GeV },
+  {   1.465*GeV, 1.425*GeV, 1.680*GeV, 1.414*GeV,  1.414*GeV },
   {         0.0, 1.815*GeV, 2.010*GeV, 1.973*GeV,  1.973*GeV }
 };
 …
+{
   {  142.0*MeV, 360.0*MeV,  91.0*MeV,  90.0*MeV,  90.0*MeV },
   {  265.0*MeV, 350.0*MeV,       0.0, 290.0*MeV, 290.0*MeV },
   {  420.0*MeV,  24.2*MeV,  54.9*MeV, 174.0*MeV, 174.0*MeV },
   {  107.0*MeV, 185.2*MeV,  73.0*MeV,  98.5*MeV,  98.5*MeV },
+  {  265.0*MeV, 350.0*MeV,       0.0, 270.0*MeV, 270.0*MeV },
+  {  420.0*MeV,  24.3*MeV,  54.9*MeV, 174.0*MeV, 174.0*MeV },
+  {  107.0*MeV, 185.0*MeV,  73.0*MeV,  98.5*MeV,  98.5*MeV },
   {  259.0*MeV, 181.0*MeV, 225.0*MeV, 186.0*MeV, 186.0*MeV },
   {  250.0*MeV, 315.0*MeV,       0.0, 320.0*MeV, 320.0*MeV },
   {  161.0*MeV, 168.0*MeV,  87.0*MeV, 159.0*MeV, 159.0*MeV },
   {  400.0*MeV,  55.0*MeV,  87.0*MeV, 260.0*MeV, 260.0*MeV },
   {  150.0*MeV, 215.0*MeV, 150.0*MeV, 232.0*MeV, 232.0*MeV },
+  {  400.0*MeV,  55.0*MeV,  85.0*MeV, 260.0*MeV, 260.0*MeV },
+  {  400.0*MeV, 215.0*MeV, 150.0*MeV, 232.0*MeV, 232.0*MeV },
   {        0.0, 197.0*MeV, 200.0*MeV, 373.0*MeV, 373.0*MeV }
 };

trunk/source/particles/shortlived/src/G4ExcitedXiConstructor.cc

-              r850
+              r921
 //
 //
 // $Id: G4ExcitedXiConstructor.cc,v 1.7 2006/06/29 19:27:12 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ExcitedXiConstructor.cc,v 1.8 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
 const G4double G4ExcitedXiConstructor::mass[] = {
 .5318*GeV, 1.690*GeV, 1.823*GeV, 1.950*GeV,  2.025*GeV
+.5334*GeV, 1.690*GeV, 1.823*GeV, 1.950*GeV,  2.025*GeV
 };

trunk/source/particles/shortlived/src/G4ShortLivedConstructor.cc

-              r850
+              r921
 //
 //
 // $Id: G4ShortLivedConstructor.cc,v 1.15 2006/10/12 10:59:45 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4ShortLivedConstructor.cc,v 1.16 2008/09/18 08:37:27 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
   // u-quark
   particle = new G4Quarks(
             "u_quark",         2.3*MeV,       0.0*MeV,   2./3.*eplus,
+            "u_quark",         2.4*MeV,       0.0*MeV,   2./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
   // d-quark
   particle = new G4Quarks(
             "d_quark",         5.0*MeV,       0.0*MeV,  -1./3.*eplus,
+            "d_quark",         4.8*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
   // s-quark
   particle = new G4Quarks(
             "s_quark",        95.0*MeV,       0.0*MeV,  -1./3.*eplus,
+            "s_quark",       104.0*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // c-quark
   particle = new G4Quarks(
             "c_quark",        1.25*GeV,       0.0*MeV,  +2./3.*eplus,
+            "c_quark",        1.27*GeV,       0.0*MeV,  +2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // b-quark
   particle = new G4Quarks(
             "b_quark",        4.20*GeV,       0.0*MeV,  -1./3.*eplus,
+            "b_quark",        4.68*GeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // t-quark
   particle = new G4Quarks(
             "t_quark",       174.2*GeV,       0.0*MeV,  +2./3.*eplus,
+            "t_quark",       171.2*GeV,       0.0*MeV,  +2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // anti u-quark
   particle = new G4Quarks(
        "anti_u_quark",         2.3*MeV,       0.0*MeV,   -2./3.*eplus,
+       "anti_u_quark",         2.4*MeV,       0.0*MeV,   -2./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
   // anti d-quark
   particle = new G4Quarks(
        "anti_d_quark",         5.0*MeV,       0.0*MeV,   1./3.*eplus,
+       "anti_d_quark",         4.8*MeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
   // s-quark
   particle = new G4Quarks(
        "anti_s_quark",        95.0*MeV,       0.0*MeV,   1./3.*eplus,
+       "anti_s_quark",       104.0*MeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // c-quark
   particle = new G4Quarks(
        "anti_c_quark",        1.25*GeV,       0.0*MeV,  -2./3.*eplus,
+       "anti_c_quark",        1.27*GeV,       0.0*MeV,  -2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // b-quark
   particle = new G4Quarks(
        "anti_b_quark",        4.20*GeV,       0.0*MeV,   1./3.*eplus,
+       "anti_b_quark",        4.68*GeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // t-quark
   particle = new G4Quarks(
        "anti_t_quark",       174.2*GeV,       0.0*MeV,  -2./3.*eplus,
+       "anti_t_quark",       171.2*GeV,       0.0*MeV,  -2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
    // uu1-Diquark
   particle = new G4DiQuarks(
         "uu1_diquark",         4.6*MeV,       0.0*MeV,   4./3.*eplus,
+        "uu1_diquark",         4.8*MeV,       0.0*MeV,   4./3.*eplus,
 ,              +1,             0,
 ,              +2,             0,
 …
     // ud1-Diquark
   particle = new G4DiQuarks(
          "ud1_diquark",        7.3*MeV,       0.0*MeV,   1./3.*eplus,
+         "ud1_diquark",        7.2*MeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,              +0,             0,
 …
     // dd1-Diquark
   particle = new G4DiQuarks(
         "dd1_diquark",        10.0*MeV,       0.0*MeV,   -2./3.*eplus,
+        "dd1_diquark",         9.6*MeV,       0.0*MeV,   -2./3.*eplus,
 ,              +1,             0,
 ,              -2,             0,
 …
    // sd1-Diquark
   particle = new G4DiQuarks(
         "sd1_diquark",       100.0*MeV,       0.0*MeV,   -2./3.*eplus,
+        "sd1_diquark",       108.8*MeV,       0.0*MeV,   -2./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
   // su1-Diquark
   particle = new G4DiQuarks(
         "su1_diquark",        97.3*MeV,       0.0*MeV,   1./3.*eplus,
+        "su1_diquark",       106.4*MeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
     // sd0-Diquark
   particle = new G4DiQuarks(
         "sd0_diquark",       100.0*MeV,       0.0*MeV,   -2./3.*eplus,
+        "sd0_diquark",       108.0*MeV,       0.0*MeV,   -2./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
   // su0-Diquark
   particle = new G4DiQuarks(
         "su0_diquark",        97.3*MeV,       0.0*MeV,   1./3.*eplus,
+        "su0_diquark",       106.4*MeV,       0.0*MeV,   1./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
    // anti uu1-Diquark
   particle = new G4DiQuarks(
    "anti_uu1_diquark",         4.6*MeV,       0.0*MeV,  -4./3.*eplus,
+   "anti_uu1_diquark",         4.8*MeV,       0.0*MeV,  -4./3.*eplus,
 ,              +1,             0,
 ,              -2,             0,
 …
     // anti ud1-Diquark
   particle = new G4DiQuarks(
    "anti_ud1_diquark",         7.3*MeV,       0.0*MeV,  -1./3.*eplus,
+   "anti_ud1_diquark",         7.2*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,              +0,             0,
 …
     // anti dd1-Diquark
   particle = new G4DiQuarks(
    "anti_dd1_diquark",        10.0*MeV,       0.0*MeV,    2./3.*eplus,
+   "anti_dd1_diquark",         9.6*MeV,       0.0*MeV,    2./3.*eplus,
 ,              +1,             0,
 ,              +2,             0,
 …
    // anti ud0-Diquark
   particle = new G4DiQuarks(
    "anti_ud0_diquark",         7.3*MeV,       0.0*MeV,  -1./3.*eplus,
+   "anti_ud0_diquark",         7.2*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,              +0,             0,
 …
    // anti  sd1-Diquark
   particle = new G4DiQuarks(
    "anti_sd1_diquark",       100.0*MeV,       0.0*MeV,    2./3.*eplus,
+   "anti_sd1_diquark",       108.8*MeV,       0.0*MeV,    2./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
   // anti su1-Diquark
   particle = new G4DiQuarks(
    "anti_su1_diquark",        97.3*MeV,       0.0*MeV,  -1./3.*eplus,
+   "anti_su1_diquark",       106.4*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
     // anti sd0-Diquark
   particle = new G4DiQuarks(
    "anti_sd0_diquark",       100.0*MeV,       0.0*MeV,    2./3.*eplus,
+   "anti_sd0_diquark",       108.8*MeV,       0.0*MeV,    2./3.*eplus,
 ,              +1,             0,
 ,              +1,             0,
 …
   // anti su0-Diquark
   particle = new G4DiQuarks(
    "anti_su0_diquark",        97.3*MeV,       0.0*MeV,  -1./3.*eplus,
+   "anti_su0_diquark",       106.4*MeV,       0.0*MeV,  -1./3.*eplus,
 ,              +1,             0,
 ,              -1,             0,
 …
     // ss1-Diquark
   particle = new G4DiQuarks(
         "ss1_diquark",       190.0*MeV,       0.0*MeV,   -2./3.*eplus,
+        "ss1_diquark",       208.0*MeV,       0.0*MeV,   -2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
     // anti ss1-Diquark
   particle = new G4DiQuarks(
         "anti_ss1_diquark",  190.0*MeV,       0.0*MeV,    2./3.*eplus,
+        "anti_ss1_diquark",  208.0*MeV,       0.0*MeV,    2./3.*eplus,
 ,              +1,             0,
 ,               0,             0,
 …
   // f0(1500)
   particle = new G4ExcitedMesons(
            "f0(1500)",      1507.0*MeV,     109.0*MeV,           0.0,
+           "f0(1500)",      1505.0*MeV,     109.0*MeV,           0.0,
 ,              +1,            +1,
 ,               0,            +1,
 …
   // f0(1710)
   particle = new G4ExcitedMesons(
            "f0(1710)",      1718.0*MeV,     137.0*MeV,           0.0,
+           "f0(1710)",      1724.0*MeV,     137.0*MeV,           0.0,
 ,              +1,            +1,
 ,               0,            +1,

trunk/source/persistency/GNUmakefile

-              r818
+              r921
 # $Id: GNUmakefile,v 1.29 2007/11/02 16:22:05 gcosmo Exp $
+# $Id: GNUmakefile,v 1.30 2008/10/23 14:47:26 gcosmo Exp $
 # -----------------------------------------------------------------------
 # GNUmakefile for persistency library.  Gabriele Cosmo, 16/11/96.
 …
 name := G4persistency
 SUBDIRS := mctruth
 SUBLIBS = G4mctruth
+SUBDIRS := mctruth ascii
+SUBLIBS = G4mctruth G4geomtext
 ifdef G4LIB_BUILD_GDML

trunk/source/persistency/History

-              r818
+              r921
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+October, 08  G.Cosmo (persistency-V09-01-00)
+- Added "ascii" module from original implementation by P.Arce (CIEMAT).
+  First release.
+- Coworks with tag "config-V09-01-08".
 November, 07  G.Cosmo (persistency-V09-00-00)

trunk/source/persistency/gdml/History

-              r850
+              r921
 $Id: History,v 1.89 2008/08/22 16:01:02 gcosmo Exp $
+$Id: History,v 1.98 2009/01/23 10:41:12 gcosmo Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+January 2009 Gabriele Cosmo (gdml-V09-02-01)
+- Changed post-fix"_refl" to "_PV" for placements made through the
+  reflection-factory.
+January 2009 Gabriele Cosmo (gdml-V09-02-00)
+- Added possibility to check overlaps by activating/de-activating the
+  built-in surface check for placement and parameterised volumes.
+  By default the overlap check is off. To activate it, use call to the
+  parser 'SetOverlapCheck(true)' before reading the GDML file.
+December 2008 Gabriele Cosmo (gdml-V09-01-21)
+- Updated default GDML schema location in G4GDMLParser to point to new
+  GDML schema.
+November 2008 Tatiana Nikitina (gdml-V09-01-20)
+- Updated schema to include new features introduced in reader/writer plugin.
+November 2008 Gabriele Cosmo (gdml-V09-01-19)
+- Added missing solid Elliptical-Cone to reader and writer.
+November 2008 Gabriele Cosmo (gdml-V09-01-18)
+- Implemented mechanism for importing GDML descriptions with extensions
+  to the GDML schema, identified by a new tag "extension".
+- Added implementation .cc file for G4GDMLParser.
+November 2008 Gabriele Cosmo (gdml-V09-01-17)
+- Get rid of module-name pre-pended to entity names.
+- Added StripNamePointers() method to G4GDMLParser, utility to be invoked in
+  the user-code to strip off pointers from entity names in a GDML modular setup
+  after loading all modules.
+November 2008 Gabriele Cosmo (gdml-V09-01-16)
+- Enhanced name stripping in G4GDMLRead, to remove also additional IDs
+  prepended to the original name of entities in the case of modular GDML files.
+November 2008 Gabriele Cosmo (gdml-V09-01-15)
+- Added support for new serializer API as introduced in Xerces-3.0.0.
+- Cleared compilation warnings on Intel-icc compiler.
 August 2008 Tatiana Nikitina (gdml-V09-01-14)

trunk/source/persistency/gdml/include/G4GDMLParser.hh

-              r850
+              r921
 //
 //
 // $Id: G4GDMLParser.hh,v 1.53 2008/08/21 12:17:09 gcosmo Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4GDMLParser.hh,v 1.57 2009/01/22 11:02:07 gcosmo Exp $
+// GEANT4 tag $Name:  $
 //
 //
 …
 #include "G4STRead.hh"
 #define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/GDML_2_10_0/src/GDMLSchema/gdml.xsd")
+#define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd")
 class G4GDMLParser
 …
   public:  // with description
+   G4GDMLParser() { xercesc::XMLPlatformUtils::Initialize(); }
+   ~G4GDMLParser() { xercesc::XMLPlatformUtils::Terminate(); }
+   G4GDMLParser();
+   G4GDMLParser(G4GDMLReadStructure*);
+  ~G4GDMLParser();
      //
      // Parser constructor & destructor
+     // Parser constructors & destructor
    inline void Read(const G4String& filename, G4bool Validate=true);
 …
    inline G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default");
    inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol);
+   inline void StripNamePointers() const;
+   inline void SetOverlapCheck(G4bool);
    // Methods for Writer
 …
   private:
+   G4GDMLReadStructure reader;
+   G4GDMLWriteStructure writer;
+   G4GDMLReadStructure* reader;
+   G4GDMLWriteStructure* writer;
+   G4bool ucode;
 };

trunk/source/persistency/gdml/src/G4GDMLParser.cc

-              r818
+              r921
 // ********************************************************************
 //
+//
+// $Id: G4GDMLParser.cc,v 1.13 2008/11/20 15:33:52 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
+//
+//
+// class G4GDMLParser Implementation
+//
+// -------------------------------------------------------------------------
 #include "G4GDMLParser.hh"
+G4GDMLParser::G4GDMLParser()
+  : ucode(false)
+{
+  reader = new G4GDMLReadStructure;
+  writer = new G4GDMLWriteStructure;
+  xercesc::XMLPlatformUtils::Initialize();
+}
+G4GDMLParser::G4GDMLParser(G4GDMLReadStructure* ext)
+  : ucode(true)
+{
+  reader = ext;
+  writer = new G4GDMLWriteStructure;
+  xercesc::XMLPlatformUtils::Initialize();
+}
+G4GDMLParser::~G4GDMLParser()
+{
+  xercesc::XMLPlatformUtils::Terminate();
+  delete writer;
+  if (!ucode) { delete reader; }
+}

trunk/source/physics_lists/History

-              r850
+              r921
 $Id: History,v 1.65 2008/08/05 10:25:00 vnivanch Exp $
+$Id: History,v 1.74 2008/12/01 17:04:13 vnivanch Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+-12-2008, V.Ivanchenko phys-lists-V09-01-19
+G4HadronElasticPhysics - fixed adding optional Barashenkov Xsection
+QBBC - added QBBBG option
+-11-2008, V.Ivanchenko phys-lists-V09-01-18
+- Added sigma_c+, sigma_c++ in the list of stable hadrons
+- added interfaces to G4PhysicsListFactory - ALICE requirement
+-11-2008, V.Ivanchenko phys-lists-V09-01-17
+- Added charge exchange process to QBBC Physics Lists
+-11-2008, V.Ivanchenko phys-lists-V09-01-16
+- Added names to string models builders
+-11-2008, V.Ivanchenko phys-lists-V09-01-15
+G4EmStandardPhysics_option1 - disable ApplyCuts option
+G4EmStandardPhysics_option3 - linLossLimit set to be default (0.01)
+G4PhysicsListFactory - added QBBCG
+-10-2008, V.Ivanchenko phys-lists-V09-01-14
+In all EM builders - set inactive for AlongStep for bremsstrahlung and pair
+                     production porcesses for minor CPU improvenment
+-10-2008, V.Ivanchenko phys-lists-V09-01-13
+In all EM builders: added hadron bemsstrahlung and e+e- pair production
+  and e-msc for e+-;
+G4EmStandardPhysics_option2 - enable "ApplyCuts", disable "SubCutoff"
+G4EmStandardPhysics_option3 - added G4LowEnergyRayleigh, set 120 bins
+  for tables (60 is the default), StepFunction per particle type
+-09-2008, V.Ivanchenko phys-lists-V09-01-12
+- QBBC temporary variant which is equivalent QGSP_BERT without LHEP
+  for protons, neutrons and pions
+-09-2008, V.Ivanchenko phys-lists-V09-01-11
+- G4NeutronTrackingCut - added Set methods to define time and energy
+                         limits directly
+- G4HadronInelasticQBBC, QBBC - use FTF with Binary Casacde, improved cout
 -08-2008, V.Ivanchenko phys-lists-V09-01-10

trunk/source/physics_lists/builders/GNUmakefile

-              r850
+              r921
 # $Id: GNUmakefile,v 1.4 2008/05/30 11:01:37 vnivanch Exp $
+# $Id: GNUmakefile,v 1.5 2008/10/15 18:24:11 vnivanch Exp $
 # ---------------------------------------------------------------------------
 # GNUmakefile for physics_lists/builders library.  Gunter Folger 25-Oct-2006.
 …
             -I$(G4BASE)/processes/electromagnetic/utils/include \
             -I$(G4BASE)/processes/electromagnetic/xrays/include \
+            -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
             -I$(G4BASE)/processes/hadronic/cross_sections/include \
             -I$(G4BASE)/processes/hadronic/stopping/include \

trunk/source/physics_lists/builders/include/G4NeutronTrackingCut.hh

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4NeutronTrackingCut.hh,v 1.1 2006/11/20 17:56:08 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4NeutronTrackingCut.hh,v 1.2 2008/09/17 18:19:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
     virtual ~G4NeutronTrackingCut();
-  public:
     // This method will be invoked in the Construct() method.
     // each particle type will be instantiated
 …
   virtual void ConstructProcess();
+  inline void SetTimeLimit(G4double);
+  inline void SetKineticEnergyLimit(G4double);
 private:
   G4NeutronKiller* pNeutronKiller;
+  G4double timeLimit;
+  G4double kineticEnergyLimit;
   G4int    verbose;
   G4bool   wasActivated;
 };
+inline void G4NeutronTrackingCut::SetTimeLimit(G4double val)
+{
+  timeLimit = val;
+}
+inline void G4NeutronTrackingCut::SetKineticEnergyLimit(G4double val)
+{
+  kineticEnergyLimit = val;
+}
 #endif

trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4EmStandardPhysics.cc,v 1.13 2008/04/22 18:28:37 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EmStandardPhysics.cc,v 1.16 2008/11/21 16:50:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4MultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
 #include "G4eIonisation.hh"
 …
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
+#include "G4hBremsstrahlung.hh"
+#include "G4hPairProduction.hh"
 #include "G4hIonisation.hh"
 …
     } else if (particleName == "e-") {
       pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung(),  -1, 3, 3);
+      pmanager->AddProcess(new G4eBremsstrahlung(),  -1,-3, 3);
     } else if (particleName == "e+") {
       pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
+      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-3, 3);
       pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
 …
       pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
       pmanager->AddProcess(new G4MuBremsstrahlung,   -1, 3, 3);
       pmanager->AddProcess(new G4MuPairProduction,   -1, 4, 4);
+      pmanager->AddProcess(new G4MuBremsstrahlung,   -1,-3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,   -1,-4, 4);
     } else if (particleName == "alpha" ||
 …
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+    } else if (particleName == "pi+" ||
+               particleName == "pi-" ||
+               particleName == "proton" ) {
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
+      pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
+      pmanager->AddProcess(new G4hPairProduction,     -1,-4, 4);
     } else if (particleName == "B+" ||
 …
                particleName == "anti_omega-" ||
                particleName == "anti_proton" ||
+               particleName == "anti_sigma_c+" ||
+               particleName == "anti_sigma_c++" ||
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
 …
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
                particleName == "kaon+" ||
+               particleName == "kaon+" ||
                particleName == "kaon-" ||
                particleName == "lambda_c+" ||
+               particleName == "lambda_c+" ||
                particleName == "omega-" ||
+               particleName == "pi+" ||
+               particleName == "pi-" ||
+               particleName == "proton" ||
+               particleName == "sigma_c+" ||
+               particleName == "sigma_c++" ||
                particleName == "sigma+" ||
                particleName == "sigma-" ||

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4EmStandardPhysics_option1.cc,v 1.7 2008/04/22 18:28:38 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EmStandardPhysics_option1.cc,v 1.11 2008/11/21 16:50:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4PhotoElectricEffect.hh"
+#include "G4eMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
 #include "G4MultipleScattering.hh"
 …
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
+#include "G4hBremsstrahlung.hh"
+#include "G4hPairProduction.hh"
 #include "G4hIonisation.hh"
 …
       G4eIonisation* eioni = new G4eIonisation();
       eioni->SetStepFunction(0.8, 1.0*mm);
       G4MultipleScattering* msc = new G4MultipleScattering;
+      G4eMultipleScattering* msc = new G4eMultipleScattering;
       msc->SetStepLimitType(fMinimal);
       pmanager->AddProcess(msc,                   -1, 1, 1);
       pmanager->AddProcess(eioni,                 -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3);
+      pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3);
     } else if (particleName == "e+") {
 …
       G4eIonisation* eioni = new G4eIonisation();
       eioni->SetStepFunction(0.8, 1.0*mm);
       G4MultipleScattering* msc = new G4MultipleScattering;
+      G4eMultipleScattering* msc = new G4eMultipleScattering;
       msc->SetStepLimitType(fMinimal);
       pmanager->AddProcess(msc,                     -1, 1, 1);
       pmanager->AddProcess(eioni,                   -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3, 3);
+      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-3, 3);
       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1, 4);
 …
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4MuBremsstrahlung,    -1, 3, 3);
       pmanager->AddProcess(new G4MuPairProduction,    -1, 4, 4);
+      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
     } else if (particleName == "alpha" ||
 …
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+    } else if (particleName == "pi+" ||
+               particleName == "pi-" ||
+               particleName == "proton" ) {
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
+      pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
+      pmanager->AddProcess(new G4hPairProduction,     -1,-4, 4);
     } else if (particleName == "B+" ||
 …
                particleName == "anti_omega-" ||
                particleName == "anti_proton" ||
+               particleName == "anti_sigma_c+" ||
+               particleName == "anti_sigma_c++" ||
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
 …
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
                particleName == "kaon+" ||
+               particleName == "kaon+" ||
                particleName == "kaon-" ||
                particleName == "lambda_c+" ||
+               particleName == "lambda_c+" ||
                particleName == "omega-" ||
+               particleName == "pi+" ||
+               particleName == "pi-" ||
+               particleName == "proton" ||
+               particleName == "sigma_c+" ||
+               particleName == "sigma_c++" ||
                particleName == "sigma+" ||
                particleName == "sigma-" ||
 …
   G4EmProcessOptions opt;
   opt.SetVerbose(verbose);
+  //opt.SetApplyCuts(true);
+}

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4EmStandardPhysics_option2.cc,v 1.11 2008/08/05 10:24:44 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4EmStandardPhysics_option2.cc,v 1.15 2008/11/21 17:59:23 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
     } else if (particleName == "e-") {
       pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
-      pmanager->AddDiscreteProcess(new G4CoulombScattering());
     } else if (particleName == "e+") {
       pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
       pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
-      pmanager->AddDiscreteProcess(new G4CoulombScattering());
     } else if (particleName == "mu+" ||
                particleName == "mu-"    ) {
       pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
 …
                particleName == "proton" ) {
       pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
 …
                particleName == "anti_omega-" ||
                particleName == "anti_proton" ||
+               particleName == "anti_sigma_c+" ||
+               particleName == "anti_sigma_c++" ||
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
 …
                particleName == "lambda_c+" ||
                particleName == "omega-" ||
+               particleName == "sigma_c+" ||
+               particleName == "sigma_c++" ||
                particleName == "sigma+" ||
                particleName == "sigma-" ||
 …
   // Physics tables
   //
   opt.SetMinEnergy(100*eV);
   opt.SetMaxEnergy(100*TeV);
   opt.SetDEDXBinning(120);
   opt.SetLambdaBinning(120);
   opt.SetSplineFlag(true);
+  //opt.SetMinEnergy(100*eV);
+  //opt.SetMaxEnergy(100*TeV);
+  //opt.SetDEDXBinning(84);
+  //opt.SetLambdaBinning(84);
+  //opt.SetSplineFlag(true);
   opt.SetPolarAngleLimit(0.2);
   // Energy loss
   //
   opt.SetLinearLossLimit(0.01);
+  //opt.SetLinearLossLimit(0.01);
   // Ionization

trunk/source/physics_lists/builders/src/G4FTFBinaryNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFB");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4FTFBinaryPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFB");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4FTFBinaryProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFB");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFP");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4FTFPPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFP");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4FTFPProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 4*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("FTFP");
36	36
37	37	theStringModel = new G4FTFModel;

trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4HadronElasticPhysics.cc,v 1.8 2008/05/19 10:21:34 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4HadronElasticPhysics.cc,v 1.9 2008/12/01 16:57:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4VQCrossSection.hh"
 #include "G4UElasticCrossSection.hh"
+#include "G4BGGNucleonElasticXS.hh"
+#include "G4BGGPionElasticXS.hh"
 G4HadronElasticPhysics::G4HadronElasticPhysics(
 …
+  {
     G4ParticleDefinition* particle = theParticleIterator->value();
+    G4ProcessManager* pmanager = particle->GetProcessManager();
     G4String pname = particle->GetParticleName();
     if(pname == "anti_lambda"  ||
 …
        pname == "lambda"    ||
        pname == "omega-"    ||
-       pname == "pi-"       ||
-       pname == "pi+"       ||
-       pname == "proton"    ||
        pname == "sigma-"    ||
        pname == "sigma+"    ||
 …
        pname == "triton") {
-      G4ProcessManager* pmanager = particle->GetProcessManager();
       if(mname == "elastic") {
         G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
 …
       hel->RegisterMe(model);
       pmanager->AddDiscreteProcess(hel);
+      if(verbose > 1)
+        G4cout << "### HadronElasticPhysics added for "
+               << particle->GetParticleName() << G4endl;
+      // proton case
+    } else if(pname == "proton") {
+      if(mname == "elastic") {
+        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
+        h->SetQElasticCrossSection(man);
+        hel = h;
+        if(glFlag) hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      } else {
+        hel = new G4HadronElasticProcess("hElastic");
+      }
+      hel->RegisterMe(model);
+      pmanager->AddDiscreteProcess(hel);
+      if(verbose > 1)
+        G4cout << "### HadronElasticPhysics added for "
+               << particle->GetParticleName() << G4endl;
       // neutron case
     } else if(pname == "neutron") {
-      G4ProcessManager* pmanager = particle->GetProcessManager();
       if(mname == "elastic") {
         G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
 …
         h->SetQElasticCrossSection(nhe->GetCS());
         hel = h;
         if(glFlag) hel->AddDataSet(new G4UElasticCrossSection(particle));
+        if(glFlag) hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
       } else {
         hel = new G4HadronElasticProcess("hElastic");
 …
         G4cout << "### HadronElasticPhysics added for "
                << particle->GetParticleName() << G4endl;
+      // pion case
+    } else if(pname == "pi+" || pname == "pi-") {
+      if(mname == "elastic") {
+        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
+        h->SetQElasticCrossSection(man);
+        hel = h;
+        if(glFlag) hel->AddDataSet(new G4BGGPionElasticXS(particle));
+      } else {
+        hel = new G4HadronElasticProcess("hElastic");
+      }
+      hel->RegisterMe(model);
+      pmanager->AddDiscreteProcess(hel);
+      if(verbose > 1)
+        G4cout << "### HadronElasticPhysics added for "
+               << particle->GetParticleName() << G4endl;
+    }
+  }

trunk/source/physics_lists/builders/src/G4NeutronTrackingCut.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4NeutronTrackingCut.cc,v 1.4 2006/11/24 16:30:13 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4NeutronTrackingCut.cc,v 1.5 2008/09/17 18:19:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 G4NeutronTrackingCut::G4NeutronTrackingCut(const G4String& name, G4int ver)
   :  G4VPhysicsConstructor(name), verbose(ver), wasActivated(false)
+{}
+{
+  timeLimit          = 10.*microsecond;
+  kineticEnergyLimit = 0.0;
+}
 G4NeutronTrackingCut::~G4NeutronTrackingCut()
 …
   if(wasActivated)
+  {
       delete pNeutronKiller;
+    delete pNeutronKiller;
+  }
+}
 …
 void G4NeutronTrackingCut::ConstructParticle()
+{
-// G4cout << "G4NeutronTrackingCut::ConstructParticle" << G4endl;
   G4Neutron::NeutronDefinition();
+}
 …
 void G4NeutronTrackingCut::ConstructProcess()
+{
-  G4double timeLimit     =10*microsecond;
-//  G4double kineticEnergylimit =1*keV;
   if(wasActivated) return;
   wasActivated = true;
+  // Add Decay Process
+  // Add Process
   pNeutronKiller = new G4NeutronKiller();
   G4ParticleDefinition * particle = G4Neutron::Neutron();
   G4ProcessManager * pmanager = particle->GetProcessManager();
+//      if(verbose > 1)
+        G4cout << "### Adding Neutron tracking cut for " << particle->GetParticleName() << G4endl;
+        G4cout << "###  cut value is " << timeLimit/microsecond << " microseconds" <<  G4endl;
+      pmanager -> AddDiscreteProcess(pNeutronKiller);
+//      pNeutronKiller->SetKinEnergyLimit(kineticEnergylimit);
+      pNeutronKiller->SetTimeLimit(timeLimit);
+  if(verbose > 0) {
+    G4cout << "### Adding tracking cuts for " << particle->GetParticleName()
+           << "  TimeCut(ns)= " << timeLimit/ns
+           << "  KinEnergyCut(MeV)= " <<  kineticEnergyLimit/MeV
+           <<  G4endl;
+  }
+  pmanager -> AddDiscreteProcess(pNeutronKiller);
+  pNeutronKiller->SetKinEnergyLimit(kineticEnergyLimit);
+  pNeutronKiller->SetTimeLimit(timeLimit);
+}

trunk/source/physics_lists/builders/src/G4QGSBinaryNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSB");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSBinaryPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSB");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSBinaryProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSB");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSCElow");
36	36
37	37	theStringModel= new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSCEflow");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSCEflow");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSC");
36	36
37	37	theStringModel= new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSC");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 8*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSC");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSP");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSPPiKBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSP");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/builders/src/G4QGSPProtonBuilder.cc

r825	r921
33	33	{
34	34	theMin = 12*GeV;
35		theModel = new G4TheoFSGenerator;
	35	theModel = new G4TheoFSGenerator("QGSP");
36	36
37	37	theStringModel = new G4QGSModel< G4QGSParticipants >;

trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4HadronInelasticQBBC.hh,v 1.5 2008/08/05 10:25:00 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4HadronInelasticQBBC.hh,v 1.7 2008/09/24 18:10:51 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
   G4PreCompoundModel* thePreEquilib;
   G4QuasiElasticChannel*    theQuasiElastic;
   //  G4GeneratorPrecompoundInterface* theCascade;
+  G4GeneratorPrecompoundInterface* preCompound;
   G4BinaryCascade* theCascade;
   G4QStringChipsParticleLevelInterface * theCHIPSCascade;
   G4QGSModel< G4QGSParticipants > * theQGStringModel;
   G4ExcitedStringDecay* theQGStringDecay;
+  G4ExcitedStringDecay* theFTFStringDecay;
+  G4FTFModel*           theFTFStringModel;
+  G4ExcitedStringDecay* theFTFBStringDecay;
+  G4ExcitedStringDecay* theFTFCStringDecay;
+  G4FTFModel*           theFTFBStringModel;
+  G4FTFModel*           theFTFCStringModel;
   G4int    verbose;

trunk/source/physics_lists/lists/include/QBBC.icc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: QBBC.icc,v 1.12 2008/08/05 10:25:00 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: QBBC.icc,v 1.16 2008/11/25 15:36:19 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4HadronDElasticPhysics.hh"
 #include "G4HadronHElasticPhysics.hh"
+#include "G4ChargeExchangePhysics.hh"
 #include "G4IonBinaryCascadePhysics.hh"
 #include "G4IonPhysics.hh"
 …
    // Hadron Physics
   if(type == "QBBC") {
     this->RegisterPhysics( new G4HadronElasticPhysics("hElastic",ver,false,true));
+    this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false,false));
     this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
     this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, true,
                 false, false, false, false));
+    this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false,
+                true, false, false, false));
+  } else if(type == "QBBCG") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("hElastic",ver,false,true));
+  } else if(type == "QBBBG") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false,true));
+    this->RegisterPhysics( new G4ChargeExchangePhysics(ver,true));
     this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
     this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
 …
                 false, false, false, true));
+  } else if(type == "QBBC_DEL") {
+    this->RegisterPhysics( new G4HadronDElasticPhysics(ver,false));
+  } else if(type == "QBBCG") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false,true));
+    this->RegisterPhysics( new G4ChargeExchangePhysics(ver,true));
     this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
     this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false,
+                true, false, false, true));
+  } else if(type == "QBBCF") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false,false));
+    this->RegisterPhysics( new G4ChargeExchangePhysics(ver,false));
+    this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
+    this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
+    this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, true,
                 true, false, false, false));
   } else if(type == "QBBC_HEL") {
     this->RegisterPhysics( new G4HadronHElasticPhysics(ver,false));
+  } else if(type == "QBBC_HP") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,true,false));
     this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
     this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false,
+                true, false, false, false));
+  } else if(type == "QBBC_HP") {
+    this->RegisterPhysics( new G4HadronElasticPhysics("hElastic",ver,true,true));
+    this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
+    this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
+    this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false,
+                false, false, true, false));
+                true, false, true, false));
   } else {

trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc

-              r850
+              r921
 // ********************************************************************
 //
 // $Id: G4HadronInelasticQBBC.cc,v 1.9 2008/08/05 10:25:00 vnivanch Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4HadronInelasticQBBC.cc,v 1.15 2008/11/21 18:42:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
 …
 #include "G4QStringChipsParticleLevelInterface.hh"
 #include "G4StringChipsInterface.hh"
+#include "G4GeneratorPrecompoundInterface.hh"
 #include "G4QGSMFragmentation.hh"
 #include "G4LundStringFragmentation.hh"
 …
     chipsFlag(chips), hpFlag(hp), glFlag(glauber), wasActivated(false)
+{
+  if(verbose > -1) G4cout << "### HadronInelasticQBBC" << G4endl;
+  //  store = G4HadronProcessStore::Instance();
+  if(verbose > 1) G4cout << "### HadronInelasticQBBC bertFlag= " <<  bertFlag <<G4endl;
   theHPXSecI = 0;
   theHPXSecC = 0;
   theHPXSecF = 0;
   theCascade = 0;
+  preCompound = 0;
   theCHIPSCascade   = 0;
   theQuasiElastic   = 0;
   theQGStringDecay  = 0;
   theQGStringModel  = 0;
+  theFTFStringDecay = 0;
+  theFTFStringModel = 0;
+  theFTFBStringDecay = 0;
+  theFTFBStringModel = 0;
+  theFTFCStringDecay = 0;
+  theFTFCStringModel = 0;
+}
 …
+{
   delete theCascade;
+  delete preCompound;
   delete theCHIPSCascade;
   delete theQuasiElastic;
   delete theQGStringDecay;
   delete theQGStringModel;
+  delete theFTFStringDecay;
+  delete theFTFStringModel;
+  delete theFTFBStringDecay;
+  delete theFTFCStringDecay;
+  delete theFTFBStringModel;
+  delete theFTFCStringModel;
   delete theHPXSecI;
   delete theHPXSecC;
 …
   if(verbose > 1)
+    G4cout << "### HadronInelasticQBBC Construct Process" << G4endl;
+  G4double minEstring  = 4.0*GeV;
+  G4double maxEcascade = 6.0*GeV;
+  //  G4double minFtf      = 7.5*GeV;
+    G4cout << "### HadronInelasticQBBC Construct Process"
+           << " ftfFlag= " << ftfFlag << "  bertFlag= " << bertFlag
+           << G4endl;
+  G4double minEstring  = 9.5*GeV;
+  G4double maxEcascade = 7.5*GeV;
+  G4double minFTF      = 4.5*GeV;
+  G4double maxFTF      = 25.*GeV;
   //Binary
 …
   //QGS
+  theCascade = new G4BinaryCascade;
+  theCascade = new G4BinaryCascade();
+  preCompound = new G4GeneratorPrecompoundInterface();
   theCHIPSCascade = new G4QStringChipsParticleLevelInterface;
   G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator();
+  G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator("QGSP");
   theQGStringModel  = new G4QGSModel< G4QGSParticipants >;
   theQGStringDecay  = new G4ExcitedStringDecay(new G4QGSMFragmentation());
   theQGStringModel->SetFragmentationModel(theQGStringDecay);
   theQGSModel->SetTransport(theCHIPSCascade);
   theQuasiElastic = new G4QuasiElasticChannel;
+  theQGSModel->SetTransport(preCompound);
+  theQuasiElastic = new G4QuasiElasticChannel();
   theQGSModel->SetQuasiElasticChannel(theQuasiElastic);
   theQGSModel->SetHighEnergyGenerator(theQGStringModel);
 …
   theQGSModel->SetMaxEnergy(100*TeV);
+  //FTF
+  G4TheoFSGenerator* theFTFModel = new G4TheoFSGenerator();
+  theFTFStringModel = new G4FTFModel();
+  theFTFStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
+  theFTFStringModel->SetFragmentationModel(theFTFStringDecay);
+  //theFTFModel->SetTransport(theCHIPSCascade);
+  theFTFModel->SetTransport(theCascade);
+  theFTFModel->SetHighEnergyGenerator(theFTFStringModel);
+  theFTFModel->SetMinEnergy(minEstring);
+  theFTFModel->SetMaxEnergy(100*TeV);
+  //theFTFModel->SetQuasiElasticChannel(theQuasiElastic);
+  //FTFB
+  G4TheoFSGenerator* theFTFBModel = new G4TheoFSGenerator("FTFP");
+  theFTFBStringModel = new G4FTFModel();
+  theFTFBStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
+  theFTFBStringModel->SetFragmentationModel(theFTFBStringDecay);
+  //  theFTFBModel->SetTransport(theCascade);
+  theFTFBModel->SetTransport(preCompound);
+  theFTFBModel->SetHighEnergyGenerator(theFTFBStringModel);
+  theFTFBModel->SetMinEnergy(minFTF);
+  theFTFBModel->SetMaxEnergy(100*TeV);
+  //FTFP
+  G4TheoFSGenerator* theFTFCModel = new G4TheoFSGenerator("FTFP");
+  theFTFCStringModel = new G4FTFModel();
+  theFTFCStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
+  theFTFCStringModel->SetFragmentationModel(theFTFCStringDecay);
+  theFTFCModel->SetTransport(preCompound);
+  theFTFCModel->SetHighEnergyGenerator(theFTFCStringModel);
+  theFTFCModel->SetMinEnergy(minFTF);
+  theFTFCModel->SetMaxEnergy(maxFTF);
   theParticleIterator->reset();
 …
         hp->AddDataSet(&theXSecP);
+        if(ftfFlag) hp->RegisterMe(theFTFModel);
+        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
         if(bertFlag) hp->RegisterMe(theBERT);
 …
       } else if(pname == "neutron") {
         hp->AddDataSet(&theXSecN);
+        if(ftfFlag) hp->RegisterMe(theFTFModel);
+        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
         G4HadronCaptureProcess* theNeutronCapture =
 …
       } else if(pname == "pi-" || pname == "pi+") {
         hp->AddDataSet(&thePiCross);
+        if(ftfFlag) hp->RegisterMe(theFTFModel);
+        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
         hp->RegisterMe(theBERT);
 …
                 pname == "kaon0S"    ||
                 pname == "kaon0L") {
         hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theBERT);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
 …
                 pname == "xi0") {
         hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theBERT);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
       } else if(pname == "anti_proton" || pname == "anti_neutron") {
         hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theCHIPS);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
       } else {
         hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theCHIPS);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));

trunk/source/track/History

-              r850
+              r921
 $Id: History,v 1.101 2008/02/05 01:46:57 kurasige Exp $
+$Id: History,v 1.102 2008/10/24 08:22:20 kurasige Exp $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Oct. 24, 2008 Hisaya Kurashige (track-V09-01-02)
+- change fpCreatorProcess and fpLCAtVertex in G4Track to  'const' pointer
+- change fpProcessDefinedStep in G4StepPoint to  'const' pointer
 Feb. 5, 2008 Hisaya Kurashige (track-V09-01-01)
 - reset non-ionizing energy loss in G4Step::ResetTotalEnergyDeposit

trunk/source/track/include/G4StepPoint.hh

-              r850
+              r921
 //
 //
 // $Id: G4StepPoint.hh,v 1.18 2007/03/11 07:19:06 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4StepPoint.hh,v 1.19 2008/10/24 08:22:20 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
      // If the pointer is 0, this means the Step is defined
      // by the user defined limit in the current volume.
   inline void SetProcessDefinedStep(G4VProcess* aValue);
+  inline void SetProcessDefinedStep(const G4VProcess* aValue);
 …
    G4StepStatus fStepStatus;
       // DoIt type which defined the current Step.
    G4VProcess* fpProcessDefinedStep;
+   const G4VProcess* fpProcessDefinedStep;
       // Process which defined the current Step.
    G4double fMass;

trunk/source/track/include/G4StepPoint.icc

-              r850
+              r921
 //
 //
 // $Id: G4StepPoint.icc,v 1.13 2007/03/11 07:19:06 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4StepPoint.icc,v 1.14 2008/10/24 08:22:20 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
      // If the pointer is 0, this means the Step is defined
      // by the user defined limit in the current volume.
    inline void G4StepPoint::SetProcessDefinedStep(G4VProcess* aValue)
+   inline void G4StepPoint::SetProcessDefinedStep(const G4VProcess* aValue)
    { fpProcessDefinedStep = aValue; }

trunk/source/track/include/G4Track.hh

-              r850
+              r921
 //
 //
 // $Id: G4Track.hh,v 1.18 2006/06/29 21:14:47 gunter Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Track.hh,v 1.19 2008/10/24 08:22:20 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
 …
    void SetVertexKineticEnergy(const G4double aValue);
    G4LogicalVolume* GetLogicalVolumeAtVertex() const;
    void SetLogicalVolumeAtVertex(G4LogicalVolume* );
+   const G4LogicalVolume* GetLogicalVolumeAtVertex() const;
+   void SetLogicalVolumeAtVertex(const G4LogicalVolume* );
    const G4VProcess* GetCreatorProcess() const;
    void SetCreatorProcess(G4VProcess* aValue);
+   void SetCreatorProcess(const G4VProcess* aValue);
   // track weight
 …
    G4ThreeVector fVtxMomentumDirection; // Momentum direction at the vertex
    G4double fVtxKineticEnergy;          // Kinetic energy at the vertex
    G4LogicalVolume* fpLVAtVertex;       //Logical Volume at the vertex
    G4VProcess* fpCreatorProcess;        // Process which created the track
+   const G4LogicalVolume* fpLVAtVertex; //Logical Volume at the vertex
+   const G4VProcess* fpCreatorProcess; // Process which created the track
    G4VUserTrackInformation* fpUserInformation;

trunk/source/track/include/G4Track.icc

-              r850
+              r921
 //
 //
 // $Id: G4Track.icc,v 1.15 2007/10/02 00:46:21 kurasige Exp $
 // GEANT4 tag $Name: HEAD $
+// $Id: G4Track.icc,v 1.16 2008/10/24 08:22:20 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //-----------------------------------------------------------------
 …
    { fVtxKineticEnergy = aValue; }
    inline  G4LogicalVolume* G4Track::GetLogicalVolumeAtVertex() const
+   inline  const G4LogicalVolume* G4Track::GetLogicalVolumeAtVertex() const
    { return fpLVAtVertex; }
    inline void G4Track::SetLogicalVolumeAtVertex(G4LogicalVolume* aValue)
+   inline void G4Track::SetLogicalVolumeAtVertex(const G4LogicalVolume* aValue)
    { fpLVAtVertex = aValue; }
 …
      // 0, it points to the process which created this track.
    inline void G4Track::SetCreatorProcess(G4VProcess* aValue)
+   inline void G4Track::SetCreatorProcess(const G4VProcess* aValue)
    { fpCreatorProcess = aValue; }

trunk/source/tracking/History

-              r850
+              r921
 $Id: History,v 1.122 2008/05/06 12:52:48 tsasaki Exp $
 $Name: HEAD $
+$Id: History,v 1.125 2008/10/02 01:08:23 tsasaki Exp $
+$Name: geant4-09-02-cand-01 $
 -------------------------------------------------------------------
 …
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Oct 2008  T.Sasaki (tracking-V09-01-03)
+- G4SteppingManager2.cc: PhyscalStep etc was not updated when
+  any flaga for ForceCondition is set. (since begining of Geant4)
+Sep 2008  T.Sasaki (tracking-V09-01-02)
+- G4SteppingManager2.cc: Bug fix for the previous tag
+Sep 2008  T.Sasaki (tracking-V09-01-01)
+- G4SteppingManager2.cc: Bug fix for PhysicalStep
 May 2008  T.Sasaki (tracking-V09-01-00)

trunk/source/visualization/GNUmakefile

-              r919
+              r921
 ifdef G4VIS_BUILD_OPENGL_DRIVER
+  SUBDIRS += externals/gl2ps
   SUBDIRS += OpenGL
   SUBLIBS += G4OpenGL
-  SUBDIRS += externals/gl2ps
-  SUBLIBS += G4gl2ps
 endif
 ifdef G4VIS_BUILD_OI_DRIVER
+  SUBDIRS += externals/gl2ps
   SUBDIRS += OpenInventor
   SUBLIBS += G4OpenInventor
-  SUBDIRS += externals/gl2ps
-  SUBLIBS += G4gl2ps
 endif
 endif #G4VIS_BUILD

trunk/source/visualization/OpenGL/GNUmakefile

-              r916
+              r921
 CPPFLAGS += -DG4DEBUG_VIS_OGL
+ifdef G4VIS_BUILD_OPENGL_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
+ifdef G4VIS_BUILD_OI_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
 CPPFLAGS += -I$(G4BASE)/visualization/management/include
 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
 …
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
+INTYLIBS += -L$(G4LIBDIR) -lG4gl2ps
 include $(G4INSTALL)/config/moc.gmk
 include $(G4INSTALL)/config/common.gmk

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

-              r918
+              r921
 #include "G4VViewer.hh"
 #include <GL/gl.h>
+#include "G4OpenGL2PSAction.hh"
 class G4OpenGLSceneHandler;
 …
     fDisplayLightFrontT;
   G4double fDisplayLightFrontRed, fDisplayLightFrontGreen, fDisplayLightFrontBlue;
+  G4OpenGL2PSAction* fGL2PSAction;
 private :

trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

-              r918
+              r921
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
-#include "Geant4_gl2ps.h"
 #include <sstream>
 …
   fWinSize_x = fVP.GetWindowSizeHintX();
   fWinSize_y = fVP.GetWindowSizeHintY();
+  fGL2PSAction = new G4OpenGL2PSAction();
   //  glClearColor (0.0, 0.0, 0.0, 0.0);
 …
   //  fGL2PSAction->enableFileWriting();
+  //////////////
+  if (!fGL2PSAction) return;
+  fGL2PSAction->setFileName("gl2psTest.ps");
+  G4cout << "Produce " << aFile << "..." << G4endl;
+  if (fGL2PSAction->enableFileWriting()) {
+    DrawView();
+    fGL2PSAction->disableFileWriting();
+  }
+  //////////////
   FILE *fFile = fopen(aFile,"w");
   if(!fFile) {
 …
 , 20, 10, buffsize, fFile, aFile);
     DrawView();
+#ifdef G4DEBUG_VIS_OGL
+    printf("into While............\n");
+#endif
     res = gl2psEndPage();
+  }

trunk/source/visualization/OpenInventor/GNUmakefile

-              r529
+              r921
 include $(G4INSTALL)/config/interactivity.gmk
+ifdef G4VIS_BUILD_OPENGL_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
+ifdef G4VIS_BUILD_OI_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
 CPPFLAGS += -I$(G4BASE)/visualization/management/include
 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
 …
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
+INTYLIBS += -L$(G4LIBDIR) -lG4gl2ps
 include $(G4INSTALL)/config/common.gmk

trunk/source/visualization/OpenInventor/include/HEPVis/actions/SoGL2PSAction.h

-              r529
+              r921
 #include <Inventor/actions/SoGLRenderAction.h>
+#include "G4OpenGL2PSAction.hh"
 /**
 …
 #define SoGL2PSAction Geant4_SoGL2PSAction
 class SoGL2PSAction : public SoGLRenderAction {
+class SoGL2PSAction : public SoGLRenderAction, public G4OpenGL2PSAction {
   SO_ACTION_HEADER(SoGL2PSAction);
 public:
   SoGL2PSAction(const SbViewportRegion&);
-  void setFileName(const char*);
-  void enableFileWriting();
-  void disableFileWriting();
-  SbBool fileWritingEnabled() const;
-  SbBool addBitmap(int,int,float=0,float=0,float=0,float=0);
-  void beginViewport();
-  void endViewport();
 public: /*SoINTERNAL*/
   static void initClass();
 protected:
   virtual void beginTraversal(SoNode*);
+private:
+  void gl2psBegin();
+private:
+  SbString fFileName;
+  FILE* fFile;
+  void setViewport();
 };

trunk/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc

-              r850
+              r921
 #include "G4Scene.hh"
 #include "Geant4_SoPolyhedron.h"
+#include "G4AttValue.hh"
+#include "G4AttDef.hh"
+#include "G4AttValue.hh"#include "G4AttDef.hh"
 #include "G4AttCheck.hh"
 #include "G4AttHolder.hh"
 …
   fGL2PSAction->setFileName(aFile.c_str());
   G4cout << "Produce " << aFile << "..." << G4endl;
+  fGL2PSAction->enableFileWriting();
+  ViewerRender();
+  fGL2PSAction->disableFileWriting();
+  if (fGL2PSAction->enableFileWriting()) {
+    ViewerRender();
+    fGL2PSAction->disableFileWriting();
+  }
+}

trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc

-              r529
+              r921
 /*--------------------------------------------------------------------------*/
 // this :
 #include <HEPVis/actions/SoGL2PSAction.h>
 …
 #include <Inventor/errors/SoDebugError.h>
 #include "Geant4_gl2ps.h"
+//#include "Geant4_gl2ps.h"
 #include <stdio.h>
 …
+)
 :SoGLRenderAction(aViewPortRegion)
+,fFileName("out.ps")
+,fFile(0)
+,G4OpenGL2PSAction()
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+  setFileName("out.ps");
   SO_ACTION_CONSTRUCTOR(SoGL2PSAction);
+}
 //////////////////////////////////////////////////////////////////////////////
+void SoGL2PSAction::setFileName(
+ const char* aFileName
+void SoGL2PSAction::setViewport(
+)
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+  fFileName = aFileName;
+}
+//////////////////////////////////////////////////////////////////////////////
+void SoGL2PSAction::enableFileWriting(
+)
+//////////////////////////////////////////////////////////////////////////////
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+  fFile = ::fopen(fFileName.getString(),"w");
+  if(!fFile) {
+    SoDebugError::post("SoGL2PSAction::enableFileWriting",
+                       "Cannot open file %s",fFileName.getString());
+    return;
+  }
+  // FIXME Useful ??
 #ifdef __COIN__
 #else //SGI
   const SbViewportRegion& vpr = getViewportRegion();
   SoViewportRegionElement::set(getState(),vpr);
+  gl2psBegin();
+  const SbVec2s& win = vpr.getWindowSize();
+  fViewport[0] = 0;
+  fViewport[1] = 0;
+  fViewport[2] = win[0];
+  fViewport[3] = win[1];
 #endif
+}
-//////////////////////////////////////////////////////////////////////////////
-void SoGL2PSAction::disableFileWriting(
+)
-//////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-#ifdef __COIN__
-#else //SGI
-  gl2psEndPage();
-#endif
-  ::fclose(fFile);
-  fFile = 0;
+}
-//////////////////////////////////////////////////////////////////////////////
-SbBool SoGL2PSAction::fileWritingEnabled(
-) const
-//////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-  return (fFile?TRUE:FALSE);
+}
-//////////////////////////////////////////////////////////////////////////////
-SbBool SoGL2PSAction::addBitmap(
- int aWidth
-,int aHeight
-,float aXorig
-,float aYorig
-,float aXmove
-,float aYmove
+)
-/////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-  if(!fFile) return FALSE;
-  GLboolean valid;
-  glGetBooleanv(GL_CURRENT_RASTER_POSITION_VALID,&valid);
-  if(valid==GL_FALSE) return FALSE;
-  float pos[4];
-  glGetFloatv(GL_CURRENT_RASTER_POSITION,pos);
-  int xoff = -(int)(aXmove + aXorig);
-  int yoff = -(int)(aYmove + aYorig);
-  int x = (int)(pos[0] + xoff);
-  int y = (int)(pos[1] + yoff);
-  // Should clip against viewport area :
-  GLint vp[4];
-  glGetIntegerv(GL_VIEWPORT,vp);
-  GLsizei w = aWidth;
-  GLsizei h = aHeight;
-  if(x+w>(vp[0]+vp[2])) w = vp[0]+vp[2]-x;
-  if(y+h>(vp[1]+vp[3])) h = vp[1]+vp[3]-y;
-  int s = 3 * w * h;
-  if(s<=0) return FALSE;
-  float* image = (float*)::malloc(s * sizeof(float));
-  if(!image) return FALSE;
-  glReadPixels(x,y,w,h,GL_RGB,GL_FLOAT,image);
-  GLint status = gl2psDrawPixels(w,h,xoff,yoff,GL_RGB,GL_FLOAT,image);
-  ::free(image);
-  return (status!=GL2PS_SUCCESS ? FALSE : TRUE);
+}
-//////////////////////////////////////////////////////////////////////////////
-void SoGL2PSAction::beginViewport(
+)
-/////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-  if(!fFile) return;
-  GLint vp[4];
-  glGetIntegerv(GL_VIEWPORT,vp);
-  gl2psBeginViewport(vp);
+}
-//////////////////////////////////////////////////////////////////////////////
-void SoGL2PSAction::endViewport(
+)
-/////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-  if(!fFile) return;
-  gl2psEndViewport();
+}
 //////////////////////////////////////////////////////////////////////////////
 …
     const SbViewportRegion& vpr = getViewportRegion();
     SoViewportRegionElement::set(getState(),vpr);
     gl2psBegin();
+    Geant4_gl2psBegin();
     traverse(aNode);
     gl2psEndPage();
+    Geant4_gl2psEndPage();
 #else //SGI
     SoGLRenderAction::beginTraversal(aNode);
 …
+  }
+}
-//////////////////////////////////////////////////////////////////////////////
-void SoGL2PSAction::gl2psBegin(
+)
-//////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
-  if(!fFile) return;
-  int options = GL2PS_OCCLUSION_CULL |
-     GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
-  int sort = GL2PS_BSP_SORT;
-  //int sort = GL2PS_SIMPLE_SORT;
-  const SbViewportRegion& vpr = getViewportRegion();
-  SoViewportRegionElement::set(getState(),vpr);
-  const SbVec2s& win = vpr.getWindowSize();
-  GLint vp[4];
-  vp[0] = 0;
-  vp[1] = 0;
-  vp[2] = win[0];
-  vp[3] = win[1];
-  int bufsize = 0;
-  gl2psBeginPage("title","HEPVis::SoGL2PSAction",
-                 vp,
-                 GL2PS_EPS,
-                 sort,
-                 options,
-                 GL_RGBA,0, NULL,0,0,0,
-                 bufsize,
-                 fFile,fFileName.getString());
+}
 #endif

Context Navigation

Legend: