diff --git a/ReleaseNotes/ReleaseNotes4.1.1.txt b/ReleaseNotes/ReleaseNotes4.1.1.txt
new file mode 100644
index 0000000000..cb89859fe5
--- /dev/null
+++ b/ReleaseNotes/ReleaseNotes4.1.1.txt
@@ -0,0 +1,279 @@
+
+                 Geant4 1.1 Release Notes
+                 ------------------------
+
+                                                       10th March 2000
+
+The following is a summary of the main fixes collected since release 1.0 and
+included in Geant4 1.1 (for the detailed list of fixes/updates, please refer
+to the related History files):
+
+  o Configuration scripts
+    - introduced G4NO_OPTIMISE flag for compilation with no optimisation level,
+      G4DEBUG if defined takes precedence.
+    - added G4DEBUG and G4OPTIMISE to the CPPFLAGS list.
+    - fixed bug in EXTRALIBS.
+    - fixed linking order for compound libraries.
+
+  o Electromagnetic Processes:
+    - low-energy processes:
+      + updated anti-proton energy losses to provide simulation down to 1 keV.
+      + minor bug fixes to G4ionLowEnergyIonisation.
+      + fixes to electron and photon low energy processes.
+
+  o Events:
+    - introduced corrections for trajectories of suspended tracks.
+
+  o Geometry:
+    - syncronixed HEAD version of files after ISO-C++ migration.
+    - CSG:
+       fixed bug in DistanceToIn(p,v) for G4Trap.
+    - volumes:
+       added protection to GetSlice() in G4DrawVoxels.
+
+  o Globals:
+    - added check on definition of CLHEP_MAX_MIN_DEFINED flag.
+    - introduced constructor for 3vectors in G4BestUnits.
+    - fixed truncation problem in G4Poisson.
+    - STLinterface:
+       + enforced bound-checking for [] access operators.
+       + fixed bugs in G4String::toUpper() and G4String::toLower().
+       + fixed bounds overflow error in G4RWTPtrSortedVector::find().       
+
+  o Graphics Representations
+    - fix for spheres with small dtheta.
+
+  o Hadronic Processes:
+    - fixed the 'no data' problem observed in the neutron transport tests.
+    
+  o Persistency:
+    - fixed typo in G4PersistentGeomMan class.
+
+  o Tracking & Track:
+    - added protection for NULL pointers in G4SteppingManager.
+    - fixed bug related to track weight in G4VParticleChange.
+
+  o Visualization:
+    - added fix for ISO-ANSI C++ in VRML driver.
+    - introduced commands /vis/viewer/show and /vis/viewer/refresh
+    - introduced general handling of displaced solids.
+    - added some protections in case of no viewer and no voxelisation.
+
+  o G3-to-G4 tool:
+    - introduced fixes to G3VolTable::GetVTE() and G3Division::CreateSolid().
+    - avoid placement of top-level logical volume in G3toG4BuildTree.
+    - removed obsolete files.
+   
+  o Examples:
+    - introduced stepping verbosity (N02, N03).
+    - added 10 TeV mu- in macro exampleN04.EMtest.in.
+    - extended/electromagnetic examples: bug fixes and introduced low-energy
+      test (TestEm6)
+    - introduced 'large N' input macros.
+    - updated reference outputs.
+
+Notes: 
+
+  o  Geant4 1.1 is based on STL and the code has been upgraded to be
+     ISO-ANSI C++ compliant. Code in this release include the ability to
+     choose between using the 'std' namespace in ISO/ANSI mode or using
+     traditional style programming in the global namespace (exceptions
+     still apply concerning mathematical functions - <math.h> in global
+     namespace is still in use, or standard C I/O functions).
+
+The source code and some binary libraries are available through our "Source
+Code" Web page:
+- see our <A href="http://wwwinfo.cern.ch/asd/geant4/geant4.html">Geant4
+  Home Page</A>.
+
+Please refer to <A
+href="http://wwwinfo.cern.ch/asd/geant4/G4UsersDocuments/Overview/html/index.html">Geant4
+User Documentation</A> for further information about using Geant4.
+
+
+Contents
+--------
+
+  1. Supported and Tested Platforms
+  2. CLHEP 1.4
+  3. The Standard Template Library (STL)
+  4. Persistency
+  5. Compiler Specific Problems
+  6. Known Run-Time Problems
+  7. Compilation Warnings
+  8. Known Run-Time Warnings
+
+
+1. Supported and Tested Platforms
+---------------------------------
+
+  o SUN Solaris 5.6, C++ 4.2 patch 104631-04
+  o HP 10.20, aCC C++ B3910B A.01.18  or  A.01.21
+  o Linux 2.2.5-22, gcc C++ egcs-2.91.66 (egcs 1.1.2).
+      This configuration was tested in the RedHat 6.1 distribution, but
+      versions of Geant4 have also been compiled successfully on, Debian
+      and Suse distributions.
+
+Platforms/compilers also tested but giving rise to some problems - see below:
+
+  o DEC V4.0, cxx C++ V6.1-027.
+  o SUN Solaris 5.6, C++ 5.0 patches 107357-07, 107311-09
+  o NT 4.0 with Service Pack 4 and Cygnus Tools b20 with:
+      Visual C++ 6.0 Service Pack 2
+
+Platforms configured but not tested and not supported:
+  o SGI V6.5.5, CC 7.2.1 with ObjectSpace
+  o AIX 4.3.2, xlC compiler with ObjectSpace
+
+2. CLHEP 1.4
+------------
+
+Geant4 1.0 requires the installation of CLHEP 1.4. 
+
+See <A href="http://wwwinfo.cern.ch/asd/lhc++/INSTALLATION/clhep.html">
+CLHEP 1.4</A>.  
+
+Be aware, for the platforms listed below, the standard CLHEP installation
+will use ISO-ANSI setup:
+
+  DEC: if using the compiler option "-std strict_ansi", it is required to
+       compile Geant4 in ISO-ANSI mode and 'native' STL.
+
+  NT: if CLHEP has been installed with the line:
+         #define HEP-USE-STD 1
+      uncommented in file config/CLHEP-x86-cygnus-win32, it is required to
+      compile Geant4 in ISO-ANSI mode and 'native' STL.
+
+
+
+3. The Standard Template Library
+--------------------------------
+
+The following versions of STL have been tested:
+
+   "Native" STL on: Linux, HP, DEC, SUN, NT.
+
+   ObjectSpace STL on
+          DEC, HP, NT and SUN.
+
+          See <A href="http://www.objectspace.com/">ObjectSpace</A>.
+
+This is selected at installation/compile time by the environment variable
+G4USE_OSPACE in the case of the latter - see documentation.
+
+NOTES:
+- Be aware that by default, the installation scripts will expect to use
+  the native STL implementation. You must set the G4USE_OSPACE variable
+  in the environment in order to select the ObjectSpace implementation.
+
+- Platforms specific setup:
+  o DEC: - Default: 'native' STL and ISO-ANSI setup.
+         - G4USE_OSPACE set: selects ObjectSpace STL (required)
+	                     and no ISO-ANSI setup.
+  o HP:  - Default: 'native' STL and ISO-ANSI setup.
+         - G4USE_OSPACE set: selects ObjectSpace STL (required)
+	                     and no ISO-ANSI setup.
+         - G4NO_STD_NAMESPACE set: either ObjectSpace or 'native' STL
+	                     can be used.
+  o SUN: - Default: 'native' STL and ISO-ANSI setup.
+                             This setup requires the CC compiler version 5.0.
+         - G4USE_OSPACE set: selects ObjectSpace STL (required)
+	                     and no ISO-ANSI setup.
+  o Linux: native STL is required. No ISO-ANSI setup.
+  o NT:  - Default: 'native' STL and ISO-ANSI setup.
+         - G4USE_OSPACE set: selects ObjectSpace STL (required)
+	                     and no ISO-ANSI setup.
+
+Geant4 1.1 requires the Standard Template Library.
+In the interest of stability, a significant part of the code still makes use
+of the "STL Interface" wrapper classes.  For these the emphasis has remained
+on correct behaviour, rather than performance.
+
+
+4. Persistency
+--------------
+
+- See release notes for Geant4 1.0.
+
+
+5. Compiler Specific Problems
+-----------------------------
+
+  o DEC V4.0, cxx C++ V6.1-027.
+
+      We have found cases of mis-compilation of min and max templates
+      on DEC.  We have traced those which cause serious malfunction
+      but there is no guarantee that there are no other cases.
+      Detailed inspection of assembler output suggests that this
+      problem might not be confined to min and max.  This has been
+      reported to DEC/Compaq.  We understand a new version 6.2 of the
+      compiler is now available.  However we cannot guarantee correct
+      execution of Geant4 on DEC with the current version of the
+      compiler.
+
+  o SUN Solaris 5.6, CC 5.0 patches 107357-07, 107311-09
+
+      The listed patches are required in order to fix a bug in the
+      system Standard I/O libraries for streams.
+      Part of the Geant4 code can be compiled only in debug mode (G4DEBUG
+      set). A bug in the compiler optimiser causes the compiler to run in
+      an infinite loop during compilation. Also, the inclusion of debug
+      symbols causes the generation of abnormally huge binary objects.
+      A bug report is being filed to SUN Support.
+
+  o NT
+
+      - Due to limitations of the VC++ optimiser, testing was done using
+        the debuggable version only.
+      - g3tog4 has not been ported to NT.
+      - During the making of dependency files during compilation there
+          are repeated warnings ("Strstrea.h not found") - this is an
+          artifact of using g++ for this purpose.
+      - Ignore linker warnings: "conflicts with use of other libs".
+      - Ignore linker errors: "unresolved external symbol
+          __imp__MessageBoxA@16". 
+
+6. Known Run-Time Problems
+--------------------------
+
+  o Reading STEP files on DEC with optimised libraries causes a Memory
+    fault - but see notes on DEC above.
+  o In rare cases heavy ions appear not to be properly stopped and killed
+    in tracking, therefore Geant4 sticks making many small steps. This
+    behaviour has been observed on SUN and is under investigation.
+  o On WindowsNT and DEC (ISO-ANSI setup), a problem can occur reading the data
+    files associated with the environment variable $NeutronHPCrossSections.
+    The problem is being investigated. 
+
+
+7. Compilation Warnings
+-----------------------
+
+There are compilation warnings on some platforms.  We do not believe
+that any will lead to incorrect run-time behaviour, however a parallel
+Q/A activity is on going to reduce them.
+
+
+8. Known Run-Time Warnings
+--------------------------
+
+The following messages can be written to error output while tracking.  We
+believe none give rise to incorrect behaviour.
+
+  o G4PropagatorInField::LocateIntersectionPoint: Warning: Integration
+      inaccuracy requires an adjustment in the step's endpoint Two
+      mid-points are further apart than their curve length difference:
+      Dist = xxx curve length = yyy
+  o Warning in G4Navigator::ComputeStep: The Step's starting point has
+      moved...
+  o G4PropagateInField: Warning: Particle is looping 
+    -  tracking in field will be stopped. 
+       It has performed 10000 steps in Field  while a maximum of 10000
+       are allowed. 
+
+For very high energy muons (ex. 1 TeV) warnings of this kind might be
+generated:
+
+  o G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+    Difference:  1e-09
+    G4ParticleChange::CheckIt 
diff --git a/config/G4VIS_BUILD.gmk b/config/G4VIS_BUILD.gmk
index 90e50ee836..c7a5e1c5cc 100644
--- a/config/G4VIS_BUILD.gmk
+++ b/config/G4VIS_BUILD.gmk
@@ -1,4 +1,4 @@
-# $Id: G4VIS_BUILD.gmk,v 1.2 1999/06/19 15:20:38 johna Exp $
+# $Id: G4VIS_BUILD.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
 # -------------------------------------------------------------
 # Visualization-specific CPPFLAGS for BUILD phase.
 #   John Allison, 24th January 1998.
@@ -17,6 +17,11 @@ ifdef G4VIS_BUILD_DAWNFILE_DRIVER
 endif
 # End of DAWN and DAWNFILE drivers 
 
+ifdef G4VIS_BUILD_RAYTRACER_DRIVER
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD_RAYTRACER_DRIVER
+endif
+
 ifdef G4VIS_BUILD_OPACS_DRIVER
   G4VIS_BUILD = 1
   G4INTY_BUILD_XT = 1
diff --git a/config/G4VIS_USE.gmk b/config/G4VIS_USE.gmk
index 0e2bb45cd1..2092fb7718 100644
--- a/config/G4VIS_USE.gmk
+++ b/config/G4VIS_USE.gmk
@@ -1,4 +1,4 @@
-# $Id: G4VIS_USE.gmk,v 1.2 1999/06/19 15:20:40 johna Exp $
+# $Id: G4VIS_USE.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.
 #   John Allison, 24th January 1998.
@@ -21,6 +21,13 @@ ifdef G4VIS_USE_DAWN_OR_DAWNFILE
   VISLIBS += -lG4FR
 endif
 
+ifdef G4VIS_USE_RAYTRACER
+  G4VIS_USE = 1
+  CPPFLAGS += -DG4VIS_USE_RAYTRACER
+  CPPFLAGS += -I$(G4BASE)/visualization/RayTracer/include
+  VISLIBS += -lG4RayTracer
+endif
+
 ifdef G4VIS_USE_OPACS
   G4VIS_USE  = 1
   INC_OPACS  = 1
diff --git a/config/History b/config/History
index 8bca936119..f9a7b856f6 100644
--- a/config/History
+++ b/config/History
@@ -1,5 +1,5 @@
-$Id: History,v 1.92 1999/12/07 08:51:38 gcosmo Exp $
-$Name: geant4-01-00 $
+$Id: History,v 1.97 2000/02/14 11:27:42 gcosmo Exp $
+$Name: geant4-01-01 $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,28 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+14th February 2000  Gabriele Cosmo (config-V01-00-02)
+- architecture.gmk: added option '+W823' to HP-aCC compilation setup to
+  discard warnings for macros parameter definition as used in the new
+  NIST STEP reader.
+- binmake.gmk: moved $EXTRALIBS to be included on top of the linking list,
+  just after the user application library.
+
+31st January 2000  Gabriele Cosmo (config-V01-00-01)
+- Added control for the Ray-tracer driver. Introduced G4VIS_USE_RAYTRACER
+  in G4VIS_USE.gmk and G4VIS_BUILD_RAYTRACER_DRIVER in G4VIS_BUILD.gmk (M.Asai).
+- binmake.gmk: fixed dependency order for compound libraries.
+  Moved -lG4particles and -lG4materials downstream in the list.
+- architecture.gmk: added G4NO_OPTIMISE for allowing compilation without
+  any level of optimisation or debug. G4DEBUG if defined takes precedence.
+  G4DEBUG and G4OPTIMISE are now defined also as CPPFLAGS.
+
+3rd January 2000  Gabriele Cosmo (config-V01-00-00)
+- Syncronized with HEAD.
+
+16th December 1999  John Allison
+- Cosmetic improvement to echo line in binmake.gmk.
+
 7th December 1999  Gabriele Cosmo (config-V00-01-19)
 - architecture.gmk: minor fix on OSPACELIBS path for Win/NT.
 
diff --git a/config/architecture.gmk b/config/architecture.gmk
index f0bdc063e8..68b75af8cf 100644
--- a/config/architecture.gmk
+++ b/config/architecture.gmk
@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.59 1999/12/07 08:37:13 gracia Exp $
+# $Id: architecture.gmk,v 1.62 2000/02/14 11:27:26 gcosmo Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -153,10 +153,17 @@ endif
 #
 ########################### end setup for G4ODBMS #############################
 
-# If G4DEBUG not specified, the default compilation is optimised ...
+# If G4DEBUG or G4NO_OPTIMISE are not specified,
+# the default compilation is optimised ...
 #
-ifndef G4DEBUG
-  G4OPTIMISE := 1
+ifdef G4DEBUG
+  CPPFLAGS += -DG4DEBUG
+  G4DEBUG := 1
+else
+  ifndef G4NO_OPTIMISE
+    CPPFLAGS += -DG4OPTIMISE
+    G4OPTIMISE := 1
+  endif
 endif
 
 # CLHEP path, etc.
@@ -362,9 +369,11 @@ ifeq ($(G4SYSTEM),SUN-CC)
   ifdef G4OPTIMISE
     CXXFLAGS  := -O
   else
-    CXXFLAGS  := -g
-    FCFLAGS := -g
-    CCFLAGS := -g
+    ifdef G4DEBUG
+      CXXFLAGS  := -g
+      FCFLAGS := -g
+      CCFLAGS := -g
+    endif
   endif
 #  CXXFLAGS += -fnonstd
   CFRONT_G4TEMPLATE_REPOSITORY  := true
@@ -407,9 +416,11 @@ ifeq ($(G4SYSTEM),SUN-CC5)
   ifdef G4OPTIMISE
     CXXFLAGS  := -O
   else
-    CXXFLAGS  := -g
-    FCFLAGS := -g
-    CCFLAGS := -g
+    ifdef G4DEBUG
+      CXXFLAGS  := -g
+      FCFLAGS := -g
+      CCFLAGS := -g
+    endif
   endif
 #  CXXFLAGS += -fnonstd
   G4_HAVE_BOOL := yes
@@ -461,11 +472,13 @@ ifeq ($(G4SYSTEM),HP-aCC)
   ifdef G4OPTIMISE
     CXXFLAGS  := +O2 +Onolimit
   else
-    CXXFLAGS := -g
-    FCFLAGS  := -g
-    CCFLAGS  := -g
+    ifdef G4DEBUG
+      CXXFLAGS := -g
+      FCFLAGS  := -g
+      CCFLAGS  := -g
+    endif
   endif
-  CXXFLAGS += +DAportable
+  CXXFLAGS += +DAportable +W823
   CPPFLAGS += -I/usr
   ifdef G4MAKESHLIB
     CXXFLAGS += +Z
@@ -509,9 +522,11 @@ ifeq ($(G4SYSTEM),SGI-CC)
   ifdef G4OPTIMISE
     CXXFLAGS  := -O -OPT:Olimit=5000
   else
-    CXXFLAGS  := -g 
-    FCFLAGS   := -g
-    CCFLAGS   := -g
+    ifdef G4DEBUG
+      CXXFLAGS  := -g 
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
   endif
   G4_HAVE_BOOL := yes
   CXXFLAGS  += -ptused
@@ -543,9 +558,11 @@ ifeq ($(G4SYSTEM),AIX-xlC)
   ifdef G4OPTIMISE
     CXXFLAGS  := -O3 -qtwolink -+
   else
-    CXXFLAGS  := -g -qdbxextra -qcheck=all -qfullpath -qtwolink -+
-    FCFLAGS := -g
-    CCFLAGS := -g
+    ifdef G4DEBUG
+      CXXFLAGS  := -g -qdbxextra -qcheck=all -qfullpath -qtwolink -+
+      FCFLAGS := -g
+      CCFLAGS := -g
+    endif
   endif
   FC := xlf
   FCFLAGS += -qextname
@@ -578,9 +595,11 @@ ifeq ($(G4SYSTEM),DEC-cxx)
   ifdef G4OPTIMISE
     CXXFLAGS	:= -O
   else
-    CXXFLAGS	:= -gall
-    FCFLAGS	:= -g
-    CCFLAGS     := -g
+    ifdef G4DEBUG
+      CXXFLAGS	:= -gall
+      FCFLAGS	:= -g
+      CCFLAGS   := -g
+    endif
   endif
   G4_HAVE_BOOL  := yes
   CXXFLAGS	+= -ieee -timplicit_local
@@ -621,9 +640,11 @@ ifeq ($(G4SYSTEM),Linux-g++)
     FCFLAGS   := -O
     CCFLAGS   := -O
   else
-    CXXFLAGS  += -g
-    FCFLAGS   := -g
-    CCFLAGS   := -g
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
   endif
   ifdef G4MAKESHLIB
     CXXFLAGS  += -fPIC
@@ -664,7 +685,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   ifdef G4OPTIMISE
     CXXFLAGS  += -Ox
   else
-    CXXFLAGS  += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
+    ifdef G4DEBUG
+      CXXFLAGS  += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
+    endif
   endif
   CXXFLAGS += -MD -GX -Zm200 -nologo -DWIN32 -D_CONSOLE 
   CXXFLAGS += -D_WIN32 -DOS
@@ -674,10 +697,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   #
   ifdef G4USE_OSPACE
     CXXFLAGS += $(OSPACEINC)
-  else
+  else 
     ifdef G4USE_STLPORT
       CXXFLAGS += $(OSPACEINC)
-    endif   #stlport
+    else
+  #  If native STL is selected, use ISO standard version.
+      G4USE_STD_NAMESPACE := yes 
+      CPPFLAGS += -DG4USE_STD_NAMESPACE
+    endif
   endif   #ospace
 
   LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
diff --git a/config/binmake.gmk b/config/binmake.gmk
index a9d5307dcd..ad69859671 100644
--- a/config/binmake.gmk
+++ b/config/binmake.gmk
@@ -1,4 +1,4 @@
-# $Id: binmake.gmk,v 1.39 1999/12/01 14:40:43 morita Exp $
+# $Id: binmake.gmk,v 1.42 2000/02/14 11:24:45 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #                          Gabriele Cosmo, 25/06/1998.
@@ -124,8 +124,9 @@ ifndef USER_DEFINED_LDLIBS
 ifdef G4EXLIB
   LDLIBS1 := -l$(G4TARGET)
 endif
+LDLIBS1 += $(EXTRALIBS)
 
-# VISLIBS and UILIBS are now handles by the granular library script...
+# VISLIBS and UILIBS are now handled by the granular library script...
 #
 ifdef GLOBALLIBS
   LDLIBS1 += $(VISLIBS) $(UILIBS)
@@ -142,11 +143,11 @@ ifdef GLOBALLIBS
              -lG4event \
              -lG4tracking \
              -lG4processes \
-             -lG4particles \
              -lG4digits+hits \
              -lG4track \
-             -lG4materials \
+             -lG4particles \
              -lG4geometry \
+             -lG4materials \
              -lG4graphics_reps \
              -lG4intercoms \
              -lG4global
@@ -188,7 +189,6 @@ ifdef G4USE_OSPACE
   LDLIBS4 += $(OSPACELIBS)
 endif
 
-LDLIBS4 += $(EXTRALIBS)
 LDLIBS4 += $(LOADLIBS)
 
 # Finally assemble libraries...
@@ -228,7 +228,7 @@ bin: $(G4BINDIR)/$(G4TARGET)
 $(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
 ifndef USER_DEFINED_LDLIBS
   ifndef GLOBALLIBS
-	@echo "Using granular libraries."
+	@echo "Using granular libraries ..."
 	@if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
 	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
 	  echo "ERROR: No liblist program or library map file."; \
diff --git a/environments/OPACS/app/EXPO.cc b/environments/OPACS/app/EXPO.cc
index e6f0228853..881e7490f1 100644
--- a/environments/OPACS/app/EXPO.cc
+++ b/environments/OPACS/app/EXPO.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: EXPO.cc,v 1.5.2.1.2.1 1999/12/07 20:46:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/app/TEST.cc b/environments/OPACS/app/TEST.cc
index 0d2a454adb..6a93bb1401 100644
--- a/environments/OPACS/app/TEST.cc
+++ b/environments/OPACS/app/TEST.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TEST.cc,v 1.2.6.1 1999/12/07 20:46:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/include/EXPO_Detector.icc b/environments/OPACS/include/EXPO_Detector.icc
index 33bd22d744..d93a829609 100644
--- a/environments/OPACS/include/EXPO_Detector.icc
+++ b/environments/OPACS/include/EXPO_Detector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: EXPO_Detector.icc,v 1.2.6.1 1999/12/07 20:46:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  See also G4/run/example/MyDetectorConstruction.cc.
 
diff --git a/environments/OPACS/include/EXPO_PhysicsList.hh b/environments/OPACS/include/EXPO_PhysicsList.hh
index 0ff9a4b174..f6a78c6b83 100644
--- a/environments/OPACS/include/EXPO_PhysicsList.hh
+++ b/environments/OPACS/include/EXPO_PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: EXPO_PhysicsList.hh,v 1.3.6.1 1999/12/07 20:46:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/environments/OPACS/include/EXPO_PhysicsList.icc b/environments/OPACS/include/EXPO_PhysicsList.icc
index 9ede675e20..c3882e9344 100644
--- a/environments/OPACS/include/EXPO_PhysicsList.icc
+++ b/environments/OPACS/include/EXPO_PhysicsList.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: EXPO_PhysicsList.icc,v 1.3.6.1 1999/12/07 20:46:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: EXPO_PhysicsList.icc,v 1.3.6.1.2.3 1999/12/14 07:06:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -29,7 +29,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 
 EXPO_PhysicsList::EXPO_PhysicsList():  G4VUserPhysicsList()
@@ -262,7 +262,7 @@ void EXPO_PhysicsList::SetCuts()
 /*	
   if (verboseLevel >0){
     G4cout << "EXPO_PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << cut/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << cut/mm << " (mm)" << G4endl;
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
diff --git a/environments/OPACS/include/EXPO_Primary.icc b/environments/OPACS/include/EXPO_Primary.icc
index 51641fb2e2..67c94bdf4b 100644
--- a/environments/OPACS/include/EXPO_Primary.icc
+++ b/environments/OPACS/include/EXPO_Primary.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: EXPO_Primary.icc,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  See also G4/run/example/EXPO_PrimaryGeneratorAction.cc.
 
diff --git a/environments/OPACS/include/G4o.h b/environments/OPACS/include/G4o.h
index 34fffeb5d3..573e2cf8d0 100644
--- a/environments/OPACS/include/G4o.h
+++ b/environments/OPACS/include/G4o.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4o.h,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oCommon.hh b/environments/OPACS/include/G4oCommon.hh
index 06103cc6b2..c0e2c3c16d 100644
--- a/environments/OPACS/include/G4oCommon.hh
+++ b/environments/OPACS/include/G4oCommon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.hh,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.h.
diff --git a/environments/OPACS/include/G4oCommon.icc b/environments/OPACS/include/G4oCommon.icc
index 2821351f6b..493b4d4ca6 100644
--- a/environments/OPACS/include/G4oCommon.icc
+++ b/environments/OPACS/include/G4oCommon.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.icc,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.cc.
diff --git a/environments/OPACS/include/G4oDrawer.hh b/environments/OPACS/include/G4oDrawer.hh
index a539c796cc..b8f22bdfa3 100644
--- a/environments/OPACS/include/G4oDrawer.hh
+++ b/environments/OPACS/include/G4oDrawer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oDrawer.hh,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oEXPO.h b/environments/OPACS/include/G4oEXPO.h
index 594e15fb05..52e212c828 100644
--- a/environments/OPACS/include/G4oEXPO.h
+++ b/environments/OPACS/include/G4oEXPO.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oEXPO.h,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oScene.hh b/environments/OPACS/include/G4oScene.hh
index b88d91930f..295b58023c 100644
--- a/environments/OPACS/include/G4oScene.hh
+++ b/environments/OPACS/include/G4oScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oScene.hh,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oState.hh b/environments/OPACS/include/G4oState.hh
index 372c4c22f8..46414804cf 100644
--- a/environments/OPACS/include/G4oState.hh
+++ b/environments/OPACS/include/G4oState.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oState.hh,v 1.3.4.1 1999/12/07 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4oState_h
 #define G4oState_h 
diff --git a/environments/OPACS/include/WoG4o.h b/environments/OPACS/include/WoG4o.h
index 2918f3f94c..22993fce38 100644
--- a/environments/OPACS/include/WoG4o.h
+++ b/environments/OPACS/include/WoG4o.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: WoG4o.h,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/src/G4o.cc b/environments/OPACS/src/G4o.cc
index 3afb1834cb..d22174aa55 100644
--- a/environments/OPACS/src/G4o.cc
+++ b/environments/OPACS/src/G4o.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4o.cc,v 1.4.2.1.2.1 1999/12/07 20:46:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
 #define DEBUG
diff --git a/environments/OPACS/src/G4oDrawer.cc b/environments/OPACS/src/G4oDrawer.cc
index 7695229ccc..06c5609634 100644
--- a/environments/OPACS/src/G4oDrawer.cc
+++ b/environments/OPACS/src/G4oDrawer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oDrawer.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
   From geant4/visualization/management/src/G4VisManager.cc.
diff --git a/environments/OPACS/src/G4oScene.cc b/environments/OPACS/src/G4oScene.cc
index 2372989166..d9a7850ca7 100644
--- a/environments/OPACS/src/G4oScene.cc
+++ b/environments/OPACS/src/G4oScene.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oScene.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/src/G4oState.cc b/environments/OPACS/src/G4oState.cc
index 70ceead330..a507ab36f0 100644
--- a/environments/OPACS/src/G4oState.cc
+++ b/environments/OPACS/src/G4oState.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oState.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //#define DEBUG
 
diff --git a/examples/History b/examples/History
index f8db368b0a..b7913b1fea 100644
--- a/examples/History
+++ b/examples/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.37 1999/12/07 11:33:51 stesting Exp $
+$Id: History,v 1.42 2000/02/18 13:23:04 stesting Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,36 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+14th February 2000  Michel Maire (tag examples-V01-00-01a by John Allison)
+- Changed cout to G4cout in extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
+
+13th February 2000  John Allison  (examples-V01-00-01)
+- Updated N03 and N04.EMtest.out for geant4-01-00-ref-04-tags6.
+
+24th January 2000  John Allison
+- N02/03: Limited printing in ExNnnEventAction::EndOfEventAction to first
+  100 events and then every 100.
+
+21st January 2000  John Allison
+- Added large_N.in files in examples/novice.
+- Temporarily reduced no of events in N04  due to slow 10 Tev muons.
+
+20th January 2000  John Allison
+- Tagged extended/electromagnetic testem-V01-00-00.
+  o implemented G4NOHIST (Michel Maire).
+  o new TestEm6 (low energy): TestEm6.in contains protons, anti_protons,
+    ionC12 (Vladimir Ivanchenko).
+
+13th January 2000  John Allison  (examples-V01-00-00)
+- N02, N03: Introduced ExN0nSteppingVerbose (Michel Maire).
+- N04: Introduced 10 TeV mu- in exampleN04.EMtest.in (John Apostolakis).
+- N05, N06: (Gabriele Cosmo):
+  Replaced #include "G4Timer.hh" by class G4Timer in ExN0nRunAction.hh.
+  Added #include "G4Timer.hh" as first #include in ExN0nRunAction.cc.
+- Updated PersistentEx01.out and PersistentEx02.out for geant4-01-00-ref-01/2.
+- N02, N03, N04, N04.EMtest, N05, N06: updated .out files for -ref-02.
+- N04.EMtest.in: reduced number of events from 100 to 10 for 10 TeV mu-.
+
 7th December 1999  John Allison  (examples-V00-01-19)
 - Updated novice .out files to geant4-01-00.
 
diff --git a/examples/extended/electromagnetic/TestEm1/GNUmakefile b/examples/extended/electromagnetic/TestEm1/GNUmakefile
index c68517acb4..ac7fcb3388 100644
--- a/examples/extended/electromagnetic/TestEm1/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm1/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/10/11 13:07:23 maire Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/21 12:29:24 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,7 +16,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm1/History b/examples/extended/electromagnetic/TestEm1/History
index e1638d57d2..6add39611f 100644
--- a/examples/extended/electromagnetic/TestEm1/History
+++ b/examples/extended/electromagnetic/TestEm1/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.2 1999/10/11 13:14:31 maire Exp $
+$Id: History,v 1.3 2000/01/21 12:29:24 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -14,6 +14,8 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+21-01-00  cppflag G4NOHIST to protect hbook histograms.
+          
 11-10-99  moved from: source/processes/electromagnetic/test
           to: examples/extended/electromagnetic
      
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.cc b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
index c468a0f7d8..9f8cca48c4 100644
--- a/examples/extended/electromagnetic/TestEm1/TestEm1.cc
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: TestEm1.cc,v 1.1.4.1 1999/12/07 20:46:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: TestEm1.cc,v 1.3 1999/12/15 14:48:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -30,6 +30,7 @@
 #include "Em1DetectorConstruction.hh"
 #include "Em1PhysicsList.hh"
 #include "Em1PrimaryGeneratorAction.hh"
+#include "Em1SteppingVerbose.hh"
 
 #ifdef Em1NoOptimize
  #include "Em1RunAction.hh"
@@ -47,6 +48,9 @@ int main(int argc,char** argv) {
   //choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
   
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new Em1SteppingVerbose);
+    
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.in b/examples/extended/electromagnetic/TestEm1/TestEm1.in
new file mode 100644
index 0000000000..c9921e26ec
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.in
@@ -0,0 +1,20 @@
+# $Id: TestEm1.in,v 1.1 2000/01/21 14:58:58 maire Exp $
+#
+# Macro file for "TestEm1.cc"
+# (can be run in batch, without graphic)
+#
+# electron 100 MeV; all processes
+#
+/control/verbose 2
+#
+/process/eLoss/StepFunction 0.183 170 micrometer
+/calor/cutG 2.20 mm
+/calor/cutE 6.05 mum 
+/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+#
+/gun/particle e-
+/gun/energy 100 MeV
+/run/beamOn 100
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.out b/examples/extended/electromagnetic/TestEm1/TestEm1.out
new file mode 100644
index 0000000000..e6d97fc269
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.out
@@ -0,0 +1,241 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+Constructing Visualization Manager....
+Initialising Visualization Manager....
+Registering graphics systems....
+
+***** Table : Nb of materials = 8 *****
+
+ Material:      Air     density:  1.290 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 285.161 m  
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+ Material: H2liquid     density: 70.800 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.923 m  
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:    Water     density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material: liquidArgon     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+   --->  Element: liquidArgon      Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: Aluminium     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+   --->  Element: Aluminium      Z = 13.0   N =  27.0   A =  26.98 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Iron     density:  7.870 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.759 cm 
+   --->  Element:     Iron      Z = 26.0   N =  55.9   A =  55.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+   --->  Element:     Lead      Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:  Uranium     density: 18.950 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.861 mm 
+   --->  Element:  Uranium      Z = 82.0   N = 238.0   A = 238.03 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+
+
+ The Box is 20 m   of Aluminium
+Em1PhysicsList::SetCuts:CutLength : 1 (mm)
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  1 mm            1 mm            1 mm            1 mm            1 mm 
+Cut in energy
+                Air         990 eV          990 eV         48.4 keV        83.2 keV         990 eV 
+           H2liquid         990 eV          108 keV        1.23 MeV        3.18 MeV         990 eV 
+              Water         2.9 keV         347 keV        3.39 MeV        8.95 MeV         990 eV 
+        liquidArgon        6.18 keV         343 keV        3.24 MeV        8.32 MeV         990 eV 
+          Aluminium        6.89 keV         597 keV        5.02 MeV        13.1 MeV         990 eV 
+               Iron        20.8 keV        1.28 MeV        8.52 MeV          22 MeV         990 eV 
+               Lead         101 keV        1.38 MeV        8.52 MeV        20.9 MeV         990 eV 
+            Uranium         110 keV        1.92 MeV        10.5 MeV        26.1 MeV         990 eV 
+===================================================
+# $Id: TestEm1.out,v 1.1 2000/01/21 14:58:58 maire Exp $
+#
+# Macro file for "TestEm1.cc"
+# (can be run in batch, without graphic)
+#
+# electron 100 MeV; all processes
+#
+#
+/process/eLoss/StepFunction 0.183 170 micrometer
+/calor/cutG 2.20 mm
+/calor/cutE 6.05 mum 
+/run/initialize
+Em1PhysicsList::SetCuts:CutLength : 1 (mm)
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                2.2 mm         6.05 mum           1 mm            1 mm            1 mm 
+Cut in energy
+                Air         990 eV          990 eV         48.4 keV        83.2 keV         990 eV 
+           H2liquid         990 eV          990 eV         1.23 MeV        3.18 MeV         990 eV 
+              Water        4.06 keV        3.27 keV        3.39 MeV        8.95 MeV         990 eV 
+        liquidArgon        9.08 keV        3.98 keV        3.24 MeV        8.32 MeV         990 eV 
+          Aluminium        9.99 keV        9.97 keV        5.02 MeV        13.1 MeV         990 eV 
+               Iron        31.1 keV        43.3 keV        8.52 MeV          22 MeV         990 eV 
+               Lead         124 keV        42.8 keV        8.52 MeV        20.9 MeV         990 eV 
+            Uranium         143 keV        53.4 keV        10.5 MeV        26.1 MeV         990 eV 
+===================================================
+#
+/run/verbose 2
+/event/drawTracks none
+#
+/gun/particle e-
+/gun/energy 100 MeV
+/run/beamOn 100
+### Run 0 start.
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 9876, 54321
+----------------------------------------
+Start closing geometry.
+Start Run processing.
+
+---> Begin of Event: 0
+Run terminated.
+Run Summary
+  Number of events processed : 100
+  User=11s Real=13s Sys=1.6s
+
+ nb tracks/event   neutral:   24.64   charged:  642.10
+ nb  steps/event   neutral:  135.32   charged: 1276.54
+
+ nb of process calls per event: 
+       eIoni    eBrem     phot    compt     conv  annihil
+     1253.39    21.62    23.11   110.68     1.53     1.53
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 1096809697, 1350310764
+----------------------------------------
+Graphics systems deleted.
+VisManager deleting.
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
index d1ca337fcc..5ff33b00b4 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1DetectorConstruction.hh,v 1.1.4.1 1999/12/07 20:46:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1DetectorConstruction.hh,v 1.2 1999/12/15 14:48:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
index 264e20b325..0298bc3b6f 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1DetectorMessenger.hh,v 1.1.4.1 1999/12/07 20:46:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1DetectorMessenger.hh,v 1.2 1999/12/15 14:48:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
index c203d05dfa..f8558818d8 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1EventAction.hh,v 1.1.4.1 1999/12/07 20:46:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1EventAction.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
index dca500dcdd..4269ab257c 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1EventActionMessenger.hh,v 1.1.4.1 1999/12/07 20:46:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1EventActionMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
index 57ce325e1c..589aa9e2bf 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PhysicsList.hh,v 1.1.4.1 1999/12/07 20:46:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PhysicsList.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
index b4b5810cbc..47cb5f223f 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PhysicsListMessenger.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PhysicsListMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
index 586087a6d8..3895dfd69f 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PrimaryGeneratorAction.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
index 183ba5c0d4..df73646f6d 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1RunAction.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1RunAction.hh,v 1.3 2000/01/21 12:29:25 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -24,8 +24,11 @@
 
 class G4Run;
 class Em1RunActionMessenger;
-class HepTupleManager;
-class HepHistogram;
+
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
 
 class Em1RunAction : public G4UserRunAction
 {
@@ -43,12 +46,14 @@ class Em1RunAction : public G4UserRunAction
     void CountSteps1(G4int ns) { NbOfSteps1 += ns;}
     void CountProcesses(G4String);
     
-  public:  
-    HepHistogram* GetHisto(G4int id) {return histo[id];}
-    
+  public:
     void  SetRndmFreq(G4int val) {saveRndm = val;}
-    G4int GetRndmFreq()          {return saveRndm;}    
-       
+    G4int GetRndmFreq()          {return saveRndm;}
+        
+#ifndef G4NOHIST   
+    HepHistogram* GetHisto(G4int id) {return histo[id];}
+#endif
+           
   private:  
     void bookHisto();
     void cleanHisto();
@@ -57,12 +62,14 @@ class Em1RunAction : public G4UserRunAction
     G4int NbOfTraks0, NbOfTraks1;
     G4int NbOfSteps0, NbOfSteps1;
     ProcessesCount*   ProcCounter;
+
+    Em1RunActionMessenger* runMessenger;    
+    G4int saveRndm;
     
+#ifndef G4NOHIST       
     HepTupleManager* hbookManager;
     HepHistogram* histo[3];
-    
-    Em1RunActionMessenger* runMessenger;    
-    G4int saveRndm;             
+#endif                     
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
index 157849e8c1..bd438336e9 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1RunActionMessenger.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1RunActionMessenger.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
index d350ee702e..8eab8a091b 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1SteppingAction.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1SteppingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
new file mode 100644
index 0000000000..072df318e0
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em1SteppingVerbose.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em1SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em1SteppingVerbose;
+
+#ifndef Em1SteppingVerbose_h
+#define Em1SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em1SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  Em1SteppingVerbose();
+ ~Em1SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
index f30ea31bb7..a20d133f17 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1TrackingAction.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1TrackingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
index 419ba32a74..ff623cf4b6 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1VisManager.hh,v 1.1.4.1 1999/12/07 20:46:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1VisManager.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
index 44ba68008d..f2c4c6d324 100644
--- a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ProcessesCount.hh,v 1.1.2.1.2.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ProcessesCount.hh,v 1.3 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -----------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm1/init.mac b/examples/extended/electromagnetic/TestEm1/init.mac
index a0a21c8930..cbd6c6cd72 100644
--- a/examples/extended/electromagnetic/TestEm1/init.mac
+++ b/examples/extended/electromagnetic/TestEm1/init.mac
@@ -38,4 +38,7 @@
 /tracking/storeTrajectory 1
 /event/drawTracks all
 #
+# Flush visualization
+/vis/viewer/update
+#
 /run/verbose 2
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
index f2fd5c4ad3..f2f331007f 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1DetectorConstruction.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1DetectorConstruction.cc,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -122,7 +122,7 @@ a = 238.03*g/mole;
 G4Material*  U = new G4Material(name="Uranium"     , z=82., a, density);
 
 
-G4cout << *(G4Material::GetMaterialTable()) << endl;
+G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //default materials of the calorimeter
   aMaterial = Al;
@@ -169,7 +169,7 @@ G4VPhysicalVolume* Em1DetectorConstruction::ConstructVolumes()
 void Em1DetectorConstruction::PrintParameters()
 {
   G4cout << "\n The Box is " << G4BestUnit(BoxSize,"Length")
-         << " of " << aMaterial->GetName() << endl;
+         << " of " << aMaterial->GetName() << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
index 13ae449d61..6cb3742bed 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1DetectorMessenger.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1DetectorMessenger.cc,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
index ce5a9cbbf3..ddefb2b302 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1EventAction.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1EventAction.cc,v 1.2 1999/12/15 14:48:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -48,7 +48,7 @@ void Em1EventAction::BeginOfEventAction(const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin of Event: " << evtNb << endl;
+    G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
     
  TotalEnergyDeposit = 0.;}
 
@@ -58,7 +58,7 @@ void Em1EventAction::EndOfEventAction(const G4Event* evt)
 {
   if (drawFlag != "none") G4cout << " Energy deposit: " 
                                  << G4BestUnit(TotalEnergyDeposit,"Energy")
-                                 << endl;
+                                 << G4endl;
 
   if (G4VVisManager::GetConcreteInstance())
   {
@@ -81,7 +81,7 @@ void Em1EventAction::EndOfEventAction(const G4Event* evt)
      G4int evtNb = evt->GetEventID();
      if (evtNb%printModulo == 0)
        { 
-        G4cout << "\n---> End of Event: " << evtNb << endl;
+        G4cout << "\n---> End of Event: " << evtNb << G4endl;
         HepRandom::showEngineStatus();
        }
     }     
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
index b46baabc2d..8901dc69e9 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1EventActionMessenger.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1EventActionMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
index cc9d203c0b..51c1d4d6b9 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PhysicsList.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PhysicsList.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -227,7 +227,7 @@ void Em1PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "Em1PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
@@ -314,10 +314,10 @@ void Em1PhysicsList::GetRange(G4double val)
   G4double cut;
   part = theParticleTable->FindParticle("e-");
   cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  G4cout << "material : " << currMat->GetName() << endl;
-  G4cout << "particle : " << part->GetParticleName() << endl;
-  G4cout << "energy   : " << val / keV << " (keV)" << endl;
-  G4cout << "range    : " << cut / mm << " (mm)" << endl;
+  G4cout << "material : " << currMat->GetName() << G4endl;
+  G4cout << "particle : " << part->GetParticleName() << G4endl;
+  G4cout << "energy   : " << val / keV << " (keV)" << G4endl;
+  G4cout << "range    : " << cut / mm << " (mm)" << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
index db776161e0..43bd753a36 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PhysicsListMessenger.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PhysicsListMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
index bcf6773553..c15c57291a 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1PrimaryGeneratorAction.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
index cf2c6f6021..e4392f46e2 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1RunAction.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1RunAction.cc,v 1.4 2000/01/21 12:29:26 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -20,17 +20,23 @@
 #include "G4UImanager.hh"
 #include "G4VVisManager.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 #include "Randomize.hh"
-#include "CLHEP/Hist/HBookFile.h"
+
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em1RunAction::Em1RunAction()
-:hbookManager(NULL)
 {runMessenger = new Em1RunActionMessenger(this);
  saveRndm = 1;
+ 
+#ifndef G4NOHIST
+ hbookManager = NULL;
+#endif 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -44,27 +50,31 @@ Em1RunAction::~Em1RunAction()
 
 void Em1RunAction::bookHisto()
 {
+#ifndef G4NOHIST
   hbookManager = new HBookFile("testem1.histo", 68);
 
   // booking histograms
   histo[0] = hbookManager->histogram("track length (mm) of a charged particle",100,0.,50*cm);
   histo[1] = hbookManager->histogram("Nb of steps per track (charged particle)",100,0.,100.);
   histo[2] = hbookManager->histogram("step length (mm) charged particle",100,0.,10*mm);
+#endif   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em1RunAction::cleanHisto()
 {
+#ifndef G4NOHIST
   delete [] histo;
   delete hbookManager;
+#endif   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em1RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   // save Rndm status
   if (saveRndm > 0)
@@ -82,8 +92,7 @@ void Em1RunAction::BeginOfRunAction(const G4Run* aRun)
   if (G4VVisManager::GetConcreteInstance())
     {
       G4UImanager* UI = G4UImanager::GetUIpointer(); 
-      UI->ApplyCommand("/vis/clear/view");
-      UI->ApplyCommand("/vis/draw/current");
+      UI->ApplyCommand("/vis/scene/notifyHandlers");
     }
 }
 
@@ -109,28 +118,28 @@ void Em1RunAction::EndOfRunAction(const G4Run* aRun)
     { //nb of tracks and steps per event
       G4double dNbOfEvents = double(NbOfEvents);
     
-      G4long oldform = G4cout.setf(ios::fixed,ios::floatfield);
+      G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
       G4int  oldprec = G4cout.precision(2);
       
       G4cout << "\n nb tracks/event"
-                      << "   neutral: " << setw(7) << NbOfTraks0/dNbOfEvents
-                      << "   charged: " << setw(7) << NbOfTraks1/dNbOfEvents
+                      << "   neutral: " << G4std::setw(7) << NbOfTraks0/dNbOfEvents
+                      << "   charged: " << G4std::setw(7) << NbOfTraks1/dNbOfEvents
              << "\n nb  steps/event"
-                      << "   neutral: " << setw(7) << NbOfSteps0/dNbOfEvents
-                      << "   charged: " << setw(7) << NbOfSteps1/dNbOfEvents
-             << endl;
+                      << "   neutral: " << G4std::setw(7) << NbOfSteps0/dNbOfEvents
+                      << "   charged: " << G4std::setw(7) << NbOfSteps1/dNbOfEvents
+             << G4endl;
       
       //frequency of processes call       
       G4cout << "\n nb of process calls per event: \n   ";       
       for (G4int i=0; i< ProcCounter->entries();i++)
-           G4cout << setw(9) << (*ProcCounter)[i]->GetName();
+           G4cout << G4std::setw(9) << (*ProcCounter)[i]->GetName();
            
       G4cout << "\n   ";       
       for (G4int j=0; j< ProcCounter->entries();j++)
-           G4cout << setw(9) << ((*ProcCounter)[j]->GetCounter())/dNbOfEvents;
-      G4cout << endl;    
+           G4cout << G4std::setw(9) << ((*ProcCounter)[j]->GetCounter())/dNbOfEvents;
+      G4cout << G4endl;    
                          
-      G4cout.setf(oldform,ios::floatfield);
+      G4cout.setf(oldform,G4std::ios::floatfield);
       G4cout.precision(oldprec);       
     }         
    
@@ -138,16 +147,18 @@ void Em1RunAction::EndOfRunAction(const G4Run* aRun)
                              
   //draw the events
   if (G4VVisManager::GetConcreteInstance()) 
-     G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
-     
-  // writing histogram file
-  hbookManager->write();
-  
+     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
+
   // save Rndm status
   if (saveRndm == 1)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
-    }         
+    }
+    
+#ifndef G4NOHIST     
+  // writing histogram file
+  hbookManager->write();
+#endif               
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
index 991bf9050f..c079bb4f14 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1RunActionMessenger.cc,v 1.1.4.1 1999/12/07 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1RunActionMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -63,7 +63,7 @@ void Em1RunActionMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
       Em1Run->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValue));
 		 
   if (command == RndmReadCmd)
-    { G4cout << "\n---> rndm status restored from file: " << newValue << endl;
+    { G4cout << "\n---> rndm status restored from file: " << newValue << G4endl;
       HepRandom::restoreEngineStatus(newValue);
       HepRandom::showEngineStatus();
     }   
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
index c3b834e799..130ff0db89 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1SteppingAction.cc,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1SteppingAction.cc,v 1.3 2000/01/21 12:29:26 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -19,7 +19,9 @@
 #include "G4SteppingManager.hh"
 #include "G4VProcess.hh"
 
-#include "CLHEP/Hist/HBookFile.h"
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -44,7 +46,10 @@ void Em1SteppingAction::UserSteppingAction(const G4Step* aStep)
  
  G4double charge  = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
  G4double steplen = aStep->GetStepLength();
- if (charge != 0.) runAction->GetHisto(2)->accumulate(steplen);                   
+ 
+#ifndef G4NOHIST 
+ if (charge != 0.) runAction->GetHisto(2)->accumulate(steplen);
+#endif                    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
new file mode 100644
index 0000000000..58008786fd
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em1SteppingVerbose.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em1SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em1SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em1SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em1SteppingVerbose::Em1SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em1SteppingVerbose::~Em1SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em1SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em1SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
index 733b7112b9..5369ad9d16 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1TrackingAction.cc,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1TrackingAction.cc,v 1.3 2000/01/21 12:29:26 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -18,8 +18,10 @@
 #include "Em1RunAction.hh"
 
 #include "G4Track.hh"
-
-#include "CLHEP/Hist/HBookFile.h"
+ 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -40,8 +42,10 @@ void Em1TrackingAction::PostUserTrackingAction(const G4Track* aTrack)
   if (aTrack->GetDefinition()->GetPDGCharge() == 0.)
        {runAction->CountTraks0(1); runAction->CountSteps0(nbSteps);}
   else {runAction->CountTraks1(1); runAction->CountSteps1(nbSteps);
+#ifndef G4NOHIST  
         runAction->GetHisto(0)->accumulate(Trleng);
         runAction->GetHisto(1)->accumulate((float)nbSteps);
+#endif	
   }    
 }
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc b/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
index facb40a0d2..4a379420db 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1VisManager.cc,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em1VisManager.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -131,7 +131,7 @@ void Em1VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm2/GNUmakefile b/examples/extended/electromagnetic/TestEm2/GNUmakefile
index 3fed31cb43..034db6a284 100644
--- a/examples/extended/electromagnetic/TestEm2/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm2/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/10/11 15:08:23 maire Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/21 10:56:13 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,7 +16,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm2/README b/examples/extended/electromagnetic/TestEm2/README
index c2376f198e..a3da41f64a 100644
--- a/examples/extended/electromagnetic/TestEm2/README
+++ b/examples/extended/electromagnetic/TestEm2/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/10/11 15:08:24 maire Exp $
+$Id: README,v 1.2 2000/01/21 10:56:13 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -87,8 +87,7 @@ $Id: README,v 1.1 1999/10/11 15:08:24 maire Exp $
  	
  7- HISTOGRAMS
  
-     Testem2 produces several histo which are saved as testem2.histo
-     under the control of the command /run/save on
+     TestEm2 produces several histo which are saved as testem2.histo
      
      Content of these histo:
   
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.cc b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
index d2ee32d1dd..8754a83ba9 100644
--- a/examples/extended/electromagnetic/TestEm2/TestEm2.cc
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: TestEm2.cc,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: TestEm2.cc,v 1.3 1999/12/15 14:48:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Comments
 //
@@ -29,12 +29,16 @@
 #include "Em2EventAction.hh"
 #include "Em2TrackingAction.hh"
 #include "Em2SteppingAction.hh"
+#include "Em2SteppingVerbose.hh"
 
 int main(int argc,char** argv) {
  
   //choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
-   
+  
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new Em2SteppingVerbose);
+     
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.in b/examples/extended/electromagnetic/TestEm2/TestEm2.in
new file mode 100644
index 0000000000..1c6359054a
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.in
@@ -0,0 +1,29 @@
+# $Id: TestEm2.in,v 1.1 2000/01/21 14:40:57 maire Exp $
+#
+# Macro file for "TestEm2.cc" 
+# (can be run in batch, without graphic)
+#
+# H2O L = 9.97 radl  R = 0.665 radl; electron 1 GeV
+#
+#  Experimental results: Electron-induced cascade showers
+#                        J&H Crannel - Phys. Rev. 184-2 - August69
+#
+/control/verbose 2
+#
+/calor/setMat Water
+/calor/setLbin 9 1.11
+/calor/setRbin 6 0.111
+/calor/update
+#
+/run/particle/setCut 5.0 mm
+/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 20
+#
+/gun/particle electron
+/gun/energy 1 GeV
+/run/beamOn 100
+
+
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.out b/examples/extended/electromagnetic/TestEm2/TestEm2.out
new file mode 100644
index 0000000000..0b99753fc7
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.out
@@ -0,0 +1,335 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+Constructing Visualization Manager....
+Initialising Visualization Manager....
+Registering graphics systems....
+
+***** Table : Nb of materials = 8 *****
+
+ Material:      Air     density:  1.290 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 285.161 m  
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+ Material:    Water     density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material:      lAr     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+   --->  Element:      lAr      Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:       Al     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+   --->  Element:       Al      Z = 13.0   N =  27.0   A =  26.98 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:       Fe     density:  7.870 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.759 cm 
+   --->  Element:       Fe      Z = 26.0   N =  55.9   A =  55.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:      BGO     density:  7.100 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.123 cm 
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  15.41 %  Abundance  63.16 %
+   --->  Element: Germanium Ge   Z = 32.0   N =  72.6   A =  72.59 g/mole  fractionMass:  17.48 %  Abundance  15.79 %
+   --->  Element:  Bismuth Bi   Z = 83.0   N = 209.0   A = 208.98 g/mole  fractionMass:  67.10 %  Abundance  21.05 %
+
+ Material:    PbWO4     density:  8.280 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.924 mm 
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  14.07 %  Abundance  66.67 %
+   --->  Element:     Lead Pb   Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass:  45.53 %  Abundance  16.67 %
+   --->  Element: Tungsten  W   Z = 74.0   N = 183.8   A = 183.84 g/mole  fractionMass:  40.40 %  Abundance  16.67 %
+
+ Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+   --->  Element:     Lead Pb   Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+
+Absorber is 17.848  cm of PbWO4
+Em2PhysicsList::SetCuts:CutLength : 1 (mm)
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  1 mm            1 mm            1 mm            1 mm            1 mm 
+Cut in energy
+                Air         990 eV          990 eV         48.4 keV        83.2 keV         990 eV 
+              Water         2.9 keV         347 keV        3.39 MeV        8.95 MeV         990 eV 
+                lAr        6.18 keV         343 keV        3.24 MeV        8.32 MeV         990 eV 
+                 Al        6.89 keV         597 keV        5.02 MeV        13.1 MeV         990 eV 
+                 Fe        20.8 keV        1.28 MeV        8.52 MeV          22 MeV         990 eV 
+                BGO        77.7 keV        1.03 MeV        7.17 MeV        18.1 MeV         990 eV 
+              PbWO4        84.8 keV        1.13 MeV        7.63 MeV        19.2 MeV         990 eV 
+               Lead         101 keV        1.38 MeV        8.52 MeV        20.9 MeV         990 eV 
+===================================================
+# $Id: TestEm2.out,v 1.1 2000/01/21 14:40:57 maire Exp $
+#
+# Macro file for "TestEm2.cc" 
+# (can be run in batch, without graphic)
+#
+# H2O L = 9.97 radl  R = 0.665 radl; electron 1 GeV
+#
+#  Experimental results: Electron-induced cascade showers
+#                        J&H Crannel - Phys. Rev. 184-2 - August69
+#
+#
+/calor/setMat Water
+/calor/setLbin 9 1.11
+/calor/setRbin 6 0.111
+/calor/update
+Absorber is 3.60564   m of Water
+#
+/run/particle/setCut 5.0 mm
+/run/initialize
+Em2PhysicsList::SetCuts:CutLength : 5 (mm)
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  5 mm            5 mm            5 mm            5 mm            5 mm 
+Cut in energy
+                Air         990 eV         3.24 keV         156 keV         326 keV         990 eV 
+              Water        5.78 keV        1.16 MeV        8.21 MeV          22 MeV         990 eV 
+                lAr        13.6 keV        1.16 MeV        8.01 MeV        20.9 MeV         990 eV 
+                 Al        14.6 keV        2.31 MeV        12.5 MeV        32.6 MeV         990 eV 
+                 Fe        46.4 keV        6.11 MeV        21.5 MeV        54.7 MeV         990 eV 
+                BGO         126 keV        4.72 MeV        18.1 MeV        45.7 MeV         990 eV 
+              PbWO4         137 keV        5.34 MeV        19.4 MeV        48.3 MeV         990 eV 
+               Lead         204 keV        6.83 MeV          22 MeV          54 MeV         990 eV 
+===================================================
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 20
+#
+/gun/particle electron
+/gun/energy 1 GeV
+/run/beamOn 100
+### Run 0 start.
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 9876, 54321
+----------------------------------------
+Start closing geometry.
+Start Run processing.
+
+---> Begin Of Event: 0
+
+---> Begin Of Event: 20
+
+---> Begin Of Event: 40
+
+---> Begin Of Event: 60
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.5e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0x140618e58
+      -----------------------------------------------
+        G4ParticleChange Information                     
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 6.91
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 59.8
+        Position - y (mm)   :                -38.6
+        Position - z (mm)   :                  877
+     Momentum Direction - x :                0.414
+     Momentum Direction - y :               0.0309
+     Momentum Direction - z :                 0.91
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.51e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0x1405d2cc0
+      -----------------------------------------------
+        G4ParticleChange Information                     
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 62.1
+        Position - y (mm)   :                -38.4
+        Position - z (mm)   :                  882
+        Time (ns)           :                 9.01
+        Proper Time (ns)    :              0.00338
+        Momentum Direct - x :                0.414
+        Momentum Direct - y :               0.0309
+        Momentum Direct - z :                 0.91
+        Kinetic Energy (MeV):                 5.15
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :          0x1402b2bc0
+
+---> Begin Of Event: 80
+Run terminated.
+Run Summary
+  Number of events processed : 100
+  User=19.2s Real=22.9s Sys=3.42s
+                 LATERAL PROFILE                         CUMULATIVE LATERAL PROFILE
+
+        bin              Mean         rms                 bin            Mean      rms 
+
+    0.00-> 1.11 radl:   13.46%       6.25%             0-> 1.11 radl:   13.46%     6.25% 
+    1.11-> 2.22 radl:   24.71%      10.53%             0-> 2.22 radl:   38.17%    14.12% 
+    2.22-> 3.33 radl:   23.98%      10.63%             0-> 3.33 radl:   62.15%    18.49% 
+    3.33-> 4.44 radl:   13.68%       8.06%             0-> 4.44 radl:   75.83%    17.78% 
+    4.44-> 5.55 radl:    8.09%       7.22%             0-> 5.55 radl:   83.93%    16.08% 
+    5.55-> 6.66 radl:    5.50%       6.39%             0-> 6.66 radl:   89.43%    11.95% 
+    6.66-> 7.77 radl:    3.04%       6.08%             0-> 7.77 radl:   92.46%     7.12% 
+    7.77-> 8.88 radl:    1.87%       3.88%             0-> 8.88 radl:   94.33%     4.60% 
+    8.88-> 9.99 radl:    0.90%       2.07%             0-> 9.99 radl:   95.23%     3.78% 
+
+
+
+                  RADIAL PROFILE                         CUMULATIVE  RADIAL PROFILE
+
+        bin              Mean         rms                 bin            Mean      rms 
+
+    0.00-> 0.11 radl:   69.28%       9.17%             0-> 0.11 radl:   69.28%     9.17% 
+    0.11-> 0.22 radl:   15.05%       6.43%             0-> 0.22 radl:   84.33%     5.88% 
+    0.22-> 0.33 radl:    5.41%       3.14%             0-> 0.33 radl:   89.74%     4.73% 
+    0.33-> 0.44 radl:    2.67%       1.88%             0-> 0.44 radl:   92.41%     4.14% 
+    0.44-> 0.56 radl:    1.66%       1.53%             0-> 0.56 radl:   94.07%     3.85% 
+    0.56-> 0.67 radl:    1.16%       1.18%             0-> 0.67 radl:   95.23%     3.78% 
+
+                              SUMMARY
+                         energy deposit :   95.23 % E0 +-    3.78 % E0
+                         charged traklen:   13.61 radl +-    0.55 radl
+                         neutral traklen:  192.88 radl +-   17.42 radl
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 2146177415, 212514321
+----------------------------------------
+
+
+Graphics systems deleted.
+VisManager deleting.
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
index 9ba6ec793f..03c7dbeb62 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2DetectorConstruction.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2DetectorConstruction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
index 177ed48d8e..35d357fe8e 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2DetectorMessenger.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2DetectorMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
index 8e96534570..2ee9225ea3 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2EventAction.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2EventAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
index c2b4f908af..08e422f664 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2EventActionMessenger.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2EventActionMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
index 8ac47035f5..313e349899 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2PhysicsList.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2PhysicsList.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
index 7bad3710cb..acea899ac8 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2PrimaryGeneratorAction.hh,v 1.1.4.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
index dcb0f8ad64..3924576255 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunAction.hh,v 1.1.2.1.2.1 1999/12/07 20:46:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2RunAction.hh,v 1.4 2000/01/21 10:56:14 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -35,8 +35,10 @@ class Em2RunActionMessenger;
 
 class G4Run;
 
-class HepTupleManager;
-class HepHistogram;
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
 
 class Em2RunAction : public G4UserRunAction
 {
@@ -54,7 +56,6 @@ class Em2RunAction : public G4UserRunAction
     inline void fillPerStep (G4double,G4int,G4int);
     inline void particleFlux(G4ParticleDefinition*,G4int);
     
-    void SetSaveFlag (G4String val) {saveFlag = val;}
     void  SetRndmFreq(G4int    val) {saveRndm = val;}
     G4int GetRndmFreq()             {return saveRndm;}    
     
@@ -93,16 +94,18 @@ class Em2RunAction : public G4UserRunAction
     G4double NeutrTrLength;
     G4double sumNeutrTrLength;
     G4double sum2NeutrTrLength;
-        
+    
+    Em2RunActionMessenger* runMessenger;        
+    G4int saveRndm;
+                  
+#ifndef G4NOHIST        
     HepTupleManager* hbookManager;
     HepHistogram *histo1, *histo2, *histo3;    
     HepHistogram *histo4, *histo5, *histo6;
     HepHistogram *histo7, *histo8, *histo9;
     HepHistogram *hist10, *hist11, *hist12;
+#endif
     
-    Em2RunActionMessenger* runMessenger;        
-    G4String saveFlag;
-    G4int saveRndm;          
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
index 145c8b4daa..1735d94d4d 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunActionMessenger.hh,v 1.1.4.1 1999/12/07 20:46:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2RunActionMessenger.hh,v 1.3 2000/01/21 10:56:15 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -36,7 +36,6 @@ class Em2RunActionMessenger: public G4UImessenger
     
   private:
     Em2RunAction*          Em2Run;  
-    G4UIcmdWithAString*    SaveCmd;
     G4UIdirectory*         RndmDir;
     G4UIcmdWithAnInteger*  RndmSaveCmd;    
     G4UIcmdWithAString*    RndmReadCmd;
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
index 678d72d02a..336595c8da 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2SteppingAction.hh,v 1.1.4.1 1999/12/07 20:46:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2SteppingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
new file mode 100644
index 0000000000..5468a5c57d
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em2SteppingVerbose.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em2SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em2SteppingVerbose;
+
+#ifndef Em2SteppingVerbose_h
+#define Em2SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em2SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  Em2SteppingVerbose();
+ ~Em2SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
index 9476618e38..2b55797e54 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2TrackingAction.hh,v 1.1.4.1 1999/12/07 20:46:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2TrackingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
index e37517d087..a7d1a301ea 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2VisManager.hh,v 1.1.4.1 1999/12/07 20:46:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2VisManager.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/init.mac b/examples/extended/electromagnetic/TestEm2/init.mac
index b0fde1d309..5089656e59 100644
--- a/examples/extended/electromagnetic/TestEm2/init.mac
+++ b/examples/extended/electromagnetic/TestEm2/init.mac
@@ -32,4 +32,7 @@
 /tracking/storeTrajectory 1
 /event/drawTracks charged
 #
+# Flush visualization
+/vis/viewer/update
+#
 /run/verbose 2
diff --git a/examples/extended/electromagnetic/TestEm2/run01.mac b/examples/extended/electromagnetic/TestEm2/run01.mac
index feb640c110..dbd9de3347 100644
--- a/examples/extended/electromagnetic/TestEm2/run01.mac
+++ b/examples/extended/electromagnetic/TestEm2/run01.mac
@@ -1,4 +1,4 @@
-# $Id: run01.mac,v 1.1 1999/10/11 15:08:26 maire Exp $
+# $Id: run01.mac,v 1.2 2000/01/21 10:56:13 maire Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -13,7 +13,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-/run/save on
 #
 /gun/particle electron
 /gun/energy 5 GeV
diff --git a/examples/extended/electromagnetic/TestEm2/run02.mac b/examples/extended/electromagnetic/TestEm2/run02.mac
index dec36f5173..c12bd5a238 100644
--- a/examples/extended/electromagnetic/TestEm2/run02.mac
+++ b/examples/extended/electromagnetic/TestEm2/run02.mac
@@ -1,4 +1,4 @@
-# $Id: run02.mac,v 1.1 1999/10/11 15:08:26 maire Exp $
+# $Id: run02.mac,v 1.2 2000/01/21 10:56:14 maire Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -21,7 +21,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-/run/save on
 #
 /gun/particle electron
 /gun/energy 1 GeV
diff --git a/examples/extended/electromagnetic/TestEm2/run03.mac b/examples/extended/electromagnetic/TestEm2/run03.mac
index 11e9fab0fd..bec1473ea2 100644
--- a/examples/extended/electromagnetic/TestEm2/run03.mac
+++ b/examples/extended/electromagnetic/TestEm2/run03.mac
@@ -1,4 +1,4 @@
-# $Id: run03.mac,v 1.1 1999/10/11 15:08:26 maire Exp $
+# $Id: run03.mac,v 1.2 2000/01/21 10:56:14 maire Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -21,7 +21,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-/run/save on
 #
 /gun/particle electron
 /gun/energy 1 GeV
diff --git a/examples/extended/electromagnetic/TestEm2/run04.mac b/examples/extended/electromagnetic/TestEm2/run04.mac
index bd73c8f937..5afafd8c3d 100644
--- a/examples/extended/electromagnetic/TestEm2/run04.mac
+++ b/examples/extended/electromagnetic/TestEm2/run04.mac
@@ -1,4 +1,4 @@
-# $Id: run04.mac,v 1.1 1999/10/11 15:08:27 maire Exp $
+# $Id: run04.mac,v 1.2 2000/01/21 10:56:14 maire Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -20,7 +20,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-/run/save on
 #
 /gun/particle electron
 /gun/energy 30 GeV
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
index f148456e6f..186ee40913 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2DetectorConstruction.cc,v 1.1.4.1 1999/12/07 20:46:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2DetectorConstruction.cc,v 1.3 2000/02/14 14:09:16 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -142,7 +142,7 @@ void Em2DetectorConstruction::DefineMaterials()
     G4Material* pb = new G4Material(name="Lead", density, ncomponents=1);
     pb->AddElement(Pb, fractionmass=1.0);
      
-    G4cout << *(G4Material::GetMaterialTable()) << endl;
+    G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //choose material
   myMaterial = PbWO;
@@ -186,8 +186,8 @@ G4VPhysicalVolume* Em2DetectorConstruction::ConstructVolumes()
                                     physiRing,false,0);               
 
 
-  cout << "Absorber is " << G4BestUnit(EcalLength,"Length") 
-       << " of " << myMaterial->GetName() << endl; 
+  G4cout << "Absorber is " << G4BestUnit(EcalLength,"Length") 
+       << " of " << myMaterial->GetName() << G4endl; 
 
 
   G4VisAttributes* VisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0));
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
index d9d84b9037..00426e0b94 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2DetectorMessenger.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2DetectorMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
index ab27d3d55f..4f9dbba777 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2EventAction.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2EventAction.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -47,7 +47,7 @@ void Em2EventAction::BeginOfEventAction(const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin Of Event: " << evtNb << endl; 
+    G4cout << "\n---> Begin Of Event: " << evtNb << G4endl; 
  
  Em2Run->initializePerEvent();
 }
@@ -78,7 +78,7 @@ void Em2EventAction::EndOfEventAction(const G4Event* evt)
      G4int evtNb = evt->GetEventID();
      if (evtNb%printModulo == 0)
        { 
-        G4cout << "\n---> End of Event: " << evtNb << endl;
+        G4cout << "\n---> End of Event: " << evtNb << G4endl;
         HepRandom::showEngineStatus();
        }
     }       
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
index 3d9e498959..da33bcf16c 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2EventActionMessenger.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2EventActionMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
index e7dc815362..d6502d2c5d 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2PhysicsList.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2PhysicsList.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -212,7 +212,7 @@ void Em2PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "Em2PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
index ba51ba4958..0287ac0f76 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2PrimaryGeneratorAction.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
index 41a1a1935d..2a6468efda 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
@@ -5,9 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunAction.cc,v 1.1.4.1 1999/12/07 20:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
-//
+// $Id: Em2RunAction.cc,v 1.4 2000/01/21 10:56:15 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -25,17 +24,20 @@
 #include "G4ios.hh"
 #include "G4UnitsTable.hh"
 
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include <assert.h>
 
 #include "Randomize.hh"
-#include "CLHEP/Hist/HBookFile.h"
+
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em2RunAction::Em2RunAction(Em2DetectorConstruction*   det,
                            Em2PrimaryGeneratorAction* kin)
-:Em2Det(det),Em2Kin(kin),hbookManager(NULL)			   
+:Em2Det(det),Em2Kin(kin)			   
 { 
   nLbin = Em2Det->GetnLtot();
   dEdL             = *new MyVector(nLbin);
@@ -56,8 +58,12 @@ Em2RunAction::Em2RunAction(Em2DetectorConstruction*   det,
   sumE2RadialCumul = *new MyVector(nRbin);
    
   runMessenger = new Em2RunActionMessenger(this);   
-  saveFlag = "off";
-  saveRndm = 1;  
+  saveRndm = 1;
+  
+#ifndef G4NOHIST
+   hbookManager = NULL;
+#endif
+    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -72,6 +78,7 @@ Em2RunAction::~Em2RunAction()
 
 void Em2RunAction::bookHisto()
 {
+#ifndef G4NOHIST
   hbookManager = new HBookFile("TestEm2.histo", 68);
   assert (hbookManager != 0);
   
@@ -115,24 +122,27 @@ void Em2RunAction::bookHisto()
                                     nRbin,Rmin,Rmax);
                                     
   hist12 = hbookManager->histogram("rms on cumul radial Edep (% of E inc)",
-                                    nRbin,Rmin,Rmax);                                                                                                                                                                                                                                                                                                                                 
+                                    nRbin,Rmin,Rmax);
+#endif				                                                                                                                                                                                                                                                                                                                                     
 }
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em2RunAction::cleanHisto()
 {
+#ifndef G4NOHIST
   delete histo1; delete histo2; delete histo3;
   delete histo4; delete histo5; delete histo6;
   delete histo7; delete histo8; delete histo9;
   delete hist10; delete hist11; delete hist12;
   delete hbookManager;
+#endif  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em2RunAction::BeginOfRunAction(const G4Run* aRun)
 {
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   // save Rndm status
   if (saveRndm > 0)
@@ -183,8 +193,7 @@ void Em2RunAction::BeginOfRunAction(const G4Run* aRun)
   if (G4VVisManager::GetConcreteInstance())
     {
       G4UImanager* UI = G4UImanager::GetUIpointer(); 
-      UI->ApplyCommand("/vis/clear/view");
-      UI->ApplyCommand("/vis/draw/current");
+      UI->ApplyCommand("/vis/scene/notifyHandlers");
     } 
 }
 
@@ -219,6 +228,7 @@ void Em2RunAction::fillPerEvent()
   sumNeutrTrLength  += NeutrTrLength;
   sum2NeutrTrLength += NeutrTrLength*NeutrTrLength;
   
+#ifndef G4NOHIST  
   //fill histograms
   //
   G4double Ekin=Em2Kin->GetParticleGun()->GetParticleEnergy();
@@ -227,7 +237,8 @@ void Em2RunAction::fillPerEvent()
   
   histo1->accumulate(100.*dLCumul/(Ekin+mass));
   histo2->accumulate(ChargTrLength/radl);
-  histo3->accumulate(NeutrTrLength/radl);    
+  histo3->accumulate(NeutrTrLength/radl);
+#endif      
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -235,7 +246,7 @@ void Em2RunAction::fillPerEvent()
 void Em2RunAction::EndOfRunAction(const G4Run* aRun)
 {
   if (G4VVisManager::GetConcreteInstance())
-     G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
+     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
      
   //compute and print statistic
   //     
@@ -267,7 +278,8 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
     gammaFlux   (i) /= NbOfEvents;
     electronFlux(i) /= NbOfEvents;
     positronFlux(i) /= NbOfEvents;                                    
-                                    
+
+#ifndef G4NOHIST                                    
     bin = i*dLradl;                                
     histo4->accumulate(bin,MeanELongit(i)/dLradl);
     bin = (i+1)*dLradl;
@@ -276,7 +288,8 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
     
     histo7->accumulate(bin, gammaFlux(i));
     histo8->accumulate(bin, electronFlux(i));
-    histo9->accumulate(bin, positronFlux(i));                                        
+    histo9->accumulate(bin, positronFlux(i));
+#endif                                            
    }
    
   //radial
@@ -296,12 +309,13 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
      rmsERadialCumul(i) = norme*sqrt(abs(NbOfEvents*sumE2RadialCumul(i) 
                                     - sumERadialCumul(i)*sumERadialCumul(i)));
                                  
-                                    
+#ifndef G4NOHIST                                     
     bin = i*dRradl;                                
     hist10->accumulate(bin,MeanERadial(i)/dRradl);
     bin = (i+1)*dRradl;
     hist11->accumulate(bin,MeanERadialCumul(i));
-    hist12->accumulate(bin, rmsERadialCumul(i));                                       
+    hist12->accumulate(bin, rmsERadialCumul(i));
+#endif                                           
    }
 
   //track length
@@ -318,72 +332,74 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
   //print
   // 
 
-  G4long oldform = G4cout.setf(ios::fixed,ios::floatfield);
+  G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
   G4int  oldprec = G4cout.precision(2);
   
   G4cout << "                 LATERAL PROFILE                   "
-         << "      CUMULATIVE LATERAL PROFILE" << endl << endl;  
+         << "      CUMULATIVE LATERAL PROFILE" << G4endl << G4endl;  
      
   G4cout << "        bin   " << "           Mean         rms         " 
-         << "        bin "   << "           Mean      rms \n" << endl;
+         << "        bin "   << "           Mean      rms \n" << G4endl;
                                          
   for (i=0; i<nLbin; i++)
    {
      G4double inf=i*dLradl, sup=inf+dLradl;
        
-     G4cout << setw(8) << inf << "->" << setw(5) << sup << " radl: " 
-                                      << setw(7) << MeanELongit(i) << "%  " 
-                                      << setw(9) << rmsELongit(i) << "%       "                                  
-                       << "      0->" << setw(5) << sup << " radl: " 
-                                      << setw(7) << MeanELongitCumul(i) << "%  " 
-                                      << setw(7) << rmsELongitCumul(i) << "% " 
-            <<endl;
+     G4cout << G4std::setw(8) << inf << "->" << G4std::setw(5) << sup << " radl: " 
+                                      << G4std::setw(7) << MeanELongit(i) << "%  " 
+                                      << G4std::setw(9) << rmsELongit(i) << "%       "                                  
+                       << "      0->" << G4std::setw(5) << sup << " radl: " 
+                                      << G4std::setw(7) << MeanELongitCumul(i) << "%  " 
+                                      << G4std::setw(7) << rmsELongitCumul(i) << "% " 
+            <<G4endl;
    }
    
-  G4cout << endl << endl << endl;
+  G4cout << G4endl << G4endl << G4endl;
    
   G4cout << "                  RADIAL PROFILE                   "
-         << "      CUMULATIVE  RADIAL PROFILE" << endl << endl;  
+         << "      CUMULATIVE  RADIAL PROFILE" << G4endl << G4endl;  
      
   G4cout << "        bin   " << "           Mean         rms         " 
-         << "        bin "   << "           Mean      rms \n" << endl;
+         << "        bin "   << "           Mean      rms \n" << G4endl;
                                          
   for (i=0; i<nRbin; i++)
    {
      G4double inf=i*dRradl, sup=inf+dRradl;
        
-     G4cout << setw(8) << inf << "->" << setw(5) << sup << " radl: " 
-                                      << setw(7) << MeanERadial(i) << "%  " 
-                                      << setw(9) << rmsERadial(i) << "%       "                                  
-                       << "      0->" << setw(5) << sup << " radl: " 
-                                      << setw(7) << MeanERadialCumul(i) << "%  " 
-                                      << setw(7) << rmsERadialCumul(i) << "% " 
-            <<endl;
+     G4cout << G4std::setw(8) << inf << "->" << G4std::setw(5) << sup << " radl: " 
+                                      << G4std::setw(7) << MeanERadial(i) << "%  " 
+                                      << G4std::setw(9) << rmsERadial(i) << "%       "                                  
+                       << "      0->" << G4std::setw(5) << sup << " radl: " 
+                                      << G4std::setw(7) << MeanERadialCumul(i) << "%  " 
+                                      << G4std::setw(7) << rmsERadialCumul(i) << "% " 
+            <<G4endl;
    }  
-  G4cout << endl;
-  G4cout << setw(37) << "SUMMARY" << endl;
-  G4cout << setw(42) << "energy deposit : " 
-         << setw(7)  << MeanELongitCumul(nLbin-1) << " % E0 +- "
-         << setw(7)  <<  rmsELongitCumul(nLbin-1) << " % E0" << endl;
-  G4cout << setw(42) << "charged traklen: " 
-         << setw(7)  << MeanChargTrLength << " radl +- "
-         << setw(7)  <<  rmsChargTrLength << " radl" << endl;
-  G4cout << setw(42) << "neutral traklen: " 
-         << setw(7)  << MeanNeutrTrLength << " radl +- "
-         << setw(7)  <<  rmsNeutrTrLength << " radl" << endl;
+  G4cout << G4endl;
+  G4cout << G4std::setw(37) << "SUMMARY" << G4endl;
+  G4cout << G4std::setw(42) << "energy deposit : " 
+         << G4std::setw(7)  << MeanELongitCumul(nLbin-1) << " % E0 +- "
+         << G4std::setw(7)  <<  rmsELongitCumul(nLbin-1) << " % E0" << G4endl;
+  G4cout << G4std::setw(42) << "charged traklen: " 
+         << G4std::setw(7)  << MeanChargTrLength << " radl +- "
+         << G4std::setw(7)  <<  rmsChargTrLength << " radl" << G4endl;
+  G4cout << G4std::setw(42) << "neutral traklen: " 
+         << G4std::setw(7)  << MeanNeutrTrLength << " radl +- "
+         << G4std::setw(7)  <<  rmsNeutrTrLength << " radl" << G4endl;
                  
                 
-  G4cout.setf(oldform,ios::floatfield);
+  G4cout.setf(oldform,G4std::ios::floatfield);
   G4cout.precision(oldprec);
-  
-  // Write histogram file 
-  if (saveFlag == "on") hbookManager->write();
-  
+
   // save Rndm status
   if (saveRndm == 1)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
-    }                        
+    }
+    
+#ifndef G4NOHIST   
+  // Write histogram file 
+  hbookManager->write();
+#endif                              
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
index 07e6ea5f3a..d7c7c7bc3d 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunActionMessenger.cc,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2RunActionMessenger.cc,v 1.3 2000/01/21 10:56:16 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -27,15 +27,7 @@
 
 Em2RunActionMessenger::Em2RunActionMessenger(Em2RunAction* run)
 :Em2Run(run)
-{ 
-  SaveCmd = new G4UIcmdWithAString("/run/save",this);
-  SaveCmd->SetGuidance("Save run statistic (histo)");
-  SaveCmd->SetGuidance("  Choice : on,off(default)");
-  SaveCmd->SetParameterName("choice",true);
-  SaveCmd->SetDefaultValue("on");
-  SaveCmd->SetCandidates("on off");
-  SaveCmd->AvailableForStates(Idle);
-  
+{   
   RndmDir = new G4UIdirectory("/rndm/");
   RndmDir->SetGuidance("Rndm status control.");
   
@@ -60,21 +52,18 @@ Em2RunActionMessenger::Em2RunActionMessenger(Em2RunAction* run)
 
 Em2RunActionMessenger::~Em2RunActionMessenger()
 {
-  delete SaveCmd;
   delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em2RunActionMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
-{ 
-  if (command == SaveCmd) Em2Run->SetSaveFlag(newValue);
-    
+{     
   if (command == RndmSaveCmd)
       Em2Run->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValue));
 		 
   if (command == RndmReadCmd)
-    { G4cout << "\n---> rndm status restored from file: " << newValue << endl;
+    { G4cout << "\n---> rndm status restored from file: " << newValue << G4endl;
       HepRandom::restoreEngineStatus(newValue);
       HepRandom::showEngineStatus();
     }   
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
index 811a75622c..7cff3e68b8 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2SteppingAction.cc,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2SteppingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
new file mode 100644
index 0000000000..dfbf54c725
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em2SteppingVerbose.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em2SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em2SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em2SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em2SteppingVerbose::Em2SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em2SteppingVerbose::~Em2SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em2SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em2SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
index 8257eec933..b000724ac0 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2TrackingAction.cc,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2TrackingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
index 178f817d30..4b52d342b0 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2VisManager.cc,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em2VisManager.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -131,7 +131,7 @@ void Em2VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm3/GNUmakefile b/examples/extended/electromagnetic/TestEm3/GNUmakefile
index ab5e2606ed..421a303fe5 100644
--- a/examples/extended/electromagnetic/TestEm3/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm3/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/10/11 16:55:33 maire Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/21 09:11:04 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,7 +16,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm3/README b/examples/extended/electromagnetic/TestEm3/README
index 6491c94592..194dd49346 100644
--- a/examples/extended/electromagnetic/TestEm3/README
+++ b/examples/extended/electromagnetic/TestEm3/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/10/11 16:55:33 maire Exp $
+$Id: README,v 1.2 2000/01/21 09:11:04 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -114,7 +114,6 @@ $Id: README,v 1.1 1999/10/11 16:55:33 maire Exp $
  7- NTUPLE
  
 	Testem3 produce an Ntuple which is saved as testem3.histo
-	under the control of the command /run/save on
  
 	Content of this Ntuple:
   
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.cc b/examples/extended/electromagnetic/TestEm3/TestEm3.cc
index 4cef1017ca..fc5e7c2102 100644
--- a/examples/extended/electromagnetic/TestEm3/TestEm3.cc
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: TestEm3.cc,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: TestEm3.cc,v 1.3 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Comments
 //
@@ -28,13 +28,16 @@
 #include "Em3RunAction.hh"
 #include "Em3EventAction.hh"
 #include "Em3SteppingAction.hh"
-
+#include "Em3SteppingVerbose.hh"
 
 int main(int argc,char** argv) {
 
   //choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
-
+  
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new Em3SteppingVerbose);
+  
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.in b/examples/extended/electromagnetic/TestEm3/TestEm3.in
new file mode 100644
index 0000000000..343034664d
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.in
@@ -0,0 +1,19 @@
+# $Id: TestEm3.in,v 1.1 2000/01/21 14:28:44 maire Exp $
+#
+# Macro file for "exampleN03.cc" 
+# (can be run in batch, without graphic)
+#
+# Lead-liquidArgon 50 layers; electron 1 GeV
+#
+/control/verbose 2
+#
+#/run/particle/setCut 0.5 mm
+#/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 50
+#
+/gun/particle e-
+/gun/energy 1 GeV
+/run/beamOn 100
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.out b/examples/extended/electromagnetic/TestEm3/TestEm3.out
new file mode 100644
index 0000000000..a3597c7067
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.out
@@ -0,0 +1,227 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+Constructing Visualization Manager....
+Initialising Visualization Manager....
+Registering graphics systems....
+
+***** Table : Nb of materials = 18 *****
+
+ Material: Aluminium     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+   --->  Element: Aluminium      Z = 13.0   N =  27.0   A =  26.98 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: liquidArgon     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+   --->  Element: liquidArgon      Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Iron     density:  7.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.797 cm 
+   --->  Element:     Iron      Z = 26.0   N =  55.9   A =  55.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:   Copper     density:  8.960 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.436 cm 
+   --->  Element:   Copper      Z = 29.0   N =  63.5   A =  63.55 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: Tungsten     density: 19.300 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.504 mm 
+   --->  Element: Tungsten      Z = 74.0   N = 183.8   A = 183.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+   --->  Element:     Lead      Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:  Uranium     density: 18.950 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.166 mm 
+   --->  Element:  Uranium      Z = 92.0   N = 238.0   A = 238.03 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:    Water     density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material: Scintillator     density:  1.032 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  42.549 cm 
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:  91.45 %  Abundance  47.37 %
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:   8.55 %  Abundance  52.63 %
+
+ Material: Silicium     density:  2.330 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   9.368 cm 
+   --->  Element:  Silicon Si   Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:   quartz     density:  2.200 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  12.295 cm 
+   --->  Element:  Silicon Si   Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass:  46.75 %  Abundance  33.33 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  53.25 %  Abundance  66.67 %
+
+ Material:  NemaG10     density:  1.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  18.733 cm 
+   --->  Element:  Silicon Si   Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass:  28.33 %  Abundance  11.11 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  32.27 %  Abundance  22.22 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:  36.34 %  Abundance  33.33 %
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:   3.06 %  Abundance  33.33 %
+
+ Material:      Air     density:  1.290 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 285.161 m  
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+ Material:  Aerogel     density: 200.000 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.493 m  
+   --->  Element:  Silicon Si   Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass:  29.22 %  Abundance  11.12 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  66.49 %  Abundance  44.42 %
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:   4.19 %  Abundance  44.37 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:   0.10 %  Abundance   0.09 %
+
+ Material: CarbonicGas     density: 27.000 mg/cm3  temperature: 325.00 K  pressure:  50.00 atm  RadLength:  13.406 m  
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:  27.29 %  Abundance  33.33 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  72.71 %  Abundance  66.67 %
+
+ Material: WaterSteam     density:  0.300 mg/cm3  temperature: 500.00 K  pressure:   2.00 atm  RadLength:   1.203 km 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 6317232936888469300000.000 km 
+   --->  Element: Galactic      Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Beam     density:  0.010 mg/cm3  temperature: 273.15 K  pressure:   0.02 atm  RadLength:  36.786 km 
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+
+
+-------------------------------------------------------------
+ ---> The calorimeter is 50 layers of:
+ 	        Lead:    2.3 mm 
+ 	 liquidArgon:    5.7 mm 
+-------------------------------------------------------------
+Em3PhysicsList::SetCuts:CutLength : 5e+02 mum
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                500 mum         500 mum         500 mum         500 mum         500 mum
+Cut in energy
+          Aluminium        4.96 keV         365 keV        3.43 MeV        8.84 MeV         990 eV 
+        liquidArgon         4.4 keV         217 keV         2.2 MeV        5.54 MeV         990 eV 
+               Iron        14.2 keV         709 keV        5.68 MeV        14.5 MeV         990 eV 
+             Copper        17.1 keV         782 keV        6.04 MeV        15.4 MeV         990 eV 
+           Tungsten        87.5 keV        1.22 MeV        7.92 MeV        19.7 MeV         990 eV 
+               Lead        81.5 keV         763 keV        5.68 MeV        13.8 MeV         990 eV 
+            Uranium         105 keV        1.13 MeV        7.44 MeV        18.3 MeV         990 eV 
+              Water        2.18 keV         223 keV        2.31 MeV        6.04 MeV         990 eV 
+       Scintillator        1.83 keV         226 keV        2.34 MeV        6.11 MeV         990 eV 
+           Silicium        4.96 keV         335 keV        3.18 MeV        8.21 MeV         990 eV 
+             quartz        4.01 keV         330 keV        3.18 MeV        8.21 MeV         990 eV 
+            NemaG10        3.07 keV         292 keV        2.88 MeV        7.54 MeV         990 eV 
+                Air         990 eV          990 eV         27.2 keV        29.6 keV         990 eV 
+            Aerogel        1.27 keV        79.2 keV         863 keV        2.07 MeV         990 eV 
+        CarbonicGas         990 eV         8.52 keV         255 keV         534 keV         990 eV 
+         WaterSteam         990 eV          990 eV         5.97 keV        4.34 keV         990 eV 
+           Galactic         990 eV          990 eV          990 eV          990 eV          990 eV 
+               Beam         990 eV          990 eV          990 eV          990 eV          990 eV 
+===================================================
+# $Id: TestEm3.out,v 1.1 2000/01/21 14:28:45 maire Exp $
+#
+# Macro file for "exampleN03.cc" 
+# (can be run in batch, without graphic)
+#
+# Lead-liquidArgon 50 layers; electron 1 GeV
+#
+#
+#/run/particle/setCut 0.5 mm
+#/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 50
+#
+/gun/particle e-
+/gun/energy 1 GeV
+/run/beamOn 100
+### Run 0 start.
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 9876, 54321
+----------------------------------------
+Start closing geometry.
+Start Run processing.
+
+---> Begin Of Event: 0
+
+---> Begin Of Event: 50
+Run terminated.
+Run Summary
+  Number of events processed : 100
+  User=39s Real=46s Sys=6.9s
+
+-------------------------------------------------------------
+                                   total energy dep            total tracklen 
+ 
+ Absorber0 (        Lead) : 808.32 MeV +- 15.02 MeV       52.43 cm  +-  1.21 cm 
+ Absorber1 ( liquidArgon) : 179.35 MeV +- 12.84 MeV       89.37 cm  +-  6.43 cm 
+
+-------------------------------------------------------------
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 197041347, 1893777350
+----------------------------------------
+Graphics systems deleted.
+VisManager deleting.
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+G4SDManager deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
index 2aad1a435a..3a322d6ccf 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3CalorHit.hh,v 1.1.4.1 1999/12/07 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3CalorHit.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
index a3082c83ba..b3c93b4a58 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3CalorimeterSD.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3CalorimeterSD.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
index bf3a9f4b91..e3b5b1d657 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3DetectorConstruction.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3DetectorConstruction.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
index b66cd7be7d..d26adffb05 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3DetectorMessenger.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3DetectorMessenger.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
index 731542e422..c1807d7fd6 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3EventAction.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3EventAction.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
index 6044c57060..5e24fd0da1 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3EventActionMessenger.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3EventActionMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
index 8affc25d7b..644273b175 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PhysicsList.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PhysicsList.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
index aea5f59ccc..1d09e22838 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PrimaryGeneratorAction.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
index 1d56172aaa..30264248cd 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PrimaryGeneratorMessenger.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
index a95104f97d..76d303f61a 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3RunAction.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3RunAction.hh,v 1.3 2000/01/21 09:11:06 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -26,8 +26,10 @@
 class G4Run;
 class Em3RunActionMessenger;
 
-class HepTupleManager;
-class HepTuple;
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepTuple;
+#endif
 
 class Em3RunAction : public G4UserRunAction
 {
@@ -41,12 +43,13 @@ class Em3RunAction : public G4UserRunAction
     
     void fillPerEvent(G4int,G4double,G4double);
     
-    HepTuple* GetnTuple() {return ntuple;}
-    
-    void  SetSaveFlag(G4String val) {saveFlag = val;}
     void  SetRndmFreq(G4int   val)  {saveRndm = val;}
     G4int GetRndmFreq()             {return saveRndm;}
-        
+    
+#ifndef G4NOHIST
+    HepTuple* GetnTuple() {return ntuple;}
+#endif
+            
   private:
     void bookHisto();
     
@@ -54,14 +57,15 @@ class Em3RunAction : public G4UserRunAction
     
     G4double sumEAbs[MaxAbsor], sum2EAbs[MaxAbsor];
     G4double sumLAbs[MaxAbsor], sum2LAbs[MaxAbsor];
-    
-    HepTupleManager* hbookManager;    
-    HepTuple* ntuple;
 
     Em3DetectorConstruction* Detector;    
     Em3RunActionMessenger*   runMessenger;        
-    G4String saveFlag;
-    G4int saveRndm;           
+    G4int saveRndm;
+    
+#ifndef G4NOHIST    
+    HepTupleManager* hbookManager;    
+    HepTuple* ntuple;
+#endif               
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
index 2a053dc977..148cb7e8fa 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3RunActionMessenger.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3RunActionMessenger.hh,v 1.3 2000/01/21 09:11:06 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -37,7 +37,6 @@ class Em3RunActionMessenger: public G4UImessenger
     
   private:
     Em3RunAction*          Em3Run;   
-    G4UIcmdWithAString*    SaveCmd;
     G4UIdirectory*         RndmDir;
     G4UIcmdWithAnInteger*  RndmSaveCmd;       
     G4UIcmdWithAString*    RndmReadCmd;
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
index f7f19c0523..216fa77f27 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3SteppingAction.hh,v 1.1.4.1 1999/12/07 20:47:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3SteppingAction.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
new file mode 100644
index 0000000000..81e2f5f75a
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em3SteppingVerbose.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em3SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em3SteppingVerbose;
+
+#ifndef Em3SteppingVerbose_h
+#define Em3SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em3SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  Em3SteppingVerbose();
+ ~Em3SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
index 77f08baf22..50e017c45d 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3VisManager.hh,v 1.1.4.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3VisManager.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/init.mac b/examples/extended/electromagnetic/TestEm3/init.mac
index c96f0d2ab3..4de1fef427 100644
--- a/examples/extended/electromagnetic/TestEm3/init.mac
+++ b/examples/extended/electromagnetic/TestEm3/init.mac
@@ -29,4 +29,6 @@
 # if too many tracks cause core dump => storeTrajectory 0
 /tracking/storeTrajectory 1
 /event/drawTracks all
-
+#
+# Flush visualization
+/vis/viewer/update
diff --git a/examples/extended/electromagnetic/TestEm3/run01.mac b/examples/extended/electromagnetic/TestEm3/run01.mac
index 358d8be444..09d21af3c4 100644
--- a/examples/extended/electromagnetic/TestEm3/run01.mac
+++ b/examples/extended/electromagnetic/TestEm3/run01.mac
@@ -1,4 +1,4 @@
-# $Id: run01.mac,v 1.1 1999/10/11 16:55:34 maire Exp $
+# $Id: run01.mac,v 1.2 2000/01/21 09:11:04 maire Exp $
 #
 # Macro file for "exampleN03.cc" 
 # (can be run in batch, without graphic)
@@ -13,7 +13,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 100
-/run/save on
 #
 /gun/particle e-
 /gun/energy 1 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run02.mac b/examples/extended/electromagnetic/TestEm3/run02.mac
index 0ebd994525..d269c6654c 100644
--- a/examples/extended/electromagnetic/TestEm3/run02.mac
+++ b/examples/extended/electromagnetic/TestEm3/run02.mac
@@ -1,4 +1,4 @@
-# $Id: run02.mac,v 1.1 1999/10/11 16:55:34 maire Exp $
+# $Id: run02.mac,v 1.2 2000/01/21 09:11:04 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -20,7 +20,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 100
-#/run/save on
 #
 /gun/particle e-
 /gun/energy 1 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run03.mac b/examples/extended/electromagnetic/TestEm3/run03.mac
index 1362b0240b..d69bc9d922 100644
--- a/examples/extended/electromagnetic/TestEm3/run03.mac
+++ b/examples/extended/electromagnetic/TestEm3/run03.mac
@@ -1,4 +1,4 @@
-# $Id: run03.mac,v 1.1 1999/10/11 16:55:34 maire Exp $
+# $Id: run03.mac,v 1.2 2000/01/21 09:11:04 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -24,7 +24,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-#/run/save on
 #
 /gun/particle e-
 /gun/energy 6 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run04.mac b/examples/extended/electromagnetic/TestEm3/run04.mac
index aa2a4995ad..1f5d529367 100644
--- a/examples/extended/electromagnetic/TestEm3/run04.mac
+++ b/examples/extended/electromagnetic/TestEm3/run04.mac
@@ -1,4 +1,4 @@
-# $Id: run04.mac,v 1.1 1999/10/11 16:55:35 maire Exp $
+# $Id: run04.mac,v 1.2 2000/01/21 09:11:05 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -25,7 +25,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-#/run/save on
 #
 /gun/particle e-
 /gun/energy 6 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run05.mac b/examples/extended/electromagnetic/TestEm3/run05.mac
index 59529a8f8a..7af432ccde 100644
--- a/examples/extended/electromagnetic/TestEm3/run05.mac
+++ b/examples/extended/electromagnetic/TestEm3/run05.mac
@@ -1,4 +1,4 @@
-# $Id: run05.mac,v 1.1 1999/10/11 16:55:35 maire Exp $
+# $Id: run05.mac,v 1.2 2000/01/21 09:11:05 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -25,7 +25,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-#/run/save on
 #
 /gun/particle e-
 /gun/energy 6 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run06.mac b/examples/extended/electromagnetic/TestEm3/run06.mac
index 4b7a5607eb..0ec1150c3f 100644
--- a/examples/extended/electromagnetic/TestEm3/run06.mac
+++ b/examples/extended/electromagnetic/TestEm3/run06.mac
@@ -1,4 +1,4 @@
-# $Id: run06.mac,v 1.1 1999/10/11 16:55:35 maire Exp $
+# $Id: run06.mac,v 1.2 2000/01/21 09:11:05 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -25,7 +25,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 10
-#/run/save on
 #
 /gun/particle e-
 /gun/energy 6 GeV
diff --git a/examples/extended/electromagnetic/TestEm3/run07.mac b/examples/extended/electromagnetic/TestEm3/run07.mac
index 88b24982f2..99238d5dbe 100644
--- a/examples/extended/electromagnetic/TestEm3/run07.mac
+++ b/examples/extended/electromagnetic/TestEm3/run07.mac
@@ -1,4 +1,4 @@
-# $Id: run07.mac,v 1.1 1999/10/11 16:55:35 maire Exp $
+# $Id: run07.mac,v 1.2 2000/01/21 09:11:05 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -21,7 +21,6 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 100
-#/run/save on
 #
 /gun/particle proton
 /gun/energy 500 MeV
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
index f5963bd21b..f51d8be09d 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3CalorHit.cc,v 1.1.4.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3CalorHit.cc,v 1.2 1999/12/15 14:49:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
index 4be8fe5f3e..b432227eae 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3CalorimeterSD.cc,v 1.1.4.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3CalorimeterSD.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -79,13 +79,13 @@ G4bool Em3CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
       calHit->AddAbs(AbsorNo,edep,stepl);
       HitID[LayerNumber] = CalCollection->insert(calHit) - 1;
       if (verboseLevel>0)
-        G4cout << " New Calorimeter Hit on layer: " << LayerNumber << endl;
+        G4cout << " New Calorimeter Hit on layer: " << LayerNumber << G4endl;
     }
   else
     { 
       (*CalCollection)[HitID[LayerNumber]]->AddAbs(AbsorNo,edep,stepl);
       if (verboseLevel>0)
-        G4cout << " Energy added to Layer: " << LayerNumber << endl; 
+        G4cout << " Energy added to Layer: " << LayerNumber << G4endl; 
     }
     
   return true;
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
index 5a7ef85aa6..632cb67053 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3DetectorConstruction.cc,v 1.1.4.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3DetectorConstruction.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -238,7 +238,7 @@ G4Material* beam = new G4Material(name="Beam", density, ncomponents=1,
                                       kStateGas,temperature,pressure);
 beam->AddMaterial(Air, fractionmass=1.);
 
-G4cout << *(G4Material::GetMaterialTable()) << endl;
+G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //default materials of the calorimeter
   AbsorMaterial[0] = Pb;
@@ -381,8 +381,8 @@ void Em3DetectorConstruction::PrintCalorParameters()
          << "\n ---> The calorimeter is " << NbOfLayers << " layers of:";
   for (G4int i=0; i<NbOfAbsor; i++)
      { 
-       G4cout << "\n \t" << setw(12) << AbsorMaterial[i]->GetName() <<": "
-              << setw(6) << G4BestUnit(AbsorThickness[i],"Length");
+       G4cout << "\n \t" << G4std::setw(12) << AbsorMaterial[i]->GetName() <<": "
+              << G4std::setw(6) << G4BestUnit(AbsorThickness[i],"Length");
      }
   G4cout << "\n-------------------------------------------------------------\n";
 }
@@ -396,7 +396,7 @@ void Em3DetectorConstruction::SetNbOfAbsor(G4int ival)
   if (ival < 1 || ival > MaxAbsor)
     { G4cout << "\n ---> warning from SetNbOfAbsor: " 
              << ival << " must be at least 1 and and most " << MaxAbsor 
-	     << ". Command refused" << endl;
+	     << ". Command refused" << G4endl;
       return;
     }  
   NbOfAbsor = ival;
@@ -409,7 +409,7 @@ void Em3DetectorConstruction::SetAbsorMaterial(G4int ival,G4String material)
   //
   if (ival >= NbOfAbsor)
     { G4cout << "\n --->warning from SetAbsorMaterial: absor number " 
-             << ival << " out of range. Command refused" << endl;
+             << ival << " out of range. Command refused" << G4endl;
       return;
     }
          
@@ -425,12 +425,12 @@ void Em3DetectorConstruction::SetAbsorThickness(G4int ival,G4double val)
   //
   if (ival >= NbOfAbsor)
     { G4cout << "\n --->warning from SetAbsorThickness: absor number " 
-             << ival << " out of range. Command refused" << endl;
+             << ival << " out of range. Command refused" << G4endl;
       return;
     }
   if (val <= DBL_MIN)
     { G4cout << "\n --->warning from SetAbsorThickness: thickness " 
-             << val  << " out of range. Command refused" << endl;
+             << val  << " out of range. Command refused" << G4endl;
       return;
     }     	      
   AbsorThickness[ival] = val;
@@ -444,7 +444,7 @@ void Em3DetectorConstruction::SetCalorSizeYZ(G4double val)
   //
   if (val <= DBL_MIN)
     { G4cout << "\n --->warning from SetCalorSizeYZ: thickness " 
-             << val  << " out of range. Command refused" << endl;
+             << val  << " out of range. Command refused" << G4endl;
       return;
     }       
   CalorSizeYZ = val;
@@ -458,7 +458,7 @@ void Em3DetectorConstruction::SetNbOfLayers(G4int ival)
   //
   if (ival < 1)
     { G4cout << "\n --->warning from SetNbOfLayers: " 
-             << ival << " must be at least 1. Command refused" << endl;
+             << ival << " must be at least 1. Command refused" << G4endl;
       return;
     }  
   NbOfLayers = ival;
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
index 7bd4d65b76..85e9b110b2 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3DetectorMessenger.cc,v 1.1.4.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3DetectorMessenger.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -123,7 +123,7 @@ void Em3DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
      G4int num; G4double tick;
      char mat[30],unts[30];
      const char* t = newValue;
-     istrstream is((char*)t);
+     G4std::istrstream is((char*)t);
      is >> num >> mat >> tick >> unts;
      G4String material=mat, unt=unts;
      tick *= G4UIcommand::ValueOf(unt);
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
index bac490c126..5a8ccb72cb 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3EventAction.cc,v 1.1.2.1.2.1 1999/12/07 20:47:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3EventAction.cc,v 1.4 2000/01/21 09:11:06 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -35,7 +35,9 @@
 #include "G4UnitsTable.hh"
 #include "Randomize.hh"
 
-#include "CLHEP/Hist/HBookFile.h"
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -59,7 +61,7 @@ void Em3EventAction::BeginOfEventAction(const G4Event* evt)
 {   
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin Of Event: " << evtNb << endl;
+    G4cout << "\n---> Begin Of Event: " << evtNb << G4endl;
     
  if (calorimeterCollID==-1)
   {
@@ -77,10 +79,13 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
   G4int NbHits=0;
   G4int NbOfAbsor=Detector->GetNbOfAbsor();
   G4double totEAbs, totLAbs;
-  HepTuple* ntuple=Em3Run->GetnTuple();
   char str1[6], str2[6];
   strcpy(str1,"EAbs");strcpy(str2,"LAbs");
     
+#ifndef G4NOHIST  
+  HepTuple* ntuple=Em3Run->GetnTuple();
+#endif  
+     
   if (HCE) CHC = (Em3CalorHitsCollection*)(HCE->GetHC(calorimeterCollID));
 
   if (CHC)
@@ -94,14 +99,18 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
              totLAbs += (*CHC)[j]->GetTrakAbs(k);     
             }
          Em3Run->fillPerEvent(k,totEAbs,totLAbs);
-      
+	 
+#ifndef G4NOHIST        
          //fill ntuple
          //	 
 	 str1[4] = str2[4] = (char)((int)('0') + k);
          ntuple->column(str1,totEAbs);
          ntuple->column(str2,totLAbs);
+#endif  	 
        }
-      ntuple->dumpData();       	  
+#ifndef G4NOHIST       
+      ntuple->dumpData();
+#endif             	  
     }
     
   if (G4VVisManager::GetConcreteInstance())
@@ -125,7 +134,7 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
      G4int evtNb = evt->GetEventID();
      if (evtNb%printModulo == 0)
        { 
-        G4cout << "\n---> End of Event: " << evtNb << endl;
+        G4cout << "\n---> End of Event: " << evtNb << G4endl;
         HepRandom::showEngineStatus();
        }
     }     
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
index a1ed99b632..51cb7f5b6a 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3EventActionMessenger.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3EventActionMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
index 1344104cf6..e268f1b9a8 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PhysicsList.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PhysicsList.cc,v 1.3 1999/12/15 14:49:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -161,7 +161,7 @@ void Em3PhysicsList::ConstructEM()
       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);      
-
+      
     } else if (particleName == "e+") {
       //positron      
       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
@@ -182,7 +182,7 @@ void Em3PhysicsList::ConstructEM()
 	       (particle->GetParticleName() != "chargedgeantino")) {
       //all others charged particles except geantino
       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
-      pmanager->AddProcess(new G4hIonisation    ,   -1,2,2);      
+      pmanager->AddProcess(new G4hIonisation,       -1,2,2);
     }
   }
 }
@@ -213,7 +213,7 @@ void Em3PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "Em3PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
index 4078bf644c..f4c858ea65 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PrimaryGeneratorAction.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
index 2c486b31e1..105fb14955 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
index 57d5bb1c0e..b46a671011 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3RunAction.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3RunAction.cc,v 1.4 2000/01/21 09:11:07 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -24,10 +24,11 @@
 #include "G4UnitsTable.hh"
 
 #include "Randomize.hh"
-#include "CLHEP/Hist/HBookFile.h"
-
-#include <iomanip.h>
+#include "g4std/iomanip"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -36,7 +37,6 @@ Em3RunAction::Em3RunAction(Em3DetectorConstruction* det)
 {
   bookHisto(); 
   runMessenger = new Em3RunActionMessenger(this);   
-  saveFlag = "off";
   saveRndm = 1;  
 }
 
@@ -44,28 +44,33 @@ Em3RunAction::Em3RunAction(Em3DetectorConstruction* det)
 
 Em3RunAction::~Em3RunAction()
 {
+  delete runMessenger;
+  
+#ifndef G4NOHIST  
  // Delete HBOOK stuff
   delete ntuple;
   delete hbookManager;
-  delete runMessenger;
+#endif  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em3RunAction::bookHisto()
 {
+#ifndef G4NOHIST
   // init hbook
   hbookManager = new HBookFile("TestEm3.ntupl", 68);
 
   // book a ntuple
   ntuple = hbookManager->ntuple("sum per event");
+#endif   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   // save Rndm status
   if (saveRndm > 0)
@@ -83,8 +88,7 @@ void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
   if (G4VVisManager::GetConcreteInstance())
     {
       G4UImanager* UI = G4UImanager::GetUIpointer(); 
-      UI->ApplyCommand("/vis/clear/view");
-      UI->ApplyCommand("/vis/draw/current");
+      UI->ApplyCommand("/vis/scene/notifyHandlers");
     } 
 }
 
@@ -93,7 +97,7 @@ void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
 void Em3RunAction::EndOfRunAction(const G4Run* aRun)
 {
   if (G4VVisManager::GetConcreteInstance())
-     G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
+     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
      
   //compute and print statistic
   //     
@@ -102,11 +106,11 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
   
   G4double MeanEAbs,rmsEAbs,MeanLAbs,rmsLAbs;
   
-  G4long oldform = G4cout.setf(ios::fixed,ios::floatfield);
+  G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
   G4int  oldprec = G4cout.precision(2);
     
   G4cout << "\n-------------------------------------------------------------\n"
-         << setw(51) << "total energy dep" << setw(30) << "total tracklen \n \n";
+         << G4std::setw(51) << "total energy dep" << G4std::setw(30) << "total tracklen \n \n";
 	   
   for (G4int k=0; k<Detector->GetNbOfAbsor(); k++)
     {
@@ -120,21 +124,23 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
      //    
      G4cout
      << " Absorber" << k 
-     << " (" << setw(12) << Detector->GetAbsorMaterial(k)->GetName() << ") :" 
-     << setw( 7) << G4BestUnit(MeanEAbs,"Energy") << " +- "
-     << setw( 5) << G4BestUnit( rmsEAbs,"Energy")
-     << setw(12) << G4BestUnit(MeanLAbs,"Length") << " +- "
-     << setw( 5) << G4BestUnit( rmsLAbs,"Length")
-     << endl;
+     << " (" << G4std::setw(12) << Detector->GetAbsorMaterial(k)->GetName() << ") :" 
+     << G4std::setw( 7) << G4BestUnit(MeanEAbs,"Energy") << " +- "
+     << G4std::setw( 5) << G4BestUnit( rmsEAbs,"Energy")
+     << G4std::setw(12) << G4BestUnit(MeanLAbs,"Length") << " +- "
+     << G4std::setw( 5) << G4BestUnit( rmsLAbs,"Length")
+     << G4endl;
     }
     
   G4cout << "\n-------------------------------------------------------------";
-  G4cout << endl;  
-  G4cout.setf(oldform,ios::floatfield);
+  G4cout << G4endl;  
+  G4cout.setf(oldform,G4std::ios::floatfield);
   G4cout.precision(oldprec);
   
+#ifndef G4NOHIST  
   // Write histogram file 
-  if (saveFlag == "on") hbookManager->write();
+  hbookManager->write();
+#endif  
   
   // save Rndm status
   if (saveRndm == 1)
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
index 2bf4be22a2..1d95888cfd 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3RunActionMessenger.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3RunActionMessenger.cc,v 1.3 2000/01/21 09:11:07 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -27,15 +27,7 @@
 
 Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
 :Em3Run(run)
-{ 
-  SaveCmd = new G4UIcmdWithAString("/run/save",this);
-  SaveCmd->SetGuidance("Save run statistic");
-  SaveCmd->SetGuidance("  Choice : on(default),off");
-  SaveCmd->SetParameterName("choice",true);
-  SaveCmd->SetDefaultValue("on");
-  SaveCmd->SetCandidates("on off");
-  SaveCmd->AvailableForStates(Idle);
-   
+{    
   RndmDir = new G4UIdirectory("/rndm/");
   RndmDir->SetGuidance("Rndm status control.");
   
@@ -60,21 +52,18 @@ Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
 
 Em3RunActionMessenger::~Em3RunActionMessenger()
 {
-  delete SaveCmd;
   delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em3RunActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
-{ 
-  if (command == SaveCmd) Em3Run->SetSaveFlag(newValue);
-  
+{   
   if (command == RndmSaveCmd)
       Em3Run->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValue));
 		 
   if (command == RndmReadCmd)
-    { G4cout << "\n---> rndm status restored from file: " << newValue << endl;
+    { G4cout << "\n---> rndm status restored from file: " << newValue << G4endl;
       HepRandom::restoreEngineStatus(newValue);
       HepRandom::showEngineStatus();
     }     
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
index c821aafc26..cffacc6ff1 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3SteppingAction.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3SteppingAction.cc,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
new file mode 100644
index 0000000000..d14badbaa1
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em3SteppingVerbose.cc,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em3SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em3SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em3SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em3SteppingVerbose::Em3SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em3SteppingVerbose::~Em3SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em3SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em3SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
index c1918e943a..e2e41f7ea5 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3VisManager.cc,v 1.1.4.1 1999/12/07 20:47:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em3VisManager.cc,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -131,7 +131,7 @@ void Em3VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm4/GNUmakefile b/examples/extended/electromagnetic/TestEm4/GNUmakefile
index 4adfa53e73..09975ef9cc 100644
--- a/examples/extended/electromagnetic/TestEm4/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm4/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/10/12 11:26:50 maire Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/20 17:27:54 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,7 +16,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm4/History b/examples/extended/electromagnetic/TestEm4/History
index 856045a98a..ca71b88db3 100644
--- a/examples/extended/electromagnetic/TestEm4/History
+++ b/examples/extended/electromagnetic/TestEm4/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.1 1999/10/12 11:26:53 maire Exp $
+$Id: History,v 1.2 2000/01/20 17:27:54 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,6 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
-16.12.98 - created. Michel Maire
+17-01-00 cppflag G4NOHIST to protect hbook histograms.     
 12.10.99 - moved to examples/extended/electromagnetic
-
+16.12.98 - created. Michel Maire
diff --git a/examples/extended/electromagnetic/TestEm4/README b/examples/extended/electromagnetic/TestEm4/README
index f93ac2db45..af57d16b94 100644
--- a/examples/extended/electromagnetic/TestEm4/README
+++ b/examples/extended/electromagnetic/TestEm4/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/10/12 11:26:53 maire Exp $
+$Id: README,v 1.2 2000/01/20 17:27:55 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -41,7 +41,6 @@ $Id: README,v 1.1 1999/10/12 11:26:53 maire Exp $
  5- PHYSICS SURVEY
  
  	the energy deposited in C6F6 is histogramed (HEP Hist)
- 	the command '/run/save on' allows to save the histogram on file.
  	
  6- HOW TO START ?
  
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.cc b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
index 1bdc156434..46f7ae7368 100644
--- a/examples/extended/electromagnetic/TestEm4/TestEm4.cc
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: TestEm4.cc,v 1.2.4.1 1999/12/07 20:47:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: TestEm4.cc,v 1.4 2000/03/09 11:27:37 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -60,9 +60,9 @@ int main(int argc,char** argv) {
     
   // set user action classes
   runManager->SetUserAction(new Em4PrimaryGeneratorAction);
-  Em4RunAction* RunAct     (new Em4RunAction);
+  Em4RunAction* RunAct     = new Em4RunAction;
   runManager->SetUserAction(RunAct);
-  Em4EventAction* EvAct    (new Em4EventAction(RunAct));  
+  Em4EventAction* EvAct    = new Em4EventAction(RunAct);  
   runManager->SetUserAction(EvAct);
   runManager->SetUserAction(new Em4SteppingAction(EvAct));
   
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.in b/examples/extended/electromagnetic/TestEm4/TestEm4.in
new file mode 100644
index 0000000000..91eba45c03
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.in
@@ -0,0 +1,16 @@
+# $Id: TestEm4.in,v 1.1 2000/01/21 13:53:25 maire Exp $
+#
+# Macro file for "TestEm4.cc"
+# 
+# (can be run in batch, without graphic)
+#
+/control/verbose  2
+#
+#/run/particle/setCut 1.0 mm
+#/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 10000
+#
+/run/beamOn 50000
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.out b/examples/extended/electromagnetic/TestEm4/TestEm4.out
new file mode 100644
index 0000000000..0b266a5858
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.out
@@ -0,0 +1,104 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+Constructing Visualization Manager....
+Initialising Visualization Manager....
+Registering graphics systems....
+ Material: FluorCarbonate     density:  1.610 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  22.435 cm 
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:  38.74 %  Abundance  50.00 %
+   --->  Element: Fluorine  N   Z =  9.0   N =  19.0   A =  18.99 g/mole  fractionMass:  61.26 %  Abundance  50.00 %
+Em4PhysicsList::SetCuts:CutLength : 1 (mm)
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  1 mm            1 mm                       -1 mm             
+Cut in energy
+     FluorCarbonate        3.61 keV         429 keV             ----------             
+ Cuts in energy have not calculated yet !!
+ Enter /run/initialize command to calculate cuts 
+===================================================
+# $Id: TestEm4.out,v 1.1 2000/01/21 13:53:26 maire Exp $
+#
+# Macro file for "TestEm4.cc"
+# 
+# (can be run in batch, without graphic)
+#
+#
+#/run/particle/setCut 1.0 mm
+#/run/initialize
+#
+/run/verbose 2
+/event/drawTracks none
+/event/printModulo 10000
+#
+/run/beamOn 50000
+### Run 0 start.
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 9876, 54321
+----------------------------------------
+Start closing geometry.
+Start Run processing.
+
+---> Begin of Event: 0
+
+---> Begin of Event: 10000
+
+---> Begin of Event: 20000
+
+---> Begin of Event: 30000
+
+---> Begin of Event: 40000
+Run terminated.
+Run Summary
+  Number of events processed : 50000
+  User=16s Real=21s Sys=2.9s
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 1887355663, 136449826
+----------------------------------------
+Graphics systems deleted.
+VisManager deleting.
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
index f75c6d0c47..d5e65ee50d 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4DetectorConstruction.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4DetectorConstruction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
index f2054fc5b1..0fb4d0098c 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4EventAction.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4EventAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
index 7621cf3ed8..67e00d3b9e 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4EventActionMessenger.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4EventActionMessenger.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
index 866e979afe..0f7807ebfc 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4PhysicsList.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4PhysicsList.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
index 6595ce3249..9b661625e5 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4PrimaryGeneratorAction.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
index 0970ec1ff8..bedfae0904 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4RunAction.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4RunAction.hh,v 1.3 2000/01/20 17:27:55 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -24,8 +24,10 @@
 class G4Run;
 class Em4RunActionMessenger;
 
-class HepTupleManager;
-class HepHistogram;
+#ifndef G4NOHIST
+  class HepTupleManager;
+  class HepHistogram;
+#endif
 
 class Em4RunAction : public G4UserRunAction
 {
@@ -36,23 +38,25 @@ class Em4RunAction : public G4UserRunAction
   public:
     void BeginOfRunAction(const G4Run*);
     void   EndOfRunAction(const G4Run*);
-    
-    HepHistogram* GetHisto(G4int id) {return histo[id];}
-    
-    void  SetSaveFlag(G4String val) {saveFlag = val;}
+
     void  SetRndmFreq(G4int    val) {saveRndm = val;}
     G4int GetRndmFreq()             {return saveRndm;}
     
+#ifndef G4NOHIST    
+    HepHistogram* GetHisto(G4int id) {return histo[id];}
+#endif
+        
   private:
     void bookHisto();
     
-  private:   
+  private:  
+    Em4RunActionMessenger* runMessenger;
+    G4int saveRndm;
+    
+#ifndef G4NOHIST         
     HepTupleManager* hbookManager;    
     HepHistogram* histo[1];
-    
-    Em4RunActionMessenger* runMessenger;
-    G4String saveFlag;
-    G4int saveRndm;   
+#endif         
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
index 4993d00323..e903dfd131 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4RunActionMessenger.hh,v 1.1.4.1 1999/12/07 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4RunActionMessenger.hh,v 1.3 2000/01/20 17:27:56 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -36,7 +36,6 @@ class Em4RunActionMessenger: public G4UImessenger
     
   private:
     Em4RunAction*          Em4Run;   
-    G4UIcmdWithAString*    SaveCmd;
     G4UIdirectory*         RndmDir;
     G4UIcmdWithAnInteger*  RndmSaveCmd;    
     G4UIcmdWithAString*    RndmReadCmd;
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
index 5f36c9113c..4e3fc4fd45 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4SteppingAction.hh,v 1.1.4.1 1999/12/07 20:47:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4SteppingAction.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
index 7cba0753f5..422946f071 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4SteppingVerbose.hh,v 1.1.4.1 1999/12/07 20:47:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4SteppingVerbose.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
index f6a8da6822..ee88cae317 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4VisManager.hh,v 1.1.4.1 1999/12/07 20:47:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4VisManager.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/init.mac b/examples/extended/electromagnetic/TestEm4/init.mac
index b5333b9c3f..59f8039847 100644
--- a/examples/extended/electromagnetic/TestEm4/init.mac
+++ b/examples/extended/electromagnetic/TestEm4/init.mac
@@ -31,4 +31,5 @@
 /tracking/storeTrajectory 1
 /event/drawTracks charged
 #
-/tracking/verboseWithUnits
+# Flush visualization
+/vis/viewer/update
diff --git a/examples/extended/electromagnetic/TestEm4/run01.mac b/examples/extended/electromagnetic/TestEm4/run01.mac
index 83acdcde85..56630beb41 100644
--- a/examples/extended/electromagnetic/TestEm4/run01.mac
+++ b/examples/extended/electromagnetic/TestEm4/run01.mac
@@ -1,4 +1,4 @@
-# $Id: run01.mac,v 1.1 1999/10/12 11:26:54 maire Exp $
+# $Id: run01.mac,v 1.2 2000/01/20 17:27:55 maire Exp $
 #
 # Macro file for "TestEm4.cc"
 # 
@@ -12,6 +12,5 @@
 /run/verbose 2
 /event/drawTracks none
 /event/printModulo 1000
-/run/save on
 #
 /run/beamOn 100000
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
index 078ea62209..74c1372d1d 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4DetectorConstruction.cc,v 1.1.4.1 1999/12/07 20:47:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4DetectorConstruction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -58,7 +58,7 @@ G4VPhysicalVolume* Em4DetectorConstruction::Construct()
   matC6F6->AddElement(elC, natoms=6);
   matC6F6->AddElement(elF, natoms=6);
   
-  G4cout << matC6F6 << endl;
+  G4cout << matC6F6 << G4endl;
   
   //     
   // Container
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
index 31b439ba6c..740de2e66c 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4EventAction.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4EventAction.cc,v 1.3 2000/01/20 17:27:56 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -27,7 +27,9 @@
 #include "G4UnitsTable.hh"
 #include "Randomize.hh"
 
-#include "CLHEP/Hist/HBookFile.h"
+#ifndef G4NOHIST
+  #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -50,7 +52,7 @@ void Em4EventAction::BeginOfEventAction( const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin of Event: " << evtNb << endl;
+    G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
     
  TotalEnergyDeposit = 0.;
 }
@@ -61,9 +63,11 @@ void Em4EventAction::EndOfEventAction( const G4Event* evt)
 {
   if (drawFlag != "none") 
     G4cout << " Energy deposit: " 
-           << G4BestUnit(TotalEnergyDeposit,"Energy") << endl;
-
+           << G4BestUnit(TotalEnergyDeposit,"Energy") << G4endl;
+	   
+#ifndef G4NOHIST
   Em4Run->GetHisto(0)->accumulate(TotalEnergyDeposit/MeV);
+#endif
 
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
 
@@ -87,7 +91,7 @@ void Em4EventAction::EndOfEventAction( const G4Event* evt)
      G4int evtNb = evt->GetEventID();
      if (evtNb%printModulo == 0)
        { 
-        G4cout << "\n---> End of Event: " << evtNb << endl;
+        G4cout << "\n---> End of Event: " << evtNb << G4endl;
         HepRandom::showEngineStatus();
        }
     }     
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
index de52b5eea3..cbd106eaba 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4EventActionMessenger.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4EventActionMessenger.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
index ea739f461b..9adeaabbfc 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4PhysicsList.cc,v 1.2.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4PhysicsList.cc,v 1.3 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -128,7 +128,7 @@ void Em4PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "Em4PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
   }
   
   //special for low energy physics
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
index dbb6d903f7..4b20dcda96 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4PrimaryGeneratorAction.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
index 897509e402..d365edb492 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4RunAction.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4RunAction.cc,v 1.4 2000/01/20 17:27:57 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -22,7 +22,10 @@
 #include "G4ios.hh"
 
 #include "Randomize.hh"
-#include "CLHEP/Hist/HBookFile.h"
+
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -31,39 +34,42 @@ Em4RunAction::Em4RunAction()
   bookHisto();
   
   runMessenger = new Em4RunActionMessenger(this);
-  saveFlag = "off";
   saveRndm = 1;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em4RunAction::~Em4RunAction()
-{ 
+{
+  delete runMessenger;
+
+#ifndef G4NOHIST 
  // Delete HBOOK stuff
   delete [] histo;
   delete hbookManager;
-  
-  delete runMessenger;
+#endif  
+
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em4RunAction::bookHisto()
 {
+#ifndef G4NOHIST 
   // init hbook
   hbookManager = new HBookFile("TestEm4.histo", 68);
 
   // book histograms
   histo[0] = hbookManager->histogram("total energy deposit in C6F6 (MeV)"
                                    , 100,0.,10.);
-    
+#endif      
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em4RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   // save Rndm status
   if (saveRndm > 0)
@@ -77,8 +83,7 @@ void Em4RunAction::BeginOfRunAction(const G4Run* aRun)
 
   if(pVVisManager)
   {
-    UI->ApplyCommand("/vis/clear/view");
-    UI->ApplyCommand("/vis/draw/current");
+    UI->ApplyCommand("/vis/scene/notifyHandlers");
   } 
 }
 
@@ -87,16 +92,19 @@ void Em4RunAction::BeginOfRunAction(const G4Run* aRun)
 void Em4RunAction::EndOfRunAction(const G4Run* aRun)
 {  
   if (G4VVisManager::GetConcreteInstance())
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
-    
-  // Write histogram file 
-  if (saveFlag == "on") hbookManager->write();
-  
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
+
   // save Rndm status
   if (saveRndm == 1)
     { HepRandom::showEngineStatus();
-      HepRandom::saveEngineStatus("endOfRun.rndm");
-    }      
+      HepRandom::saveEngineStatus("endOfRun.rndm");      
+    }
+    
+#ifndef G4NOHIST     
+  // Write histogram file 
+  hbookManager->write();
+#endif
+            
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
index 3815626acd..16f705710d 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4RunActionMessenger.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4RunActionMessenger.cc,v 1.3 2000/01/20 17:27:57 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -27,15 +27,7 @@
 
 Em4RunActionMessenger::Em4RunActionMessenger(Em4RunAction* run)
 :Em4Run(run)
-{ 
-  SaveCmd = new G4UIcmdWithAString("/run/save",this);
-  SaveCmd->SetGuidance("Save run statistic");
-  SaveCmd->SetGuidance("  Choice : on(default),off");
-  SaveCmd->SetParameterName("choice",true);
-  SaveCmd->SetDefaultValue("on");
-  SaveCmd->SetCandidates("on off");
-  SaveCmd->AvailableForStates(Idle);
-  
+{   
   RndmDir = new G4UIdirectory("/rndm/");
   RndmDir->SetGuidance("Rndm status control.");
   
@@ -60,7 +52,6 @@ Em4RunActionMessenger::Em4RunActionMessenger(Em4RunAction* run)
 
 Em4RunActionMessenger::~Em4RunActionMessenger()
 {  
-  delete SaveCmd;
   delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;  
 }
 
@@ -68,13 +59,11 @@ Em4RunActionMessenger::~Em4RunActionMessenger()
 
 void Em4RunActionMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
 { 
-  if (command == SaveCmd) Em4Run->SetSaveFlag(newValue);
-  
   if (command == RndmSaveCmd)
       Em4Run->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValue));
 		 
   if (command == RndmReadCmd)
-    { G4cout << "\n---> rndm status restored from file: " << newValue << endl;
+    { G4cout << "\n---> rndm status restored from file: " << newValue << G4endl;
       HepRandom::restoreEngineStatus(newValue);
       HepRandom::showEngineStatus();
     }   
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
index d59e0c5644..7af7dc1e4a 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4SteppingAction.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4SteppingAction.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
index de9888f71b..c4231e64e7 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4SteppingVerbose.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4SteppingVerbose.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -50,43 +50,43 @@ void Em4SteppingVerbose::StepInfo()
   if( verboseLevel >= 1 ){
     if( verboseLevel >= 4 ) VerboseTrack();
     if( verboseLevel >= 3 ){
-      G4cout << endl;    
-      G4cout << setw( 5) << "#Step#"     << " "
-	     << setw( 6) << "X"          << "    "
-	     << setw( 6) << "Y"          << "    "  
-	     << setw( 6) << "Z"          << "    "
-	     << setw( 9) << "KineE"      << " "
-	     << setw( 9) << "dEStep"     << " "  
-	     << setw(10) << "StepLeng"     
-	     << setw(10) << "TrakLeng" 
-	     << setw(10) << "NextVolu" 
-	     << setw(10) << "Process"   << endl;	          
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
-    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	   << setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	   << setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
     } else {
-      G4cout << setw(10) << "OutOfWorld";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
 	->GetProcessName();
     } else {
       G4cout << "User Limit";
     }
 
-    G4cout << endl;
+    G4cout << G4endl;
 
     if( verboseLevel == 2 ){
       G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
@@ -94,35 +94,35 @@ void Em4SteppingVerbose::StepInfo()
 	                    fN2ndariesPostStepDoIt;
       if(tN2ndariesTot>0){
 	G4cout << "    :----- List of 2ndaries - "
-	       << "#SpawnInStep=" << setw(3) << tN2ndariesTot 
-	       << "(Rest="  << setw(2) << fN2ndariesAtRestDoIt
-	       << ",Along=" << setw(2) << fN2ndariesAlongStepDoIt
-	       << ",Post="  << setw(2) << fN2ndariesPostStepDoIt
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
 	       << " ---------------"
-	       << endl;
+	       << G4endl;
 
 	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
                         lp1<(*fSecondary).entries(); lp1++){
 	  G4cout << "    : "
-		 << setw(6)
+		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
-		 << setw(6)
+		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
-		 << setw(6)
+		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
-		 << setw(6)
+		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
-		 << setw(10)
+		 << G4std::setw(10)
 		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
-	  G4cout << endl;
+	  G4cout << G4endl;
 	}
               
 	G4cout << "    :-----------------------------"
 	       << "----------------------------------"
 	       << "-- EndOf2ndaries Info ---------------"
-	       << endl;
+	       << G4endl;
       }
     }
     
@@ -139,32 +139,32 @@ void Em4SteppingVerbose::TrackingStarted()
 G4int prec = G4cout.precision(3);
   if( verboseLevel > 0 ){
 
-    G4cout << setw( 5) << "Step#"      << " "
-           << setw( 6) << "X"          << "    "
-	   << setw( 6) << "Y"          << "    "  
-	   << setw( 6) << "Z"          << "    "
-	   << setw( 9) << "KineE"      << " "
-	   << setw( 9) << "dEStep"     << " "  
-	   << setw(10) << "StepLeng"  
-	   << setw(10) << "TrakLeng"
-	   << setw(10) << "NextVolu"
-	   << setw(10) << "Process"    << endl;	     
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
 
-    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	   << setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	   << setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	   << setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
     } else {
-      G4cout << setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
     }
-    G4cout << setw(10) << "initStep" << endl;
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
   }
   G4cout.precision(prec);
 }
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
index addf7ac1f6..48fcb70f2c 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em4VisManager.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em4VisManager.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -131,7 +131,7 @@ void Em4VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm5/GNUmakefile b/examples/extended/electromagnetic/TestEm5/GNUmakefile
index ee402f7cf9..b44285d6af 100644
--- a/examples/extended/electromagnetic/TestEm5/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm5/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/10/12 12:23:16 maire Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/20 15:34:37 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,7 +16,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm5/History b/examples/extended/electromagnetic/TestEm5/History
index f81577dad0..d0182a8ad8 100644
--- a/examples/extended/electromagnetic/TestEm5/History
+++ b/examples/extended/electromagnetic/TestEm5/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.1 1999/10/12 12:23:17 maire Exp $
+$Id: History,v 1.2 2000/01/20 15:34:38 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -14,6 +14,10 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+17-01-00 cppflag G4NOHIST to protect hbook histograms.
+         new histo: normalizsed distribution of energy deposit.
+	 new materials (mainly gas)
      
 12-10-99 moved to examples/extended/electromagnetic/TestEm5
 
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.cc b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
index 419152a07e..13ac5e32b6 100644
--- a/examples/extended/electromagnetic/TestEm5/TestEm5.cc
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: TestEm5.cc,v 1.1.4.1 1999/12/07 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: TestEm5.cc,v 1.3 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -35,13 +35,16 @@
 #include "Em5RunAction.hh"
 #include "Em5EventAction.hh"
 #include "Em5SteppingAction.hh"
-
+#include "Em5SteppingVerbose.hh"
 
 int main(int argc,char** argv) {
 
   //choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
   
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new Em5SteppingVerbose);
+    
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.in b/examples/extended/electromagnetic/TestEm5/TestEm5.in
new file mode 100644
index 0000000000..ebb78bfbf4
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.in
@@ -0,0 +1,34 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 20.5 mum  
+/calor/setAbsYZ    10 cm
+/calor/update
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run19.paw
+#  PLOT: energy deposit distribution in absorber
+/plots/setnbinEn 65
+/plots/setEnlow   0. keV
+/plots/setEnhigh 13. keV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.0  mum
+/run/initialize
+#
+/gun/particle pi+ 
+/gun/energy 5. GeV
+
+/event/printModulo 10000
+#
+/run/beamOn 100000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.out b/examples/extended/electromagnetic/TestEm5/TestEm5.out
new file mode 100644
index 0000000000..81171840cf
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.out
@@ -0,0 +1,424 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+Constructing Visualization Manager....
+Initialising Visualization Manager....
+Registering graphics systems....
+
+***** Table : Nb of materials = 17 *****
+
+ Material: Beryllium     density:  1.848 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  35.267 cm 
+   --->  Element: Beryllium      Z =  4.0   N =   9.0   A =   9.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: Aluminium     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+   --->  Element: Aluminium      Z = 13.0   N =  27.0   A =  26.98 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:  Silicon     density:  2.330 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   9.368 cm 
+   --->  Element:  Silicon      Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: liquidArgon     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+   --->  Element:    Argon Ar   Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Iron     density:  7.870 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.759 cm 
+   --->  Element:     Iron      Z = 26.0   N =  55.9   A =  55.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:   Copper     density:  8.960 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.436 cm 
+   --->  Element:   Copper      Z = 29.0   N =  63.5   A =  63.55 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Gold     density: 19.320 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.344 mm 
+   --->  Element:     Gold      Z = 79.0   N = 197.0   A = 196.97 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+   --->  Element:     Lead      Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:    Water     density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material:      Air     density:  1.290 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 285.161 m  
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+ Material: XenonGas     density:  5.458 mg/cm3  temperature: 293.15 K  pressure:   1.00 atm  RadLength:  15.539 m  
+   --->  Element:    Xenon Xe   Z = 54.0   N = 131.3   A = 131.29 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: CarbonicGas     density:  1.977 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 183.083 m  
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:  27.29 %  Abundance  33.33 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  72.71 %  Abundance  66.67 %
+
+ Material: ArgonCO2     density:  1.822 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 119.089 m  
+   --->  Element:    Argon Ar   Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass:  78.44 %  Abundance  57.19 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:   5.88 %  Abundance  14.27 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  15.68 %  Abundance  28.54 %
+
+ Material: NewArgonCO2     density:  1.822 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 119.110 m  
+   --->  Element:    Argon Ar   Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass:  78.41 %  Abundance  57.14 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:   5.89 %  Abundance  14.29 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  15.70 %  Abundance  28.57 %
+
+ Material: ArgonCH4     density:  1.709 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 116.373 m  
+   --->  Element:    Argon Ar   Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass:  97.06 %  Abundance  72.66 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:   2.20 %  Abundance   5.47 %
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:   0.74 %  Abundance  21.88 %
+
+ Material: XenonMethanePropane     density:  4.920 mg/cm3  temperature: 293.15 K  pressure:   1.00 atm  RadLength:  17.654 m  
+   --->  Element:    Xenon Xe   Z = 54.0   N = 131.3   A = 131.29 g/mole  fractionMass:  97.12 %  Abundance  48.61 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass:   2.28 %  Abundance  12.50 %
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:   0.60 %  Abundance  38.89 %
+
+ Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 6317232936888469300000.000 km 
+   --->  Element: Galactic      Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+
+
+ The  WORLD   is made of 1.5 cm  of Galactic. The transverse size (YZ) of the world is 2.4 cm 
+ The ABSORBER is made of 1 cm  of Silicon. The transverse size (YZ) is 2 cm 
+ X position of the middle of the absorber 0 fm 
+Em5PhysicsList::SetCuts:CutLength : 1 mm 
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  1 mm            1 mm            1 mm            1 mm             
+Cut in energy
+          Beryllium        1.99 keV         466 keV        4.28 MeV        11.5 MeV            
+          Aluminium        6.89 keV         597 keV        5.02 MeV        13.1 MeV            
+            Silicon        6.89 keV         541 keV        4.72 MeV        12.2 MeV            
+        liquidArgon        6.18 keV         343 keV        3.24 MeV        8.32 MeV            
+               Iron        20.8 keV        1.28 MeV        8.52 MeV          22 MeV            
+             Copper        24.6 keV         1.4 MeV        8.95 MeV          23 MeV            
+               Gold         111 keV        2.28 MeV        11.7 MeV        29.2 MeV            
+               Lead         101 keV        1.38 MeV        8.52 MeV        20.9 MeV            
+              Water         2.9 keV         347 keV        3.39 MeV        8.95 MeV            
+                Air         990 eV          990 eV         48.4 keV        83.2 keV            
+           XenonGas         990 eV         1.75 keV        81.2 keV        91.9 keV            
+        CarbonicGas         990 eV          990 eV         67.5 keV         136 keV            
+           ArgonCO2         990 eV          990 eV         54.1 keV        73.6 keV            
+        NewArgonCO2         990 eV          990 eV         54.1 keV        75.4 keV            
+           ArgonCH4         990 eV          990 eV         49.6 keV        60.4 keV            
+ XenonMethanePropane         990 eV         1.55 keV        78.3 keV         101 keV            
+           Galactic         990 eV          990 eV          990 eV          990 eV             
+===================================================
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/run/verbose 2
+#
+/calor/setAbsMat Silicon   
+
+ The  WORLD   is made of 1.5 cm  of Galactic. The transverse size (YZ) of the world is 2.4 cm 
+ The ABSORBER is made of 1 cm  of Silicon. The transverse size (YZ) is 2 cm 
+ X position of the middle of the absorber 0 fm 
+/calor/setAbsThick 20.5 mum  
+/calor/setAbsYZ    10 cm
+/calor/update
+
+ The  WORLD   is made of 31 mum of Galactic. The transverse size (YZ) of the world is 12 cm 
+ The ABSORBER is made of 21 mum of Silicon. The transverse size (YZ) is 10 cm 
+ X position of the middle of the absorber 0 fm 
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run19.paw
+ hist file = run19.paw
+#  PLOT: energy deposit distribution in absorber
+/plots/setnbinEn 65
+ Nb of bins in Edep plot = 65
+/plots/setEnlow   0. keV
+ Elow  in the  Edep plot = 0
+/plots/setEnhigh 13. keV  
+ Ehigh in the  Edep plot = 0.013
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.0  mum
+/run/initialize
+physicsList->setCut() start.
+Em5PhysicsList::SetCuts:CutLength : 1 mm 
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 150 bins. 
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range               2.13 mm            7 mum           1 mm            1 mm             
+Cut in energy
+          Beryllium        2.45 keV        7.99 keV        4.28 MeV        11.5 MeV            
+          Aluminium        9.84 keV        11.8 keV        5.02 MeV        13.1 MeV            
+            Silicon        9.94 keV        10.1 keV        4.72 MeV        12.2 MeV            
+        liquidArgon        8.91 keV        4.82 keV        3.24 MeV        8.32 MeV            
+               Iron        30.6 keV        47.2 keV        8.52 MeV          22 MeV            
+             Copper          37 keV        49.6 keV        8.95 MeV          23 MeV            
+               Gold         146 keV        65.1 keV        11.7 MeV        29.2 MeV            
+               Lead         123 keV        46.7 keV        8.52 MeV        20.9 MeV            
+              Water        3.99 keV        4.01 keV        3.39 MeV        8.95 MeV            
+                Air         990 eV          990 eV         48.4 keV        83.2 keV            
+           XenonGas         990 eV          990 eV         81.2 keV        91.9 keV            
+        CarbonicGas         990 eV          990 eV         67.5 keV         136 keV            
+           ArgonCO2         990 eV          990 eV         54.1 keV        73.6 keV            
+        NewArgonCO2         990 eV          990 eV         54.1 keV        75.4 keV            
+           ArgonCH4         990 eV          990 eV         49.6 keV        60.4 keV            
+ XenonMethanePropane         990 eV          990 eV         78.3 keV         101 keV            
+           Galactic         990 eV          990 eV          990 eV          990 eV             
+===================================================
+#
+/gun/particle pi+ 
+/gun/energy 5. GeV
+
+/event/printModulo 10000
+#
+/run/beamOn 100000
+### Run 0 start.
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 9876, 54321
+----------------------------------------
+Start closing geometry.
+Start Run processing.
+
+---> Begin of Event: 0
+
+---> Begin of Event: 10000
+
+---> Begin of Event: 20000
+
+---> Begin of Event: 30000
+
+---> Begin of Event: 40000
+
+---> Begin of Event: 50000
+
+---> Begin of Event: 60000
+
+---> Begin of Event: 70000
+
+---> Begin of Event: 80000
+
+---> Begin of Event: 90000
+Run terminated.
+Run Summary
+  Number of events processed : 100000
+  User=46s Real=52s Sys=5.5s
+ ================== run summary =====================
+ end of Run TotNbofEvents = 100000
+    mean charged track length   in absorber=0.0211353 +- 1.94106e-05  mm  
+
+            mean energy deposit in absorber=0.00687 +- 2.37841e-05  MeV 
+
+ mean number of steps in absorber (charged) =0.04068 +- 0.000749567      
+ mean number of steps in absorber (neutral) =0 +- 0      
+
+   mean number of charged secondaries = 0.03764 +- 0.000638617
+
+   mean number of neutral secondaries = 0 +- 0
+
+   mean number of e-s =0.03764  and e+s =0
+
+(number) transmission coeff=1  reflection coeff=0.49968
+
+ energy deposit distribution 
+#entries=100000    #underflows=0    #overflows=5913
+ bin nb      Elow      entries     normalized 
+    0         0           0           0
+    1    0.0002           0           0
+    2    0.0004           0           0
+    3    0.0006           0           0
+    4    0.0008           1        0.05
+    5     0.001           1        0.05
+    6    0.0012           8         0.4
+    7    0.0014          12         0.6
+    8    0.0016          53        2.65
+    9    0.0018         113        5.65
+   10     0.002         238        11.9
+   11    0.0022         415       20.75
+   12    0.0024         761       38.05
+   13    0.0026        1170        58.5
+   14    0.0028        1741       87.05
+   15     0.003        2339      116.95
+   16    0.0032        3056       152.8
+   17    0.0034        3641      182.05
+   18    0.0036        4197      209.85
+   19    0.0038        4456       222.8
+   20     0.004        4531      226.55
+   21    0.0042        4530       226.5
+   22    0.0044        4362       218.1
+   23    0.0046        4206       210.3
+   24    0.0048        4119      205.95
+   25     0.005        3752       187.6
+   26    0.0052        3718       185.9
+   27    0.0054        3478       173.9
+   28    0.0056        3218       160.9
+   29    0.0058        3080         154
+   30     0.006        2772       138.6
+   31    0.0062        2662       133.1
+   32    0.0064        2316       115.8
+   33    0.0066        2150       107.5
+   34    0.0068        1991       99.55
+   35     0.007        1850        92.5
+   36    0.0072        1727       86.35
+   37    0.0074        1519       75.95
+   38    0.0076        1411       70.55
+   39    0.0078        1258        62.9
+   40     0.008        1141       57.05
+   41    0.0082        1075       53.75
+   42    0.0084         956        47.8
+   43    0.0086         929       46.45
+   44    0.0088         800          40
+   45     0.009         762        38.1
+   46    0.0092         685       34.25
+   47    0.0094         650        32.5
+   48    0.0096         601       30.05
+   49    0.0098         576        28.8
+   50      0.01         534        26.7
+   51    0.0102         450        22.5
+   52    0.0104         422        21.1
+   53    0.0106         420          21
+   54    0.0108         383       19.15
+   55     0.011         346        17.3
+   56    0.0112         352        17.6
+   57    0.0114         292        14.6
+   58    0.0116         317       15.85
+   59    0.0118         279       13.95
+   60     0.012         287       14.35
+   61    0.0122         271       13.55
+   62    0.0124         259       12.95
+   63    0.0126         246        12.3
+   64    0.0128         202        10.1
+
+ Emp =           0.004   width=         0.0034  MeV 
+
+
+--------- Ranecu engine status ---------
+ Initial seed (index) = 0
+ Current couple of seeds = 834154625, 1903261884
+----------------------------------------
+#
+
+Graphics systems deleted.
+VisManager deleting.
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+G4SDManager deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
diff --git a/examples/extended/electromagnetic/TestEm5/geant3/testem5.cra b/examples/extended/electromagnetic/TestEm5/geant3/testem5.cra
index 67dffe34cf..7e90b6569b 100644
--- a/examples/extended/electromagnetic/TestEm5/geant3/testem5.cra
+++ b/examples/extended/electromagnetic/TestEm5/geant3/testem5.cra
@@ -251,6 +251,7 @@ C
       CALL GSMATE(26,'COPPER',63.54,29.,8.96,1.430,0.,0,0)
       CALL GSMATE(27,'GOLD',196.967,79.,19.32,0.33,0.,0,0)
       CALL GSMATE(28,'LEAD',207.190,82.,11.35,0.560,0.,0,0)
+      CALL GSMATE(31,'XenonGas',131.29,54.,5.858e-3,1447.8,0.,0,0)      
 C
       CALL GSMIXT(29,'WATER',AWAT,ZWAT,1.00,-2,WWAT)
       CALL GSMIXT(30,'AIR',AAIR,ZAIR,1.205E-3,+2,WAIR)
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
index fb8e79afb2..215d52fe64 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5CalorHit.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5CalorHit.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
index 835d576356..04fd6d00ef 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5CalorimeterSD.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5CalorimeterSD.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
index 873b4187c7..4ee4d494b7 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5DetectorConstruction.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5DetectorConstruction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
index 512a049b3c..7fcac886c5 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5DetectorMessenger.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5DetectorMessenger.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
index 3d217b65f0..0441ae5696 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5EventAction.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5EventAction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
index b60afc111a..c016e3e39a 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5EventActionMessenger.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5EventActionMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
index a4df2b6000..ed378e5ffd 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PhysicsList.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PhysicsList.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
index 7b917a9d95..10de47c452 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PhysicsListMessenger.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PhysicsListMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
index 72147ccf71..494a5de022 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PrimaryGeneratorAction.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
index 58dc406699..24f7e8adfb 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PrimaryGeneratorMessenger.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
index f0ce0e725e..b093815e53 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5RunAction.hh,v 1.1.4.1 1999/12/07 20:47:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5RunAction.hh,v 1.3 2000/01/20 15:34:39 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -18,17 +18,18 @@
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
-#include <iostream.h>
+#include "g4std/iostream"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class Em5RunMessenger;
-
-class HepTupleManager;
-class HepHistogram;
-
 class G4Run;
 
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class Em5RunAction : public G4UserRunAction
@@ -114,10 +115,14 @@ class Em5RunAction : public G4UserRunAction
   private:
 
     G4String histName ;
+    
+#ifndef G4NOHIST    
     HepTupleManager* hbookManager;
     HepHistogram *histo1, *histo2, *histo3, *histo4, *histo5 ;
     HepHistogram *histo6, *histo7, *histo8, *histo9, *histo10;
-
+    HepHistogram          *hi2bis;
+#endif
+    
     G4double EnergySumAbs,EnergySquareSumAbs;
     G4double tlSumAbs,tlsquareSumAbs;
     G4double nStepSumCharged,nStepSum2Charged ;
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
index 48e8adf328..5425b32d11 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5RunMessenger.hh,v 1.1.4.1 1999/12/07 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5RunMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh b/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
index 3c0fc35583..d3c16506b5 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5StepCut.hh,v 1.1.4.1 1999/12/07 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5StepCut.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
index 47fa57252a..62e85947e3 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingAction.hh,v 1.1.4.1 1999/12/07 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5SteppingAction.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
index c727478800..56cf5c6b1d 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingMessenger.hh,v 1.1.4.1 1999/12/07 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5SteppingMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
new file mode 100644
index 0000000000..642fe6e033
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em5SteppingVerbose.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em5SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em5SteppingVerbose;
+
+#ifndef Em5SteppingVerbose_h
+#define Em5SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em5SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  Em5SteppingVerbose();
+ ~Em5SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
index 76b0430e31..240395d421 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5VisManager.hh,v 1.1.4.1 1999/12/07 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5VisManager.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/init.mac b/examples/extended/electromagnetic/TestEm5/init.mac
index 11b53ae9e5..aaa16af56b 100644
--- a/examples/extended/electromagnetic/TestEm5/init.mac
+++ b/examples/extended/electromagnetic/TestEm5/init.mac
@@ -28,3 +28,6 @@
 # if too many tracks cause core dump => storeTrajectory 0
 /tracking/storeTrajectory 1
 /event/drawTracks charged
+#
+# Flush visualization
+/vis/viewer/update
diff --git a/examples/extended/electromagnetic/TestEm5/run17.mac b/examples/extended/electromagnetic/TestEm5/run17.mac
new file mode 100644
index 0000000000..13dba0ec60
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/run17.mac
@@ -0,0 +1,35 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+/calor/setAbsMat NewArgonCO2   
+/calor/setAbsThick 15 mm  
+/calor/setAbsYZ    60 mm
+/calor/update
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run17e.10cm.paw
+#  PLOT: energy deposit distribution in XenonGas
+/plots/setnbinEn 60
+/plots/setEnlow   0. keV
+/plots/setEnhigh  6. keV  
+#
+/calor/cutG 100. mm    
+/calor/cutE 100. mm
+/run/initialize
+#
+#/gun/particle proton 
+#/gun/energy 24 GeV
+/gun/particle e- 
+/gun/energy 25 GeV
+/event/printModulo 1000
+#
+/run/beamOn 100000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm5/run18.mac b/examples/extended/electromagnetic/TestEm5/run18.mac
new file mode 100644
index 0000000000..25183ef8e2
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/run18.mac
@@ -0,0 +1,34 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+/calor/setAbsMat XenonMethanePropane   
+/calor/setAbsThick 23 mm  
+/calor/setAbsYZ    60 mm
+/calor/update
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run18.1mm.paw
+#  PLOT: energy deposit distribution in Gas
+/plots/setnbinEn 50
+/plots/setEnlow   0. keV
+/plots/setEnhigh  20. keV  
+#
+/calor/cutG 1. mm    
+/calor/cutE 1. mm
+/run/initialize
+#
+/gun/particle proton 
+/gun/energy 2.20 GeV
+
+/event/printModulo 1000
+#
+/run/beamOn 100000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm5/run19.mac b/examples/extended/electromagnetic/TestEm5/run19.mac
new file mode 100644
index 0000000000..dcaa476253
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/run19.mac
@@ -0,0 +1,34 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 20.5 mum  
+/calor/setAbsYZ    10 cm
+/calor/update
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run19.paw
+#  PLOT: energy deposit distribution in absorber
+/plots/setnbinEn 65
+/plots/setEnlow   0. keV
+/plots/setEnhigh 13. keV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.0  mum
+/run/initialize
+#
+/gun/particle pi+ 
+/gun/energy 5. GeV
+
+/event/printModulo 1000
+#
+/run/beamOn 100000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm5/run20.mac b/examples/extended/electromagnetic/TestEm5/run20.mac
new file mode 100644
index 0000000000..bc0b449980
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/run20.mac
@@ -0,0 +1,34 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber box )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+/calor/setAbsMat ArgonCH4   
+/calor/setAbsThick 15 mm  
+/calor/setAbsYZ    60 mm
+/calor/update
+/gun/setDefault
+#
+#
+#  hist file name
+/plots/sethistName run20.1mm.paw
+#  PLOT: energy deposit distribution in Gas
+/plots/setnbinEn 40
+/plots/setEnlow   0. keV
+/plots/setEnhigh  8. keV  
+#
+/calor/cutG 1. mm    
+/calor/cutE 1. mm
+/run/initialize
+#
+/gun/particle pi+ 
+/gun/energy 2.864 GeV
+
+/event/printModulo 1000
+#
+/run/beamOn 100000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
index a29291332c..552a752ceb 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5CalorHit.cc,v 1.1.4.1 1999/12/07 20:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5CalorHit.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
index 172aa1b3c7..b6fc3e17a6 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5CalorimeterSD.cc,v 1.1.4.1 1999/12/07 20:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5CalorimeterSD.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -77,14 +77,14 @@ G4bool Em5CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
       if (physVol == Detector->GetAbsorber()) calHit->AddAbs(edep,stepl);
       HitID[Em5Number] = CalCollection->insert(calHit) - 1;
       if (verboseLevel>0)
-        G4cout << " New Calorimeter Hit on Em5: " << Em5Number << endl;
+        G4cout << " New Calorimeter Hit on Em5: " << Em5Number << G4endl;
     }
   else
     { 
       if (physVol == Detector->GetAbsorber())
          (*CalCollection)[HitID[Em5Number]]->AddAbs(edep,stepl);
       if (verboseLevel>0)
-        G4cout << " Energy added to Em5: " << Em5Number << endl; 
+        G4cout << " Energy added to Em5: " << Em5Number << G4endl; 
     }
     
   return true;
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
index 9bc36fc892..4eaba36b84 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5DetectorConstruction.cc,v 1.1.4.1 1999/12/07 20:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5DetectorConstruction.cc,v 1.4 2000/01/20 15:34:39 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -88,12 +88,21 @@ G4double temperature, pressure;
 a = 1.01*g/mole;
 G4Element* elH  = new G4Element(name="Hydrogen",symbol="H" , z= 1., a);
 
+a = 12.01*g/mole;
+G4Element* elC  = new G4Element(name="Carbon"  ,symbol="C" , z= 6., a);
+
 a = 14.01*g/mole;
 G4Element* elN  = new G4Element(name="Nitrogen",symbol="N" , z= 7., a);
 
 a = 16.00*g/mole;
 G4Element* elO  = new G4Element(name="Oxygen"  ,symbol="O" , z= 8., a);
 
+a = 39.95*g/mole;
+G4Element* elAr  = new G4Element(name="Argon"  ,symbol="Ar", z= 18., a);
+
+a = 131.29*g/mole;
+G4Element* elXe  = new G4Element(name="Xenon"  ,symbol="Xe", z= 54., a);
+
 //
 // define simple materials
 //
@@ -110,8 +119,8 @@ a = 28.09*g/mole;
 G4Material* Si = new G4Material(name="Silicon", z=14., a, density);
 
 density = 1.390*g/cm3;
-a = 39.95*g/mole;
-G4Material* lAr = new G4Material(name="liquidArgon", z=18., a, density);
+G4Material* lAr = new G4Material(name="liquidArgon", density, ncomponents=1);
+lAr->AddElement(elAr, natoms=1);
 
 density = 7.870*g/cm3;
 a = 55.85*g/mole;
@@ -147,6 +156,47 @@ G4Material* Air = new G4Material(name="Air"  , density, ncomponents=2);
 Air->AddElement(elN, fractionmass=0.7);
 Air->AddElement(elO, fractionmass=0.3);
 
+//
+// examples of gas
+//
+
+density = 5.458*mg/cm3;
+G4Material* Xe = new G4Material(name="XenonGas" , density, ncomponents=1,
+                   kStateGas,temperature=293.15*kelvin, pressure=1*atmosphere);
+Xe->AddElement(elXe, natoms=1);
+
+density = 1.977*mg/cm3;
+G4Material* CO2 = new G4Material(name="CarbonicGas", density, ncomponents=2);
+CO2->AddElement(elC, natoms=1);
+CO2->AddElement(elO, natoms=2);
+
+density = 1.8223*mg/cm3;
+G4Material* ArCO2 = new G4Material(name="ArgonCO2", density, ncomponents=2);
+ArCO2->AddElement (elAr, fractionmass=0.7844);
+ArCO2->AddMaterial(CO2,  fractionmass=0.2156);
+
+//another way to define mixture of gas per volume
+density = 1.8223*mg/cm3;
+G4Material* NewArCO2 = new G4Material(name="NewArgonCO2", density, ncomponents=3);
+NewArCO2->AddElement (elAr, natoms=8);
+NewArCO2->AddElement (elC,  natoms=2);
+NewArCO2->AddElement (elO,  natoms=4);
+
+//Argon-CH4
+density = 1.709*mg/cm3;
+G4Material* ArCH4 = new G4Material(name="ArgonCH4", density, ncomponents=3);
+ArCH4->AddElement (elAr, natoms=93);
+ArCH4->AddElement (elC,  natoms=7);
+ArCH4->AddElement (elH,  natoms=28);
+
+//Xenon-methane-propane
+density = 4.9196*mg/cm3;
+G4Material* XeCH = new G4Material(name="XenonMethanePropane", density, ncomponents=3,
+                   kStateGas,temperature=293.15*kelvin, pressure=1*atmosphere);
+XeCH->AddElement (elXe, natoms=875);
+XeCH->AddElement (elC,  natoms=225);
+XeCH->AddElement (elH,  natoms=700);
+
 //
 // example of vacuum
 //
@@ -157,7 +207,7 @@ temperature = 2.73*kelvin;
 G4Material* Vacuum = new G4Material(name="Galactic", z=1., a=1.01*g/mole, density,
                      kStateGas,temperature,pressure);
 		     
-G4cout << *(G4Material::GetMaterialTable()) << endl;
+G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //default materials of the calorimeter
   AbsorberMaterial = Si;
@@ -242,13 +292,13 @@ void Em5DetectorConstruction::PrintCalorParameters()
   G4cout << "\n The  WORLD   is made of " 
          << G4BestUnit(WorldSizeX,"Length") << " of " << WorldMaterial->GetName();
   G4cout << ". The transverse size (YZ) of the world is " 
-         << G4BestUnit(WorldSizeYZ,"Length") << endl;
+         << G4BestUnit(WorldSizeYZ,"Length") << G4endl;
   G4cout << " The ABSORBER is made of " 
          <<G4BestUnit(AbsorberThickness,"Length")<< " of " << AbsorberMaterial->GetName();
   G4cout << ". The transverse size (YZ) is " 
-         << G4BestUnit(AbsorberSizeYZ,"Length") << endl;
+         << G4BestUnit(AbsorberSizeYZ,"Length") << G4endl;
   G4cout << " X position of the middle of the absorber " << G4BestUnit(XposAbs,"Length");
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
index 17c4beb124..f125a5601a 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5DetectorMessenger.cc,v 1.1.4.1 1999/12/07 20:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5DetectorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
index ecd2f8bde9..b2741d356c 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5EventAction.cc,v 1.1.2.1.2.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5EventAction.cc,v 1.3 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -57,10 +57,10 @@ void Em5EventAction::BeginOfEventAction(const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin of Event: " << evtNb << endl;
+    G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
      
   if(verboselevel>1)
-    G4cout << "<<< Event  " << evtNb << " started." << endl;
+    G4cout << "<<< Event  " << evtNb << " started." << G4endl;
     
   if (calorimeterCollID==-1)
     {
@@ -93,7 +93,7 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
     int n_hit = CHC->entries();
    // if(verboselevel==2)
    // G4cout << "     " << n_hit
-   //      << " hits are stored in Em5CalorHitsCollection." << endl;
+   //      << " hits are stored in Em5CalorHitsCollection." << G4endl;
 
     G4double totEAbs=0, totLAbs=0;
     for (int i=0;i<n_hit;i++)
@@ -102,11 +102,11 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
       }
   if(verboselevel==2)
     G4cout
-       << "   Absorber: total energy: " << setw(7) << 
+       << "   Absorber: total energy: " << G4std::setw(7) << 
                              G4BestUnit(totEAbs,"Energy")
-       << "       total track length: " << setw(7) <<
+       << "       total track length: " << G4std::setw(7) <<
                              G4BestUnit(totLAbs,"Length")
-       << endl;           
+       << G4endl;           
 
    // count event, add deposits to the sum ...
     runaction->CountEvent() ;
@@ -114,7 +114,7 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
     runaction->AddnStepsCharged(nstepCharged) ;
     runaction->AddnStepsNeutral(nstepNeutral) ;
     if(verboselevel==2)
-      G4cout << " Ncharged=" << Nch << "  ,   Nneutral=" << Nne << endl;
+      G4cout << " Ncharged=" << Nch << "  ,   Nneutral=" << Nne << G4endl;
     runaction->CountParticles(Nch,Nne);
     runaction->AddEP(NE,NP);
     runaction->AddTrRef(Transmitted,Reflected) ;
@@ -141,7 +141,7 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
   }  
 
   if(verboselevel>0)
-    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << endl;
+    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << G4endl;
   
   
   //save rndm status
@@ -151,7 +151,7 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
      G4int evtNb = evt->GetEventID();
      if (evtNb%printModulo == 0)
        { 
-        G4cout << "\n---> End of Event: " << evtNb << endl;
+        G4cout << "\n---> End of Event: " << evtNb << G4endl;
         HepRandom::showEngineStatus();
        }
     }     
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
index fc9a18e763..726dc93c4f 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5EventActionMessenger.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5EventActionMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
index cc7223d4d9..9a14a6d216 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
@@ -5,12 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PhysicsList.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PhysicsList.cc,v 1.5 2000/01/20 15:34:40 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-   
+
+// Always place it in front!
+//   
+////#include "G4Timer.hh"
+
 #include "Em5PhysicsList.hh"
 #include "Em5DetectorConstruction.hh"
 #include "Em5PhysicsListMessenger.hh"
@@ -23,9 +27,8 @@
 #include "G4ParticleTable.hh"
 #include "G4Material.hh"
 #include "G4EnergyLossTables.hh"
-#include "G4Timer.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -233,8 +236,8 @@ void Em5PhysicsList::ConstructGeneral()
 
 void Em5PhysicsList::SetCuts()
 {
-  G4Timer theTimer ;
-  theTimer.Start() ;
+  ////G4Timer theTimer ;
+  ////theTimer.Start() ;
   
   // reactualise cutValues
   if (currentDefaultCut != defaultCutValue)
@@ -246,7 +249,7 @@ void Em5PhysicsList::SetCuts()
       
   if (verboseLevel >0){
     G4cout << "Em5PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
   }  
   // set cut values for gamma at first and for e- second and next for e+,
   // because some processes for e+/e- need cut values for gamma 
@@ -268,10 +271,10 @@ void Em5PhysicsList::SetCuts()
               
   if (verboseLevel>0) DumpCutValuesTable();
 
-  theTimer.Stop();
-  G4cout.precision(6);
-  G4cout << endl ;
-  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<endl;
+  ////theTimer.Stop();
+  ////G4cout.precision(6);
+  ////G4cout << G4endl ;
+  ////G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<G4endl;
 
 }
 
@@ -343,10 +346,10 @@ void Em5PhysicsList::GetRange(G4double val)
   G4double cut;
   part = theParticleTable->FindParticle("e-");
   cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  G4cout << "material : " << currMat->GetName() << endl;
-  G4cout << "particle : " << part->GetParticleName() << endl;
-  G4cout << "energy   : " << val / keV << " (keV)" << endl;
-  G4cout << "range    : " << cut / mm << " (mm)" << endl;
+  G4cout << "material : " << currMat->GetName() << G4endl;
+  G4cout << "particle : " << part->GetParticleName() << G4endl;
+  G4cout << "energy   : " << val / keV << " (keV)" << G4endl;
+  G4cout << "range    : " << cut / mm << " (mm)" << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -354,8 +357,8 @@ void Em5PhysicsList::GetRange(G4double val)
 void Em5PhysicsList::SetMaxStep(G4double step)
 {
   MaxChargedStep = step ;
-  G4cout << " MaxChargedStep=" << MaxChargedStep << endl;
-  G4cout << endl;
+  G4cout << " MaxChargedStep=" << MaxChargedStep << G4endl;
+  G4cout << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
index ec951f9ca4..87fa26ddcb 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PhysicsListMessenger.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PhysicsListMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
index c2e8ca941b..bc61236ddc 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PrimaryGeneratorAction.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
index fb3938c861..c6dc1c104e 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PrimaryGeneratorMessenger.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
index d97d8fbcc1..aacc0b22a2 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5RunAction.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5RunAction.cc,v 1.4 2000/01/20 15:34:40 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -20,22 +20,28 @@
 #include "G4UImanager.hh"
 #include "G4VVisManager.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 #include "Randomize.hh"
+
+#ifndef G4NOHIST
 #include "CLHEP/Hist/HBookFile.h"
 #include <assert.h>
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em5RunAction::Em5RunAction()
-  :histName("histfile"),nbinStep(0.),nbinEn(0.),nbinTt(0.),nbinTb(0.),
-   nbinTsec(0.),nbinTh(0.),nbinThback(0.),nbinR(0.),nbinGamma(0.),
-   nbinvertexz(0.),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
-   histo6(0),histo7(0),histo8(0),histo9(0),histo10(0)
+  :histName("histfile"),nbinStep(0),nbinEn(0),nbinTt(0),nbinTb(0),
+   nbinTsec(0),nbinTh(0),nbinThback(0),nbinR(0),nbinGamma(0),nbinvertexz(0)
 {
   runMessenger = new Em5RunMessenger(this);
-  saveRndm = 1;  
+  saveRndm = 1;
+  
+#ifndef G4NOHIST
+  histo1=0; histo2=0; histo3=0; histo4=0; histo5=0; histo6=0; histo7=0;
+  histo8=0; histo9=0; histo10=0;hi2bis=0;
+#endif      
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -43,24 +49,26 @@ Em5RunAction::Em5RunAction()
 Em5RunAction::~Em5RunAction()
 {
   delete runMessenger;
-  if(histo1) delete histo1 ;
-  if(histo2) delete histo2 ;
-  if(histo3) delete histo3 ;
-  if(histo4) delete histo4 ;
-  if(histo5) delete histo5 ;
-  if(histo6) delete histo6 ;
-  if(histo7) delete histo7 ;
-  if(histo8) delete histo8 ;
-  if(histo9) delete histo9 ;
-  if(histo10) delete histo10 ;
+#ifndef G4NOHIST  
+  if(histo1)  delete histo1 ;
+  if(histo2) {delete histo2 ; delete hi2bis;}
+  if(histo3)  delete histo3 ;
+  if(histo4)  delete histo4 ;
+  if(histo5)  delete histo5 ;
+  if(histo6)  delete histo6 ;
+  if(histo7)  delete histo7 ;
+  if(histo8)  delete histo8 ;
+  if(histo9)  delete histo9 ;
+  if(histo10) delete histo10;
   delete hbookManager;
-
+#endif  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em5RunAction::bookHisto()
 {
+#ifndef G4NOHIST
   // init hbook
   hbookManager = new HBookFile(histName, 68);
   assert (hbookManager != 0);
@@ -77,6 +85,10 @@ void Em5RunAction::bookHisto()
     histo2 = hbookManager->histogram("energy deposit in absorber(in MeV)"
                                      ,nbinEn,Enlow,Enhigh) ;
     assert (histo2 != 0);
+    				     
+    hi2bis = hbookManager->histogram("energy deposit: normalized distribution"
+                                     ,nbinEn,Enlow,Enhigh) ;				     
+    assert (hi2bis != 0);
   }
   if(nbinTh>0)
   {
@@ -127,13 +139,14 @@ void Em5RunAction::bookHisto()
                                 ,nbinGamma,log10(ElowGamma),log10(EhighGamma))  ;
     assert (histo10 != 0);
   }
+#endif  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em5RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   // save Rndm status
   if (saveRndm > 0)
@@ -147,8 +160,7 @@ void Em5RunAction::BeginOfRunAction(const G4Run* aRun)
 
   if(pVVisManager)
   {
-    UI->ApplyCommand("/vis/clear/view");
-    UI->ApplyCommand("/vis/draw/current");
+    UI->ApplyCommand("/vis/scene/notifyHandlers");
   }
       
   EnergySumAbs = 0. ;
@@ -350,87 +362,91 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
 
   Transmitted /=TotNbofEvents ;
   Reflected   /=TotNbofEvents ;
- G4cout << " ================== run summary =====================" << endl;
+ G4cout << " ================== run summary =====================" << G4endl;
  G4int prec = G4cout.precision(6);
   G4cout << " end of Run TotNbofEvents = " <<  
-           TotNbofEvents << endl ;
+           TotNbofEvents << G4endl ;
   G4cout << "    mean charged track length   in absorber=" <<
            tlSumAbs/mm      << " +- " << sAbs/mm    <<
-          "  mm  " << endl; 
-  G4cout << endl;
+          "  mm  " << G4endl; 
+  G4cout << G4endl;
   G4cout << "            mean energy deposit in absorber=" <<
            EnergySumAbs/MeV << " +- " << sigAbs/MeV <<
-          "  MeV " << endl ;
-  G4cout << endl ;
+          "  MeV " << G4endl ;
+  G4cout << G4endl ;
   G4cout << " mean number of steps in absorber (charged) =" <<
            nStepSumCharged         << " +- " << sigch     <<
-          "      " << endl ;
+          "      " << G4endl ;
   G4cout << " mean number of steps in absorber (neutral) =" <<
            nStepSumNeutral         << " +- " << signe     <<
-          "      " << endl ;
-  G4cout << endl ;
+          "      " << G4endl ;
+  G4cout << G4endl ;
   G4cout << "   mean number of charged secondaries = " <<
-           SumCharged << " +- " << sigcharged << endl;  
-  G4cout << endl ;
+           SumCharged << " +- " << sigcharged << G4endl;  
+  G4cout << G4endl ;
   G4cout << "   mean number of neutral secondaries = " <<
-           SumNeutral << " +- " << signeutral << endl;  
-  G4cout << endl ;
+           SumNeutral << " +- " << signeutral << G4endl;  
+  G4cout << G4endl ;
   
   G4cout << "   mean number of e-s =" << Selectron << 
-            "  and e+s =" << Spositron << endl;
-  G4cout << endl; 
+            "  and e+s =" << Spositron << G4endl;
+  G4cout << G4endl; 
   
   G4cout << "(number) transmission coeff=" << Transmitted <<
-            "  reflection coeff=" << Reflected << endl;
-  G4cout << endl; 
+            "  reflection coeff=" << Reflected << G4endl;
+  G4cout << G4endl; 
 
   if(nbinStep>0)
   {G4double E , dnorm, norm ;
-   G4cout << "   step number/event distribution " << endl ;
+   G4cout << "   step number/event distribution " << G4endl ;
    G4cout << "#entries=" << entryStep << "    #underflows=" << underStep <<
-             "    #overflows=" << overStep << endl ;
+             "    #overflows=" << overStep << G4endl ;
    if( entryStep>0.)
    {
      E = Steplow - dStep ;
      norm = TotNbofEvents ;
-     G4cout << " bin nb   nsteplow     entries     normalized " << endl ;
+     G4cout << " bin nb   nsteplow     entries     normalized " << G4endl ;
      for(G4int iss=0; iss<nbinStep; iss++)
      {
       E += dStep ;
       dnorm = distStep[iss]/norm;
-      G4cout << setw(5) << iss << setw(10) << E << 
-                setw(12) << distStep[iss] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << iss << G4std::setw(10) << E << 
+                G4std::setw(12) << distStep[iss] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinEn>0)
   {G4double E , dnorm, norm,fmax,Emp,width ;
    Emp=-999.999 ;
-   G4cout << " energy deposit distribution " << endl ;
+   G4cout << " energy deposit distribution " << G4endl ;
    G4cout << "#entries=" << entryEn << "    #underflows=" << underEn <<
-             "    #overflows=" << overEn << endl ;
+             "    #overflows=" << overEn << G4endl ;
+	     
    if( entryEn>0.)
    {
      E = Enlow - dEn ;
      norm = TotNbofEvents*dEn ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      fmax = 0. ;
      for(G4int ien=0; ien<nbinEn; ien++)
      {
       E += dEn ;
+#ifndef G4NOHIST      
+      hi2bis->accumulate(E+0.5*dEn,distEn[ien]/TotNbofEvents);
+#endif      
       if(distEn[ien]>fmax)
       {
         fmax=distEn[ien];
         Emp = E ;
       }
       dnorm = distEn[ien]/norm;
-      G4cout << setw(5) << ien << setw(10) << E << 
-                setw(12) << distEn[ien] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << E << 
+                G4std::setw(12) << distEn[ien] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
      G4int ii ;
      G4double E1,E2 ;
      E1=-1.e6 ;
@@ -456,16 +472,16 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
       if(distEn[i2] >= 0.5*fmax)
         E2=E ;
      }
-     G4cout << " Emp = " << setw(15) << Emp/MeV << "   width="
-            << setw(15) << (E2-E1)/MeV <<   "  MeV " << endl;
-     G4cout << endl ;
+     G4cout << " Emp = " << G4std::setw(15) << Emp/MeV << "   width="
+            << G4std::setw(15) << (E2-E1)/MeV <<   "  MeV " << G4endl;
+     G4cout << G4endl ;
    }     
   }
   if(nbinTt>0)
   {G4double E , dnorm, norm ,sig;
-   G4cout << " transmitted energy distribution " << endl ;
+   G4cout << " transmitted energy distribution " << G4endl ;
    G4cout << "#entries=" << entryTt << "    #underflows=" << underTt <<
-             "    #overflows=" << overTt << endl ;
+             "    #overflows=" << overTt << G4endl ;
    if( entryTt>0.)
    {
      Ttmean /= entryTt;
@@ -475,26 +491,26 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      else
        sig=sqrt(sig/entryTt) ;
      G4cout << " mean energy of transmitted particles=" << Ttmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
+               " +- " << sig/keV << "  keV." << G4endl;
      E = Ttlow - dTt ;
      norm = TotNbofEvents*dTt ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTt; itt++)
      {
       E += dTt ;
       dnorm = distTt[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTt[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTt[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinTb>0)
   {G4double E , dnorm, norm ,sig;
-   G4cout << " backscattered energy distribution " << endl ;
+   G4cout << " backscattered energy distribution " << G4endl ;
    G4cout << "#entries=" << entryTb << "    #underflows=" << underTb <<
-             "    #overflows=" << overTb << endl ;
+             "    #overflows=" << overTb << G4endl ;
    if( entryTb>0.)
    {
      Tbmean /= entryTb;
@@ -504,48 +520,48 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      else
        sig=sqrt(sig/entryTb) ;
      G4cout << " mean energy of backscattered particles=" << Tbmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
+               " +- " << sig/keV << "  keV." << G4endl;
      E = Tblow - dTb ;
      norm = TotNbofEvents*dTb ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTb; itt++)
      {
       E += dTb ;
       dnorm = distTb[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTb[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTb[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinTsec>0)
   {G4double E , dnorm, norm ;
-   G4cout << " energy distribution of charged secondaries " << endl ;
+   G4cout << " energy distribution of charged secondaries " << G4endl ;
    G4cout << "#entries=" << entryTsec << "    #underflows=" << underTsec <<
-             "    #overflows=" << overTsec << endl ;
+             "    #overflows=" << overTsec << G4endl ;
    if( entryTsec>0.)
    {
      E = Tseclow - dTsec ;
      norm = TotNbofEvents*dTsec ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTsec; itt++)
      {
       E += dTsec ;
       dnorm = distTsec[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTsec[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTsec[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
 
   if(nbinR >0)
   {G4double R , dnorm, norm,sig  ;
-   G4cout << "  R  distribution " << endl ;
+   G4cout << "  R  distribution " << G4endl ;
    G4cout << "#entries=" << entryR  << "    #underflows=" << underR  <<
-             "    #overflows=" << overR  << endl ;
+             "    #overflows=" << overR  << G4endl ;
    if( entryR >0.)
    {
      Rmean /= entryR;
@@ -553,27 +569,27 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      if(sig<=0.) sig=0. ;
      else        sig = sqrt(sig/entryR) ;
      G4cout << " mean lateral displacement at exit=" << Rmean/mm << " +- "
-            << sig/mm << "  mm." << endl ; 
+            << sig/mm << "  mm." << G4endl ; 
      R = Rlow - dR  ;
      norm = TotNbofEvents*dR  ;
-     G4cout << " bin nb      Rlow      entries     normalized " << endl ;
+     G4cout << " bin nb      Rlow      entries     normalized " << G4endl ;
      for(G4int ier=0; ier<nbinR ; ier++)
      {
       R+= dR  ;
       dnorm = distR[ier]/norm;
-      G4cout << setw(5) << ier << setw(10) << R  <<
-                setw(12) << distR[ier] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << ier << G4std::setw(10) << R  <<
+                G4std::setw(12) << distR[ier] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinTh>0)
   {G4double Th,Thdeg, dnorm, norm,fac0,fnorm,pere,Thpere,Thmean,sum;
-   G4cout << "      angle   distribution " << endl ;
+   G4cout << "      angle   distribution " << G4endl ;
    G4cout << "#entries=" << entryTh << "    #underflows=" << underTh <<
-             "    #overflows=" << overTh << endl ;
+             "    #overflows=" << overTh << G4endl ;
    if( entryTh>0.)
    {
      Th= Thlow - dTh ;
@@ -585,7 +601,7 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      pere = 1./exp(1.) ;
 
      G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
+               " entries         normalized " << G4endl ;
      Thpere = 0. ;
      sum = 0. ;
      Thmean = 0. ;
@@ -599,27 +615,27 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
       fnorm = fac0*distTh[ien] ;
       if( fnorm > pere)
         Thpere = Th ; 
-      G4cout << setw(5) << ien << setw(10) << Thdeg << "   " <<
-                setw(10) << Th << "  " <<   
-                setw(12) << distTh[ien] << "  " <<
-                setw(12) << dnorm << "  " << setw(12) << fnorm <<endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << Thdeg << "   " <<
+                G4std::setw(10) << Th << "  " <<   
+                G4std::setw(12) << distTh[ien] << "  " <<
+                G4std::setw(12) << dnorm << "  " << G4std::setw(12) << fnorm <<G4endl ;
      }
      Thmean /= sum ;
-     G4cout << endl;
+     G4cout << G4endl;
      G4cout << " mean = " << Thmean << "  rad  or " << 180.*Thmean/pi <<
-               " deg." << endl;
+               " deg." << G4endl;
      G4cout << " theta(1/e)=" << Thpere << " - " << Thpere+dTh << " rad   "
             << " or " << 180.*Thpere/pi << " - " << 180.*(Thpere+dTh)/pi 
-            << " deg." << endl;
-     G4cout << endl;
+            << " deg." << G4endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinThback>0)
   {G4double Thb,Thdegb, dnormb, normb,fac0b,fnormb,pereb,Thpereb,Thmeanb,sumb;
-   G4cout << " backscattering angle   distribution " << endl ;
+   G4cout << " backscattering angle   distribution " << G4endl ;
    G4cout << "#entries=" << entryThback << "    #underflows=" << underThback <<
-             "    #overflows=" << overThback << endl ;
+             "    #overflows=" << overThback << G4endl ;
    if( entryThback>0.)
    {
      Thb= Thlowback - dThback ;
@@ -631,7 +647,7 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      pereb = 1./exp(1.) ;
 
      G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
+               " entries         normalized " << G4endl ;
      Thpereb = 0. ;
      sumb = 0. ;
      Thmeanb = 0. ;
@@ -645,75 +661,77 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
       fnormb = fac0b*distThback[ien] ;
       if( fnormb > pereb)
         Thpereb = Thb ;
-      G4cout << setw(5) << ien << setw(10) << Thdegb << "   " <<
-                setw(10) << Thb << "  " <<
-                setw(12) << distThback[ien] << "  " <<
-                setw(12) << dnormb << "  " << setw(12) << fnormb <<endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << Thdegb << "   " <<
+                G4std::setw(10) << Thb << "  " <<
+                G4std::setw(12) << distThback[ien] << "  " <<
+                G4std::setw(12) << dnormb << "  " << G4std::setw(12) << fnormb <<G4endl ;
      }
      Thmeanb /= sumb ;
-     G4cout << endl;
+     G4cout << G4endl;
      G4cout << " mean = " << Thmeanb << "  rad  or " << 180.*Thmeanb/pi <<
-               " deg." << endl;
+               " deg." << G4endl;
      G4cout << " theta(1/e)=" << Thpereb << " - " << Thpereb+dThback << " rad   "
             << " or " << 180.*Thpereb/pi << " - " << 180.*(Thpereb+dThback)/pi
-            << " deg." << endl;
-     G4cout << endl;
+            << " deg." << G4endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinGamma>0)
   {G4double E , fact,dnorm, norm  ;
-   G4cout << " gamma energy distribution " << endl ;
+   G4cout << " gamma energy distribution " << G4endl ;
    G4cout << "#entries=" << entryGamma << "    #underflows=" << underGamma <<
-             "    #overflows=" << overGamma << endl ;
+             "    #overflows=" << overGamma << G4endl ;
    if( entryGamma>0.)
    {
      fact=exp(dEGamma) ;
      E = ElowGamma/fact  ;
      norm = TotNbofEvents*dEGamma;
-     G4cout << " bin nb         Elow      entries       normalized " << endl ;
+     G4cout << " bin nb         Elow      entries       normalized " << G4endl ;
      for(G4int itt=0; itt<nbinGamma; itt++)
      {
       E *= fact ;
       dnorm = distGamma[itt]/norm;
-      G4cout << setw(5) << itt << setw(13) << E << 
-                setw(12) << distGamma[itt] <<
-                setw(15) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(13) << E << 
+                G4std::setw(12) << distGamma[itt] <<
+                G4std::setw(15) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
 
   if(nbinvertexz >0)
   {G4double z , dnorm, norm  ;
-   G4cout << " vertex Z  distribution " << endl ;
+   G4cout << " vertex Z  distribution " << G4endl ;
    G4cout << "#entries=" << entryvertexz  << "    #underflows=" << undervertexz  <<
-             "    #overflows=" << oververtexz  << endl ;
+             "    #overflows=" << oververtexz  << G4endl ;
    if( entryvertexz >0.)
    {
      z =zlow - dz  ;
      norm = TotNbofEvents*dz  ;
-     G4cout << " bin nb      zlow      entries     normalized " << endl ;
+     G4cout << " bin nb      zlow      entries     normalized " << G4endl ;
      for(G4int iez=0; iez<nbinvertexz ; iez++)
      {
       z+= dz  ;
       if(abs(z)<1.e-12) z=0.;
       dnorm = distvertexz[iez]/norm;
-      G4cout << setw(5) << iez << setw(10) << z  <<
-                setw(12) << distvertexz[iez] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << iez << G4std::setw(10) << z  <<
+                G4std::setw(12) << distvertexz[iez] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }
   }
   
  G4cout.precision(prec);
   
   if (G4VVisManager::GetConcreteInstance())
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
-    
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
+
+#ifndef G4NOHIST    
    // Write histogram file
    hbookManager->write();
+#endif
    
   // save Rndm status
   if (saveRndm == 1)
@@ -777,7 +795,7 @@ void Em5RunAction::FillNbOfSteps(G4double ns)
   G4double n,bin ;
   G4int ibin;
  
-  if(histo1)
+  if(nbinStep>0)
   {
     entryStep += 1. ;
  
@@ -792,7 +810,9 @@ void Em5RunAction::FillNbOfSteps(G4double ns)
       ibin= bin ;
       distStep[ibin] += 1. ;
     }
-   histo1->accumulate(ns) ;
+#ifndef G4NOHIST    
+   histo1->accumulate(ns);
+#endif   
   }
 }
 
@@ -803,7 +823,7 @@ void Em5RunAction::FillEn(G4double En)
   G4double bin ;
   G4int ibin;
 
-  if(histo2)
+  if(nbinEn>0)
   {
     entryEn += 1. ;
  
@@ -817,7 +837,9 @@ void Em5RunAction::FillEn(G4double En)
       ibin= bin ;
       distEn[ibin] += 1. ;
     }
-  histo2->accumulate(En/MeV) ;
+#ifndef G4NOHIST    
+  histo2->accumulate(En/MeV);
+#endif  
   }
 }
 
@@ -828,7 +850,7 @@ void Em5RunAction::FillTt(G4double En)
   G4double bin ;
   G4int ibin;
 
-  if(histo5)
+  if(nbinTt>0)
   {
     entryTt += 1. ;
     Ttmean += En ;
@@ -844,7 +866,9 @@ void Em5RunAction::FillTt(G4double En)
       ibin= bin ;
       distTt[ibin] += 1. ;
     }
-  histo5->accumulate(En/MeV) ;
+#ifndef G4NOHIST    
+  histo5->accumulate(En/MeV);
+#endif  
   }
 }
 
@@ -855,7 +879,7 @@ void Em5RunAction::FillTb(G4double En)
   G4double bin ;
   G4int ibin;
   
-  if(histo7)
+  if(nbinTb>0)
   {
     entryTb += 1. ;
     Tbmean += En ;
@@ -871,7 +895,9 @@ void Em5RunAction::FillTb(G4double En)
       ibin= bin ;
       distTb[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
   histo7->accumulate(En/MeV) ;
+#endif  
   }
 }
 
@@ -882,7 +908,7 @@ void Em5RunAction::FillTsec(G4double En)
   G4double bin ;
   G4int ibin;
 
-  if(histo8)
+  if(nbinTsec>0)
   {
     entryTsec += 1. ;
 
@@ -896,7 +922,9 @@ void Em5RunAction::FillTsec(G4double En)
       ibin= bin ;
       distTsec[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
   histo8->accumulate(En/MeV) ;
+#endif  
   }
 }
 
@@ -907,7 +935,7 @@ void Em5RunAction::FillGammaSpectrum(G4double En)
   G4double bin ;
   G4int ibin;
 
-  if(histo10)
+  if(nbinGamma>0)
   {
     entryGamma += 1. ;
 
@@ -921,7 +949,9 @@ void Em5RunAction::FillGammaSpectrum(G4double En)
       ibin= bin ;
       distGamma[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
   histo10->accumulate(log10(En/MeV)) ;
+#endif  
   }
 }
 
@@ -935,7 +965,7 @@ void Em5RunAction::FillTh(G4double Th)
   G4double bin,Thbin ,wg;
   G4int ibin;
 
-  if(histo3)
+  if(nbinTh>0)
   {
     entryTh += 1. ;
 
@@ -956,13 +986,14 @@ void Em5RunAction::FillTh(G4double Th)
       {  
         G4double thdeg=Th*180./pi;
         G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
+               << G4std::setw(12) << G4std::setprecision(4) << thdeg << G4endl;
         wg=0. ; 
       }
       distTh[ibin] += wg  ;
     }
-
+#ifndef G4NOHIST
   histo3->accumulate(Th/deg, wg) ;
+#endif  
   }
 }
 
@@ -976,7 +1007,7 @@ void Em5RunAction::FillThBack(G4double Th)
   G4double bin,Thbin,wg ;
   G4int ibin;
 
-  if(histo6)
+  if(nbinThback>0)
   {
     entryThback += 1. ;
 
@@ -995,12 +1026,14 @@ void Em5RunAction::FillThBack(G4double Th)
       {  
         G4double thdeg=Th*180./pi;
         G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
+               << G4std::setw(12) << G4std::setprecision(4) << thdeg << G4endl;
         wg=0. ; 
       }
       distThback[ibin] += wg  ;
     }
+#ifndef G4NOHIST
   histo6->accumulate(Th/deg, wg) ;
+#endif  
   }
 
 }
@@ -1012,7 +1045,7 @@ void Em5RunAction::FillR(G4double R )
   G4double bin ;
   G4int ibin;
 
-  if(histo4)
+  if(nbinR>0)
   {
     entryR  += 1. ;
     Rmean += R ;
@@ -1028,7 +1061,9 @@ void Em5RunAction::FillR(G4double R )
       ibin= bin ;
       distR[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
   histo4->accumulate(R/mm) ;
+#endif  
   }
 }
 
@@ -1039,7 +1074,7 @@ void Em5RunAction::Fillvertexz(G4double z )
   G4double bin ;
   G4int ibin;
   
-  if(histo9)
+  if(nbinvertexz>0)
   {
     entryvertexz  += 1. ;
 
@@ -1053,7 +1088,9 @@ void Em5RunAction::Fillvertexz(G4double z )
       ibin= bin ;
       distvertexz[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
   histo9->accumulate(z/mm) ;
+#endif  
   }
 }
 
@@ -1062,195 +1099,195 @@ void Em5RunAction::Fillvertexz(G4double z )
 void Em5RunAction::SethistName(G4String name)
 {
   histName = name ;
-  G4cout << " hist file = " << histName << endl;
+  G4cout << " hist file = " << histName << G4endl;
 }
 
 void Em5RunAction::SetnbinStep(G4int nbin)
 {
   nbinStep = nbin ;
   if(nbinStep>0)
-  G4cout << " Nb of bins in #step plot = " << nbinStep << endl ;
+  G4cout << " Nb of bins in #step plot = " << nbinStep << G4endl ;
 }
 void Em5RunAction::SetSteplow(G4double low)
 {
   Steplow = low ;
   if(nbinStep>0)
-  G4cout << " low  in the #step plot = " << Steplow << endl ;
+  G4cout << " low  in the #step plot = " << Steplow << G4endl ;
 }
 void Em5RunAction::SetStephigh(G4double high)
 {
   Stephigh = high ;
   if(nbinStep>0)
-  G4cout << " high in the #step plot = " << Stephigh << endl ;
+  G4cout << " high in the #step plot = " << Stephigh << G4endl ;
 }
 void Em5RunAction::SetnbinEn(G4int nbin)
 {
   nbinEn = nbin ;
   if(nbinEn>0)
-  G4cout << " Nb of bins in Edep plot = " << nbinEn << endl ;
+  G4cout << " Nb of bins in Edep plot = " << nbinEn << G4endl ;
 }
 void Em5RunAction::SetEnlow(G4double Elow)
 {
   Enlow = Elow ;
   if(nbinEn>0)
-  G4cout << " Elow  in the  Edep plot = " << Enlow << endl ;
+  G4cout << " Elow  in the  Edep plot = " << Enlow << G4endl ;
 }
 void Em5RunAction::SetEnhigh(G4double Ehigh)
 {
   Enhigh = Ehigh ;
   if(nbinEn>0)
-  G4cout << " Ehigh in the  Edep plot = " << Enhigh << endl ;
+  G4cout << " Ehigh in the  Edep plot = " << Enhigh << G4endl ;
 }
 
 void Em5RunAction::SetnbinGamma(G4int nbin)
 {
   nbinGamma = nbin ;
   if(nbinGamma>0)
-  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << endl ;
+  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << G4endl ;
 }
 void Em5RunAction::SetElowGamma(G4double Elow)
 {
   ElowGamma = Elow ;
   if(nbinGamma>0)
-  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << endl ;
+  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << G4endl ;
 }
 void Em5RunAction::SetEhighGamma(G4double Ehigh)
 {
   EhighGamma = Ehigh ;
   if(nbinGamma>0)
-  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << endl ;
+  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << G4endl ;
 }
 
 void Em5RunAction::SetnbinTt(G4int nbin)
 {
   nbinTt = nbin ;
   if(nbinTt>0)
-  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << endl ;
+  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << G4endl ;
 }
 void Em5RunAction::SetTtlow(G4double Elow)
 {
   Ttlow = Elow ;
   if(nbinTt>0)
-  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << endl ;
+  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << G4endl ;
 }
 void Em5RunAction::SetTthigh(G4double Ehigh)
 {
   Tthigh = Ehigh ;
   if(nbinTt>0)
-  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << endl ;
+  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << G4endl ;
 }
 void Em5RunAction::SetnbinTb(G4int nbin)
 {
   nbinTb = nbin ;
   if(nbinTb>0)
-  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << endl ;
+  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << G4endl ;
 }
 void Em5RunAction::SetTblow(G4double Elow)
 {
   Tblow = Elow ;
   if(nbinTb>0)
-  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << endl ;
+  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << G4endl ;
 }
 void Em5RunAction::SetTbhigh(G4double Ehigh)
 {
   Tbhigh = Ehigh ;
   if(nbinTb>0)
-  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << endl ;
+  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << G4endl ;
 }
 
 void Em5RunAction::SetnbinTsec(G4int nbin)
 {
   nbinTsec = nbin ;
   if(nbinTsec>0)
-  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << endl ;
+  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << G4endl ;
 }
 void Em5RunAction::SetTseclow(G4double Elow)
 {
   Tseclow = Elow ;
   if(nbinTsec>0)
-  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << endl ;
+  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << G4endl ;
 }
 void Em5RunAction::SetTsechigh(G4double Ehigh)
 {
   Tsechigh = Ehigh ;
   if(nbinTsec>0)
-  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << endl ;
+  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << G4endl ;
 }
  
 void Em5RunAction::SetnbinR(G4int nbin)
 {
   nbinR  = nbin ;
   if(nbinR>0)
-  G4cout << " Nb of bins in R plot = " << nbinR << endl ;
+  G4cout << " Nb of bins in R plot = " << nbinR << G4endl ;
 }
 void Em5RunAction::SetRlow(G4double rlow)
 {
   Rlow = rlow ;
   if(nbinR>0)
-  G4cout << " Rlow  in the  R plot = " << Rlow << endl ;
+  G4cout << " Rlow  in the  R plot = " << Rlow << G4endl ;
 }
 void Em5RunAction::SetRhigh(G4double rhigh)
 {
   Rhigh = rhigh ;
   if(nbinR>0)
-  G4cout << " Rhigh in the R plot = " << Rhigh << endl ;
+  G4cout << " Rhigh in the R plot = " << Rhigh << G4endl ;
 }
 
 void Em5RunAction::Setnbinzvertex(G4int nbin)
 {
   nbinvertexz  = nbin ;
   if(nbinvertexz>0)
-  G4cout << " Nb of bins in Z plot = " << nbinvertexz << endl ;
+  G4cout << " Nb of bins in Z plot = " << nbinvertexz << G4endl ;
 }
 void Em5RunAction::Setzlow(G4double z)
 {
   zlow = z ;
   if(nbinvertexz>0)
-  G4cout << " zlow  in the  Z plot = " << zlow << endl ;
+  G4cout << " zlow  in the  Z plot = " << zlow << G4endl ;
 }
 void Em5RunAction::Setzhigh(G4double z)
 {
   zhigh = z ;
   if(nbinvertexz>0)
-  G4cout << " zhigh in the Z plot = " << zhigh << endl ;
+  G4cout << " zhigh in the Z plot = " << zhigh << G4endl ;
 }
 
 void Em5RunAction::SetnbinTh(G4int nbin)
 {
   nbinTh = nbin ;
   if(nbinTh>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinTh << endl ;
+  G4cout << " Nb of bins in Theta plot = " << nbinTh << G4endl ;
 }
 void Em5RunAction::SetThlow(G4double Tlow)
 {
   Thlow = Tlow ;
   if(nbinTh>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlow << endl ;
+  G4cout << " Tlow  in the  Theta plot = " << Thlow << G4endl ;
 }
 void Em5RunAction::SetThhigh(G4double Thigh)
 {
   Thhigh = Thigh ;
   if(nbinTh>0)
-  G4cout << " Thigh in the Theta plot = " << Thhigh << endl ;
+  G4cout << " Thigh in the Theta plot = " << Thhigh << G4endl ;
 }
 
 void Em5RunAction::SetnbinThBack(G4int nbin)
 {
   nbinThback = nbin ;
   if(nbinThback>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinThback << endl ;
+  G4cout << " Nb of bins in Theta plot = " << nbinThback << G4endl ;
 }
 void Em5RunAction::SetThlowBack(G4double Tlow)
 {
   Thlowback = Tlow ;
   if(nbinThback>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlowback << endl ;
+  G4cout << " Tlow  in the  Theta plot = " << Thlowback << G4endl ;
 }
 void Em5RunAction::SetThhighBack(G4double Thigh)
 {
   Thhighback = Thigh ;
   if(nbinThback>0)
-  G4cout << " Thigh in the Theta plot = " << Thhighback << endl ;
+  G4cout << " Thigh in the Theta plot = " << Thhighback << G4endl ;
 }
 void Em5RunAction::CountParticles(G4double nch,G4double nne)
 {
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
index 157a563cca..eb82c27e03 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5RunMessenger.cc,v 1.1.4.1 1999/12/07 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5RunMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -363,7 +363,7 @@ void Em5RunMessenger::SetNewValue(G4UIcommand* command,G4String newValues)
       runAction->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValues));
 		 
   if (command == RndmReadCmd)
-    { G4cout << "\n---> rndm status restored from file: " << newValues << endl;
+    { G4cout << "\n---> rndm status restored from file: " << newValues << G4endl;
       HepRandom::restoreEngineStatus(newValues);
       HepRandom::showEngineStatus();
     }   
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc b/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc
index fc98dcaf60..0c22c089a9 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5StepCut.cc,v 1.1.4.1 1999/12/07 20:47:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5StepCut.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -24,7 +24,7 @@ Em5StepCut::Em5StepCut(const G4String& aName)
   : G4VDiscreteProcess(aName),MaxChargedStep(DBL_MAX)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
 }
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
index 5fb62bad53..bbcf5c2a20 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingAction.cc,v 1.1.4.1 1999/12/07 20:47:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5SteppingAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -25,7 +25,7 @@
 #include "G4EventManager.hh"
 #include "Em5SteppingMessenger.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "G4UImanager.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
index f044425289..9e4fb7b741 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingMessenger.cc,v 1.1.4.1 1999/12/07 20:47:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5SteppingMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
new file mode 100644
index 0000000000..7ace0fba13
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em5SteppingVerbose.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em5SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em5SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em5SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em5SteppingVerbose::Em5SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em5SteppingVerbose::~Em5SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em5SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em5SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
index 17d9380eb1..9b16e4f483 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5VisManager.cc,v 1.1.4.1 1999/12/07 20:47:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Em5VisManager.cc,v 1.2 1999/12/15 14:49:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -131,7 +131,7 @@ void Em5VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm6/GNUmakefile b/examples/extended/electromagnetic/TestEm6/GNUmakefile
index 901cff67fc..24d8d9f83f 100644
--- a/examples/extended/electromagnetic/TestEm6/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm6/GNUmakefile
@@ -1,6 +1,7 @@
-# $Id: GNUmakefile,v 1.1 1999/10/28 02:15:11 vnivanch Exp $
+# $Id: GNUmakefile,v 1.3 2000/01/21 15:59:27 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
+# G4NOHIST variable is checked.  Vladimir Ivanchenko, 2000/01/18
 # --------------------------------------------------------------
 
 name := TestEm6
@@ -16,7 +17,11 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
-LDFLAGS  += -L/cern/pro/lib
-LOADLIBS += -lpacklib $(FCLIBS)
+ifdef G4NOHIST
+  CPPFLAGS += -DG4NOHIST
+else
+  LDFLAGS  += -L/cern/pro/lib
+  LOADLIBS += -lpacklib $(FCLIBS)
+endif
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm6/History b/examples/extended/electromagnetic/TestEm6/History
new file mode 100644
index 0000000000..a47681709b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm6/History
@@ -0,0 +1,17 @@
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                    TestEm6 History file
+                    --------------------
+This file should be used by the G4 example coordinator to briefly
+summarize all major modifications introduced in the code and keep
+track of all tags.
+
+     ----------------------------------------------------------
+     * Reverse chronological order (last date on top), please *
+     ----------------------------------------------------------
+     
+21.01.2000 - created. Vladimir Ivanchenko
+
diff --git a/examples/extended/electromagnetic/TestEm6/TestEm6.cc b/examples/extended/electromagnetic/TestEm6/TestEm6.cc
index 5c738bf6e9..ad1dfe8044 100644
--- a/examples/extended/electromagnetic/TestEm6/TestEm6.cc
+++ b/examples/extended/electromagnetic/TestEm6/TestEm6.cc
@@ -35,46 +35,47 @@
 #include "Em6RunAction.hh"
 #include "Em6EventAction.hh"
 #include "Em6SteppingAction.hh"
-
+#include "Em6SteppingVerbose.hh"
 
 int main(int argc,char** argv) {
-
+ 
   //choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
   
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new Em6SteppingVerbose);
+    
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
   // set mandatory initialization classes
-  Em6DetectorConstruction* detector;
-  detector = new Em6DetectorConstruction;
-  runManager->SetUserInitialization(detector);
-  runManager->SetUserInitialization(new Em6PhysicsList(detector));
+  Em6DetectorConstruction* det;
+  runManager->SetUserInitialization(det = new Em6DetectorConstruction);
+  runManager->SetUserInitialization(new Em6PhysicsList(det));
+  runManager->SetUserAction(new Em6PrimaryGeneratorAction(det));
   
-#ifdef G4VIS_USE
-  // visualization manager
-  G4VisManager* visManager = new Em6VisManager;
-  visManager->Initialize();
-#endif 
- 
+  #ifdef G4VIS_USE
+   // visualization manager
+   G4VisManager* visManager = new Em6VisManager;
+   visManager->Initialize();
+  #endif
+    
   // set user action classes
-  runManager->SetUserAction(new Em6PrimaryGeneratorAction(detector));
-  Em6RunAction* runaction = new Em6RunAction;
-  runManager->SetUserAction(runaction);
-
-  Em6EventAction* eventaction = new Em6EventAction(runaction);
-  runManager->SetUserAction(eventaction);
-
-  Em6SteppingAction* steppingaction = new Em6SteppingAction(detector,
-                                               eventaction, runaction);
-  runManager->SetUserAction(steppingaction);
+  Em6RunAction*   RunAct;
+  Em6EventAction* EvtAct;
+  
+  runManager->SetUserAction(RunAct = new Em6RunAction); 
+  runManager->SetUserAction(EvtAct = new Em6EventAction(RunAct));
+  //  runManager->SetUserAction(new Em6TrackingAction(RunAct));
+  runManager->SetUserAction(new Em6SteppingAction(det,EvtAct,RunAct));
+  runManager->SetUserAction(new Em6PrimaryGeneratorAction(det));
   
   //Initialize G4 kernel
   runManager->Initialize();
     
   // get the pointer to the User Interface manager 
     G4UImanager* UI = G4UImanager::GetUIpointer();  
- 
+
   if (argc==1)   // Define UI terminal for interactive mode  
     { 
      G4UIsession * session = new G4UIterminal;
@@ -88,12 +89,14 @@ int main(int argc,char** argv) {
      G4String fileName = argv[1];
      UI->ApplyCommand(command+fileName);
     }
-    
+
   // job termination
-#ifdef G4VIS_USE
+ #ifdef G4VIS_USE
   delete visManager;
-#endif  
+ #endif
+ 
   delete runManager;
+  G4cout << "TestEm6 is finished!!!" << G4endl;
 
   return 0;
 }
@@ -102,3 +105,5 @@ int main(int argc,char** argv) {
 
 
 
+
+
diff --git a/examples/extended/electromagnetic/TestEm6/TestEm6.in b/examples/extended/electromagnetic/TestEm6/TestEm6.in
new file mode 100644
index 0000000000..1341026312
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm6/TestEm6.in
@@ -0,0 +1,50 @@
+#
+# Macro file for the initialization phase of "TestEm6.cc"
+#
+# It creates the default geometry (simple absorber box) 
+#
+#/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#/step/verbose 2
+#/tracking/verbose 2
+#/stepping/verbose 2
+#/event/verbose 2
+#
+#/calor/setAbsMat Silicon   
+#/calor/setAbsThick 50. mum  
+#/calor/setAbsYZ 10. cm
+#/calor/update
+#/calor/cutG 100.0 micrometer
+#/calor/cutE 100.0 micrometer
+#  hist file name
+#/plots/sethistName p.plot 
+#/run/initialize
+#/run/particle/dumpCutValues
+#/event/drawTracks none
+#
+# Gun with Protons 10 MeV
+#
+/gun/particle proton
+/gun/energy 10.0 MeV
+#
+/run/beamOn 1000
+#
+# Gun with antiProtons 10 MeV
+#
+#/plots/sethistName antip.plot 
+/run/initialize
+/gun/particle anti_proton
+/gun/energy 10.0 MeV
+/run/beamOn 100
+#
+# Gun with IonC12 100 MeV
+#
+#/plots/sethistName ionc12.plot 
+/run/initialize
+/gun/particle IonC12
+/gun/energy 50.0 MeV
+/run/beamOn 100
+
+
+
diff --git a/examples/extended/electromagnetic/TestEm6/TestEm6.out b/examples/extended/electromagnetic/TestEm6/TestEm6.out
new file mode 100644
index 0000000000..09a7966c8f
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm6/TestEm6.out
@@ -0,0 +1,297 @@
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
+G4VUserPhysicsList::SetVerboseLevel  : Verbose level is set to 2
+
+***** Table : Nb of materials = 13 *****
+
+ Material: Beryllium     density:  1.848 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  35.267 cm 
+   --->  Element: Beryllium      Z =  4.0   N =   9.0   A =   9.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: Aluminum     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+   --->  Element: Aluminum      Z = 13.0   N =  27.0   A =  26.98 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:   Carbon     density:  2.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  21.348 cm 
+   --->  Element:   Carbon      Z =  6.0   N =  12.0   A =  12.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:  Silicon     density:  2.330 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   9.368 cm 
+   --->  Element:  Silicon      Z = 14.0   N =  28.1   A =  28.09 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material: liquidArgon     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+   --->  Element: liquidArgon      Z = 18.0   N =  40.0   A =  39.95 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Iron     density:  7.870 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.759 cm 
+   --->  Element:     Iron      Z = 26.0   N =  55.9   A =  55.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:   Copper     density:  8.960 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.436 cm 
+   --->  Element:   Copper      Z = 29.0   N =  63.5   A =  63.55 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Gold     density: 19.320 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.344 mm 
+   --->  Element:     Gold      Z = 79.0   N = 197.0   A = 196.97 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+   --->  Element:     Lead      Z = 82.0   N = 207.2   A = 207.19 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:    Water H_2O   density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  11.21 %  Abundance  66.67 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  88.79 %  Abundance  33.33 %
+
+ Material:  Methane CH_4   density:  0.667 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 696.375 m  
+   --->  Element: Hydrogen  H   Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass:  25.19 %  Abundance  80.00 %
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.00 g/mole  fractionMass:  74.81 %  Abundance  20.00 %
+
+ Material: Graphite Graphite   density:  2.265 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  18.834 cm 
+   --->  Element:   Carbon  C   Z =  6.0   N =  12.0   A =  12.00 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
+ Material:      Air     density:  1.000 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 367.858 m  
+   --->  Element: Nitrogen  N   Z =  7.0   N =  14.0   A =  14.01 g/mole  fractionMass:  70.00 %  Abundance  72.71 %
+   --->  Element:   Oxygen  O   Z =  8.0   N =  16.0   A =  16.00 g/mole  fractionMass:  30.00 %  Abundance  27.29 %
+
+
+
+ The  WORLD   is made of 50 cm  of Air. The transverse size (YZ) of the world is 12 cm 
+ The ABSORBER is made of 250 items of 1 mm  of Water. The transverse size (YZ) is 10 cm 
+ X position of the middle of the absorber 0 fm 
+G4VUserPhysicsList::Construct()
+Construct particles 
+Construct processes 
+Ionic processes for IonAr40
+New ion with Q = 18; MassR = 0.025
+Ionic processes for IonC12
+New ion with Q = 6; MassR = 0.084
+Ionic processes for IonFe56
+New ion with Q = 26; MassR = 0.018
+Ionic processes for alpha
+New ion with Q = 2; MassR = 0.25
+Hadronic processes for anti_proton
+Ionic processes for deuteron
+New ion with Q = 1; MassR = 0.5
+Hadronic processes for kaon+
+Hadronic processes for kaon-
+Hadronic processes for pi+
+Hadronic processes for pi-
+Hadronic processes for proton
+Em6PhysicsList::SetCuts:CutLength : 1 mm 
+Set cuts for all particles! 
+
+phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
+        Sandia crossSection below 50 KeV
+       PhysicsTables from 50 keV to 50 MeV in 100 bins. 
+
+compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
+        Scattered gamma energy according Klein-Nishina.
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
+Set cuts for gamma
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+
+eBrem:  Total cross sections from a parametrisation. Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
+Set cuts for e-
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+Set cuts for e+
+Set cuts for mu-
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1e+03 PeV in 100 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 100 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 TeV.
+    PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
+Set cuts for mu+
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
+
+hLowEIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 10 eV  to 1e+02 TeV  in 150 bins.
+        Low energy losses approximation is taken from  ICRU_R49p
+        from 1 keV  to 2 MeV .
+        Parametrization of the Barkas effect is switched on.
+Set cuts for proton
+Set cuts for anti_proton
+G4VUserPhysicsList::SetCutValueForOthers   :1[mm]
+Set cuts for IonAr40
+Set cuts for IonC12
+Set cuts for IonFe56
+Set cuts for alpha
+Set cuts for anti_nu_e
+Set cuts for anti_nu_mu
+Set cuts for chargedgeantino
+Set cuts for deuteron
+Set cuts for geantino
+Set cuts for kaon+
+Set cuts for kaon-
+Set cuts for nu_e
+Set cuts for nu_mu
+Set cuts for pi+
+Set cuts for pi-
+Set cuts for pi0
+============= The cut Energy ==============================
+                            gamma              e-             mu-          proton         neutron    
+Cut in range                  1 mm            1 mm            1 mm            1 mm             
+Cut in energy
+          Beryllium        1.99 keV         466 keV        4.28 MeV        11.5 MeV            
+           Aluminum        6.89 keV         597 keV        5.02 MeV        13.1 MeV            
+             Carbon        3.14 keV         521 keV        4.63 MeV        12.3 MeV            
+            Silicon        6.89 keV         541 keV        4.72 MeV        12.2 MeV            
+        liquidArgon        6.18 keV         343 keV        3.24 MeV        8.32 MeV            
+               Iron        20.8 keV        1.28 MeV        8.52 MeV          22 MeV            
+             Copper        24.6 keV         1.4 MeV        8.95 MeV          23 MeV            
+               Gold         111 keV        2.28 MeV        11.7 MeV        29.2 MeV            
+               Lead         101 keV        1.38 MeV        8.52 MeV        20.9 MeV            
+              Water         2.9 keV         347 keV        3.39 MeV        8.95 MeV            
+            Methane         990 eV          990 eV         39.8 keV        82.2 keV            
+           Graphite        3.29 keV         568 keV        4.96 MeV        13.1 MeV            
+                Air         990 eV          990 eV         39.8 keV          59 keV            
+===================================================
+#
+# Macro file for the initialization phase of "TestEm6.cc"
+#
+# It creates the default geometry (simple absorber box) 
+#
+#/control/verbose 2
+#control/saveHistory
+#/step/verbose 2
+#/tracking/verbose 2
+#/stepping/verbose 2
+#/event/verbose 2
+#
+#/calor/setAbsMat Silicon   
+#/calor/setAbsThick 50. mum  
+#/calor/setAbsYZ 10. cm
+#/calor/update
+#/calor/cutG 100.0 micrometer
+#/calor/cutE 100.0 micrometer
+#  hist file name
+#/plots/sethistName p.plot 
+#/run/initialize
+#/run/particle/dumpCutValues
+#/event/drawTracks none
+#
+# Gun with Protons 10 MeV
+#
+#
+### Run 0 start.
+Start closing geometry.
+Start Run processing.
+Run terminated.
+Run Summary
+  Number of events processed : 1000
+  User=51s Real=61s Sys=9.8s
+ ================== run summary =====================
+ end of Run TotNbofEvents = 1000
+    mean charged track length   in absorber=0.0147529 +- 0.00406827  mm  
+
+            mean energy deposit in absorber=0.00282675 +- 0.00076118  MeV 
+
+ mean number of steps in absorber (charged) =278.625 +- 1.50063      
+ mean number of steps in absorber (neutral) =305.527 +- 6.45728      
+
+   mean number of charged secondaries = 4.059 +- 0.0643857
+
+   mean number of neutral secondaries = 4.234 +- 0.0639941
+
+   mean number of e-s =4.039  and e+s =0.02
+
+(number) transmission coeff=0.084  reflection coeff=0.051
+
+#
+# Gun with antiProtons 10 MeV
+#
+#/plots/sethistName antip.plot 
+### Run 1 start.
+Start Run processing.
+Run terminated.
+Run Summary
+  Number of events processed : 100
+  User=5s Real=6.1s Sys=1s
+ ================== run summary =====================
+ end of Run TotNbofEvents = 100
+    mean charged track length   in absorber=0 +- 0  mm  
+
+            mean energy deposit in absorber=0 +- 0  MeV 
+
+ mean number of steps in absorber (charged) =279.89 +- 3.64738      
+ mean number of steps in absorber (neutral) =293.7 +- 18.7385      
+
+   mean number of charged secondaries = 4.07 +- 0.195067
+
+   mean number of neutral secondaries = 4.01 +- 0.197228
+
+   mean number of e-s =4.04  and e+s =0.03
+
+(number) transmission coeff=0.08  reflection coeff=0.06
+
+#
+# Gun with IonC12 100 MeV
+#
+#/plots/sethistName ionc12.plot 
+### Run 2 start.
+Start Run processing.
+Run terminated.
+Run Summary
+  Number of events processed : 100
+  User=4.7s Real=5.6s Sys=0.87s
+ ================== run summary =====================
+ end of Run TotNbofEvents = 100
+    mean charged track length   in absorber=0.0211493 +- 0.0148059  mm  
+
+            mean energy deposit in absorber=0.00365839 +- 0.00250438  MeV 
+
+ mean number of steps in absorber (charged) =274.36 +- 5.17406      
+ mean number of steps in absorber (neutral) =247.41 +- 17.9913      
+
+   mean number of charged secondaries = 3.99 +- 0.188942
+
+   mean number of neutral secondaries = 3.58 +- 0.191927
+
+   mean number of e-s =3.97  and e+s =0.02
+
+(number) transmission coeff=0.09  reflection coeff=0.03
+
+G4 kernel has come to Quit state.
+Deletion of G4 kernel class start.
+UserDetectorConstruction deleted.
+UserPhysicsList deleted.
+UserRunAction deleted.
+UserPrimaryGenerator deleted.
+G4SDManager deleted.
+EventManager deleted.
+UImanager deleted.
+StateManager deleted.
+RunManager is deleting.
+TestEm6 is finished!!!
diff --git a/examples/extended/electromagnetic/TestEm6/batch.mac b/examples/extended/electromagnetic/TestEm6/batch.mac
index 01d8ec68ee..6267abb3e7 100644
--- a/examples/extended/electromagnetic/TestEm6/batch.mac
+++ b/examples/extended/electromagnetic/TestEm6/batch.mac
@@ -1,7 +1,7 @@
 #
 # Macro file for the initialization phase of "TestEm6.cc"
 #
-# It creates the default geometry (simple absorber box )        
+# It creates the default geometry (simple absorber box) 
 #
 #/control/verbose 2
 #control/saveHistory
@@ -9,7 +9,7 @@
 #/step/verbose 2
 #/tracking/verbose 2
 #/stepping/verbose 2
-#/event/verbose 4
+#/event/verbose 2
 #
 #/run/initialize
 #
@@ -18,17 +18,20 @@
 #/calor/setAbsYZ 10. cm
 #/calor/update
 #
-#  hist file name
-/plots/sethistName ionip.plot 
 #  PLOT: angle distr. of transmitted particles
 /plots/setnbinTh 60
 /plots/setThlow 0.0 deg
 /plots/setThhigh 6.0 deg
 #
-/calor/cutG 2130.0 micrometer
-/calor/cutE 50.0 mm
-#/calor/cutE 1.000 micrometer
+#/calor/cutG 2130.0 micrometer
+#/calor/cutE 50.0 mm
+#/calor/cutG 100.0 micrometer
+#/calor/cutE 100.0 micrometer
+#  hist file name
+#/plots/sethistName p.plot 
 /run/initialize
+#/run/particle/dumpCutValues
+#/event/drawTracks none
 #
 #/gun/particle gamma
 /gun/particle proton
@@ -36,11 +39,18 @@
 #/gun/energy 6.56 MeV
 /gun/energy 10.0 MeV
 #
-#/run/beamOn 10
-/run/beamOn 10000
-#
+/run/beamOn 10
+#/plots/sethistName antip.plot 
+#/run/initialize
+#/gun/particle antiproton
+#/gun/energy 10.0 MeV
+#/run/beamOn 100
 #
-
+#/plots/sethistName ionc12.plot 
+#/run/initialize
+#/gun/particle IonC12
+#/gun/energy 100.0 MeV
+#/run/beamOn 100
 
 
 
diff --git a/examples/extended/electromagnetic/TestEm6/include/Em6RunAction.hh b/examples/extended/electromagnetic/TestEm6/include/Em6RunAction.hh
index 1c437cbe2b..84ae1b6ed0 100644
--- a/examples/extended/electromagnetic/TestEm6/include/Em6RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm6/include/Em6RunAction.hh
@@ -24,14 +24,16 @@
 #include "G4IonAr40.hh"
 #include "G4IonFe56.hh"
 #include "G4Electron.hh"
-#include <iostream.h>
+#include "g4std/iostream"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class Em6RunMessenger;
 
+#ifndef G4NOHIST
 class HepTupleManager;
 class HepHistogram;
+#endif
 
 class G4Run;
 
@@ -75,7 +77,9 @@ public: // Without description
     void FillNbOfSteps(G4double nstep);
     void Fillvertexz(G4double z);
 
+#ifndef G4NOHIST
     void SethistName(G4String name) ;
+#endif
 
     void SetnbinStep(G4int nbin);
     void SetSteplow(G4double Slow);
@@ -119,11 +123,14 @@ public: // Without description
 
   private:
 
+#ifndef G4NOHIST
     void bookHisto();
     void FillLowEnergyTest();
+#endif
 
   private:
 
+#ifndef G4NOHIST
     G4String histName ;
     HepTupleManager* hbookManager;
     HepHistogram *histo1, *histo2, *histo3, *histo4, *histo5 ;
@@ -136,6 +143,7 @@ public: // Without description
     HepHistogram *histo61, *histo62, *histo63, *histo64, *histo65;
     HepHistogram *histo71, *histo72, *histo73, *histo74, *histo75, *histo76;
     HepHistogram *histo81, *histo82, *histo83, *histo84, *histo85, *histo86;
+#endif
 
     G4double LowestEnergy,HighestEnergy;
     G4int TotBin;
diff --git a/examples/extended/electromagnetic/TestEm6/include/Em6RunMessenger.hh b/examples/extended/electromagnetic/TestEm6/include/Em6RunMessenger.hh
index 06b6f61d52..b407c07fab 100644
--- a/examples/extended/electromagnetic/TestEm6/include/Em6RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm6/include/Em6RunMessenger.hh
@@ -47,7 +47,9 @@ private:
    
    G4UIdirectory*             plotDir;   
 
+#ifndef G4NOHIST
    G4UIcmdWithAString*        sethistNameCmd;
+#endif
 
    G4UIcmdWithAnInteger*      setnbinStepCmd; 
    G4UIcmdWithADouble*        setSteplowCmd; 
diff --git a/examples/extended/electromagnetic/TestEm6/include/Em6SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm6/include/Em6SteppingVerbose.hh
new file mode 100644
index 0000000000..691fc40b4a
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm6/include/Em6SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em6SteppingVerbose.hh,v 1.2 1999/12/15 14:49:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em6SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em6SteppingVerbose;
+
+#ifndef Em6SteppingVerbose_h
+#define Em6SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em6SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  Em6SteppingVerbose();
+ ~Em6SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm6/include/G4IonAr40.hh b/examples/extended/electromagnetic/TestEm6/include/G4IonAr40.hh
index 9e4859c779..a4bc982b97 100644
--- a/examples/extended/electromagnetic/TestEm6/include/G4IonAr40.hh
+++ b/examples/extended/electromagnetic/TestEm6/include/G4IonAr40.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonAr40.hh,v 1.2.4.1 1999/12/07 20:47:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonAr40.hh,v 1.4 2000/01/19 20:55:11 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm6/include/G4IonC12.hh b/examples/extended/electromagnetic/TestEm6/include/G4IonC12.hh
index 8228103006..32641c6104 100644
--- a/examples/extended/electromagnetic/TestEm6/include/G4IonC12.hh
+++ b/examples/extended/electromagnetic/TestEm6/include/G4IonC12.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonC12.hh,v 1.2.4.1 1999/12/07 20:47:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonC12.hh,v 1.4 2000/01/19 20:55:11 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm6/include/G4IonFe56.hh b/examples/extended/electromagnetic/TestEm6/include/G4IonFe56.hh
index 0f3fd86e98..988e2f1d63 100644
--- a/examples/extended/electromagnetic/TestEm6/include/G4IonFe56.hh
+++ b/examples/extended/electromagnetic/TestEm6/include/G4IonFe56.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonFe56.hh,v 1.2.4.1 1999/12/07 20:47:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonFe56.hh,v 1.4 2000/01/19 20:55:11 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm6/src/Em6DetectorConstruction.cc
index 9d5f4b0d5c..0078636cc5 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6DetectorConstruction.cc
@@ -170,7 +170,7 @@ G4Material* Air = new G4Material(name="Air"  , density, ncomponents=2);
 Air->AddElement(elN, fractionmass=0.7);
 Air->AddElement(elO, fractionmass=0.3);
 
-G4cout << *(G4Material::GetMaterialTable()) << endl;
+G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //default materials of the calorimeter
   AbsorberMaterial = H2O;
@@ -259,13 +259,13 @@ void Em6DetectorConstruction::PrintCalorParameters()
   G4cout << "\n The  WORLD   is made of " 
          << G4BestUnit(WorldSizeX,"Length") << " of " << WorldMaterial->GetName();
   G4cout << ". The transverse size (YZ) of the world is " 
-         << G4BestUnit(WorldSizeYZ,"Length") << endl;
+         << G4BestUnit(WorldSizeYZ,"Length") << G4endl;
   G4cout << " The ABSORBER is made of " << NumberOfAbsorbers << " items of "
          <<G4BestUnit(AbsorberThickness,"Length")<< " of " << AbsorberMaterial->GetName();
   G4cout << ". The transverse size (YZ) is " 
-         << G4BestUnit(AbsorberSizeYZ,"Length") << endl;
+         << G4BestUnit(AbsorberSizeYZ,"Length") << G4endl;
   G4cout << " X position of the middle of the absorber " << G4BestUnit(XposAbs,"Length");
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6DetectorSD.cc b/examples/extended/electromagnetic/TestEm6/src/Em6DetectorSD.cc
index eaa1fe8f10..6f63fbab1c 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6DetectorSD.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6DetectorSD.cc
@@ -75,14 +75,14 @@ G4bool Em6CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
       if (physVol == Detector->GetAbsorber()) calHit->AddAbs(edep,stepl);
       HitID[Em6Number] = CalCollection->insert(calHit) - 1;
       if (verboseLevel>0)
-        G4cout << " New Calorimeter Hit on Em6: " << Em6Number << endl;
+        G4cout << " New Calorimeter Hit on Em6: " << Em6Number << G4endl;
     }
   else
     { 
       if (physVol == Detector->GetAbsorber())
          (*CalCollection)[HitID[Em6Number]]->AddAbs(edep,stepl);
       if (verboseLevel>0)
-        G4cout << " Energy added to Em6: " << Em6Number << endl; 
+        G4cout << " Energy added to Em6: " << Em6Number << G4endl; 
     }
     
   return true;
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6EventAction.cc b/examples/extended/electromagnetic/TestEm6/src/Em6EventAction.cc
index 959da38e14..2285e0c722 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6EventAction.cc
@@ -7,7 +7,6 @@
 //
 // 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "Em6EventAction.hh"
@@ -17,8 +16,6 @@
 #include "Em6CalorHit.hh"
 #include "Em6EventActionMessenger.hh"
 
-#include "g4rw/tvordvec.h"
-
 #include "G4Event.hh"
 #include "G4EventManager.hh"
 #include "G4HCofThisEvent.hh"
@@ -57,7 +54,7 @@ void Em6EventAction::BeginOfEventAction(const G4Event* evt)
   } 
 
   if(verboselevel>1)
-    G4cout << "<<< Event  " << evt->GetEventID() << " started." << endl;
+    G4cout << "<<< Event  " << evt->GetEventID() << " started." << G4endl;
   nstep = 0. ;
   nstepCharged = 0. ;
   nstepNeutral = 0. ;
@@ -83,7 +80,7 @@ void Em6EventAction::EndOfEventAction(const G4Event* evt)
     int n_hit = CHC->entries();
    // if(verboselevel==2)
    // G4cout << "     " << n_hit
-   //      << " hits are stored in Em6CalorHitsCollection." << endl;
+   //      << " hits are stored in Em6CalorHitsCollection." << G4endl;
 
     G4double totEAbs=0, totLAbs=0;
     for (int i=0;i<n_hit;i++)
@@ -92,11 +89,11 @@ void Em6EventAction::EndOfEventAction(const G4Event* evt)
       }
   if(verboselevel==2)
     G4cout
-       << "   Absorber: total energy: " << setw(7) << 
+       << "   Absorber: total energy: " << G4std::setw(7) << 
                              G4BestUnit(totEAbs,"Energy")
-       << "       total track length: " << setw(7) <<
+       << "       total track length: " << G4std::setw(7) <<
                              G4BestUnit(totLAbs,"Length")
-       << endl;           
+       << G4endl;           
 
    // count event, add deposits to the sum ...
     runaction->CountEvent() ;
@@ -104,7 +101,7 @@ void Em6EventAction::EndOfEventAction(const G4Event* evt)
     runaction->AddnStepsCharged(nstepCharged) ;
     runaction->AddnStepsNeutral(nstepNeutral) ;
     if(verboselevel==2)
-      G4cout << " Ncharged=" << Nch << "  ,   Nneutral=" << Nne << endl;
+      G4cout << " Ncharged=" << Nch << "  ,   Nneutral=" << Nne << G4endl;
     runaction->CountParticles(Nch,Nne);
     runaction->AddEP(NE,NP);
     runaction->AddTrRef(Transmitted,Reflected) ;
@@ -131,7 +128,7 @@ void Em6EventAction::EndOfEventAction(const G4Event* evt)
   }  
 
   if(verboselevel>0)
-    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << endl;
+    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -208,3 +205,11 @@ void Em6EventAction::SetRef()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
   
 
+
+
+
+
+
+
+
+
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc b/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc
index be85325b95..b5672c1f4d 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc
@@ -1,4 +1,3 @@
-
 // This code implementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -10,6 +9,11 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    
+//
+// Always place it in front!
+//
+#include "G4Timer.hh"
+
 #include "Em6PhysicsList.hh"
 #include "Em6DetectorConstruction.hh"
 #include "Em6PhysicsListMessenger.hh"
@@ -25,9 +29,8 @@
 #include "G4ParticleTable.hh"
 #include "G4Material.hh"
 #include "G4EnergyLossTables.hh"
-#include "G4Timer.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -36,14 +39,15 @@ Em6PhysicsList::Em6PhysicsList(Em6DetectorConstruction* p)
 {
   pDet = p;
 
-  defaultCutValue = 0.5*mm;
+  defaultCutValue = 1*mm;
   cutForGamma     = defaultCutValue;
   cutForElectron  = defaultCutValue;
   cutForProton    = defaultCutValue;
   
-  MaxChargedStep = DBL_MAX; 
+  //  MaxChargedStep = DBL_MAX; 
+  MaxChargedStep = 1*mm; 
   
-  SetVerboseLevel(1);
+  SetVerboseLevel(2);
   physicsListMessenger = new Em6PhysicsListMessenger(this);
 }
 
@@ -65,8 +69,8 @@ void Em6PhysicsList::ConstructParticle()
 
   ConstructBosons();
   ConstructLeptons();
-  ConstructMesons();
   ConstructBarions();
+  ConstructMesons();
   ConstructIons();
 }
 
@@ -125,9 +129,9 @@ void Em6PhysicsList::ConstructIons()
 //  Ions
   G4Deuteron::DeuteronDefinition();
   G4Alpha::AlphaDefinition();
-  //  G4IonC12::IonC12Definition();
-  //  G4IonAr40::IonAr40Definition();
-  //  G4IonFe56::IonFe56Definition();
+  G4IonC12::IonC12Definition();
+  G4IonAr40::IonAr40Definition();
+  G4IonFe56::IonFe56Definition();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -156,6 +160,7 @@ void Em6PhysicsList::ConstructProcess()
 #include "G4MuPairProduction.hh"
 
 #include "G4hIonisation.hh"
+#include "G4ionIonisation.hh"
 #include "G4hLowEnergyIonisation.hh"
 #include "G4ionLowEnergyIonisation.hh"
 
@@ -208,7 +213,7 @@ void Em6PhysicsList::ConstructEM()
 
     } else if (
                 particleName == "proton"  
-               || particleName == "antiproton"  
+               || particleName == "anti_proton"  
                || particleName == "pi+"  
                || particleName == "pi-"  
                || particleName == "kaon+"  
@@ -217,14 +222,16 @@ void Em6PhysicsList::ConstructEM()
     {
       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
 
-      cout << "Hadronic processes for " << particleName << endl; 
+      G4cout << "Hadronic processes for " << particleName << G4endl; 
 
       // Standard ionisation
-      // G4hIonisation* hIon = new G4hIonisation() ;
+      //       G4hIonisation* hIon = new G4hIonisation() ;
 
       // Standard ionisation with low energy extantion
-         G4hLowEnergyIonisation* hIon = new G4hLowEnergyIonisation() ;
-         hIon->SetNuclearStoppingOff() ;
+      // G4ionLowEnergyIonisation* hIon = new G4ionLowEnergyIonisation() ;
+      //    hIon->SetNuclearStoppingOff() ;
+      G4hLowEnergyIonisation* hIon = new G4hLowEnergyIonisation() ;
+      hIon->SetNuclearStoppingOff() ;
        //hIon->SetNuclearStoppingOn() ;
 
        //hIon->SetStoppingPowerTableName("Ziegler1977He") ;
@@ -233,6 +240,8 @@ void Em6PhysicsList::ConstructEM()
        //hIon->SetStoppingPowerTableName("ICRU_R49He") ;
        //hIon->SetStoppingPowerTableName("ICRU_R49PowersHe") ;
 
+      hIon->SetAntiProtonStoppingOn(); 
+
       pmanager->AddProcess(hIon,-1,2,2);
       
       Em6StepCut* thehadronStepCut = new Em6StepCut();
@@ -241,27 +250,28 @@ void Em6PhysicsList::ConstructEM()
    
     } else if (   particleName == "alpha"  
                || particleName == "deuteron"  
-//               || particleName == "IonC12"  
-//               || particleName == "IonAr40"  
-//               || particleName == "IonFe56"  
+               || particleName == "IonC12"  
+               || particleName == "IonAr40"  
+               || particleName == "IonFe56"  
               )
     {
       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
 
-      cout << "Ionic processes for " << particleName << endl; 
+      G4cout << "Ionic processes for " << particleName << G4endl; 
 
       // Standard ionisation
-      // G4hIonisation* hIon = new G4ionIonisation() ;
+      // G4ionIonisation* iIon = new G4ionIonisation() ;
 
       // Standard ionisation with low energy extantion
-        G4ionLowEnergyIonisation* iIon = new G4ionLowEnergyIonisation() ;
-        iIon->SetNuclearStoppingOff() ;
-      //iIon->SetNuclearStoppingOn() ;
-        iIon->SetIonDefinition(particle) ;
+      //  G4hLowEnergyIonisation* iIon = new G4hLowEnergyIonisation() ;
+      G4ionLowEnergyIonisation* iIon = new G4ionLowEnergyIonisation() ;
+      iIon->SetNuclearStoppingOff() ;
+      //  iIon->SetNuclearStoppingOn() ;
+      iIon->SetIonDefinition(particle) ;
 
       //iIon->SetStoppingPowerTableName("Ziegler1977He") ;
       //iIon->SetStoppingPowerTableName("Ziegler1977H") ;
-	iIon->SetStoppingPowerTableName("ICRU_R49p") ;
+      iIon->SetStoppingPowerTableName("ICRU_R49p") ;
       //iIon->SetStoppingPowerTableName("ICRU_R49He") ;
       //iIon->SetStoppingPowerTableName("ICRU_R49PowersHe") ;
 
@@ -299,14 +309,18 @@ void Em6PhysicsList::ConstructGeneral()
 
 void Em6PhysicsList::SetCuts()
 {
-  G4Timer theTimer ;
-  theTimer.Start() ;
+  // G4Timer theTimer ;
+  // theTimer.Start() ;
+
   if (verboseLevel >0){
     G4cout << "Em6PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
   }  
   // set cut values for gamma at first and for e- second and next for e+,
   // because some processes for e+/e- need cut values for gamma 
+
+      G4cout << "Set cuts for all particles! " << G4endl; 
+
    SetCutValue(cutForGamma,"gamma");
 
    SetCutValue(cutForElectron,"e-");
@@ -319,16 +333,19 @@ void Em6PhysicsList::SetCuts()
   // because some processes for hadrons need cut values for proton/anti_proton 
 
   SetCutValue(defaultCutValue, "proton");
+
   SetCutValue(defaultCutValue, "anti_proton");
 
   SetCutValueForOthers(defaultCutValue);
+
+  //  G4cout << "Dump the table!" << G4endl;
               
   if (verboseLevel>0) DumpCutValuesTable();
 
-  theTimer.Stop();
-  G4cout.precision(6);
-  G4cout << endl ;
-  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<endl;
+  //  theTimer.Stop();
+  //  G4cout.precision(6);
+  //  G4cout << G4endl ;
+  //  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<G4endl;
 
 }
 
@@ -400,10 +417,10 @@ void Em6PhysicsList::GetRange(G4double val)
   G4double cut;
   part = theParticleTable->FindParticle("e-");
   cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  G4cout << "material : " << currMat->GetName() << endl;
-  G4cout << "particle : " << part->GetParticleName() << endl;
-  G4cout << "energy   : " << val / keV << " (keV)" << endl;
-  G4cout << "range    : " << cut / mm << " (mm)" << endl;
+  G4cout << "material : " << currMat->GetName() << G4endl;
+  G4cout << "particle : " << part->GetParticleName() << G4endl;
+  G4cout << "energy   : " << val / keV << " (keV)" << G4endl;
+  G4cout << "range    : " << cut / mm << " (mm)" << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -411,8 +428,8 @@ void Em6PhysicsList::GetRange(G4double val)
 void Em6PhysicsList::SetMaxStep(G4double step)
 {
   MaxChargedStep = step ;
-  G4cout << " MaxChargedStep=" << MaxChargedStep << endl;
-  G4cout << endl;
+  G4cout << " MaxChargedStep=" << MaxChargedStep << G4endl;
+  G4cout << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.ions b/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.ions
deleted file mode 100644
index 1093e3d873..0000000000
--- a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.ions
+++ /dev/null
@@ -1,423 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-   
-#include "Em6PhysicsList.hh"
-#include "Em6DetectorConstruction.hh"
-#include "Em6PhysicsListMessenger.hh"
-
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
-#include "G4IonC12.hh"
-#include "G4IonAr40.hh"
-#include "G4IonFe56.hh"
-#include "G4ProcessManager.hh"
-#include "G4ProcessVector.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-#include "G4Material.hh"
-#include "G4EnergyLossTables.hh"
-#include "G4Timer.hh"
-#include "G4ios.hh"
-#include <iomanip.h>                
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6PhysicsList::Em6PhysicsList(Em6DetectorConstruction* p)
-:G4VUserPhysicsList()
-{
-  pDet = p;
-
-  defaultCutValue = 0.5*mm;
-  cutForGamma     = defaultCutValue;
-  cutForElectron  = defaultCutValue;
-  cutForProton    = defaultCutValue;
-  
-  MaxChargedStep = DBL_MAX; 
-  
-  SetVerboseLevel(1);
-  physicsListMessenger = new Em6PhysicsListMessenger(this);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6PhysicsList::~Em6PhysicsList()
-{
-  delete physicsListMessenger; 
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructParticle()
-{
-  // In this method, static member functions should be called
-  // for all particles which you want to use.
-  // This ensures that objects of these particle types will be
-  // created in the program. 
-
-  ConstructBosons();
-  ConstructLeptons();
-  ConstructMesons();
-  ConstructBarions();
-  ConstructIons();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructBosons()
-{
-  // pseudo-particles
-  G4Geantino::GeantinoDefinition();
-  G4ChargedGeantino::ChargedGeantinoDefinition();
-  
-  // gamma
-  G4Gamma::GammaDefinition();
-}
- //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructLeptons()
-{
-  // leptons
-  G4Electron::ElectronDefinition();
-  G4Positron::PositronDefinition();
-  G4MuonPlus::MuonPlusDefinition();
-  G4MuonMinus::MuonMinusDefinition();
-
-  G4NeutrinoE::NeutrinoEDefinition();
-  G4AntiNeutrinoE::AntiNeutrinoEDefinition();
-  G4NeutrinoMu::NeutrinoMuDefinition();
-  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructMesons()
-{
- //  mesons
-  G4PionPlus::PionPlusDefinition();
-  G4PionMinus::PionMinusDefinition();
-  G4PionZero::PionZeroDefinition();
-  G4KaonPlus::KaonPlusDefinition();
-  G4KaonMinus::KaonMinusDefinition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructBarions()
-{
-//  barions
-  G4Proton::ProtonDefinition();
-  G4AntiProton::AntiProtonDefinition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructIons()
-{
-//  Ions
-  G4Deuteron::DeuteronDefinition();
-  G4Alpha::AlphaDefinition();
-  G4IonC12::IonC12Definition();
-  G4IonAr40::IonAr40Definition();
-  G4IonFe56::IonFe56Definition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructProcess()
-{
-  AddTransportation();
-  ConstructEM();
-  ConstructGeneral();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "G4ComptonScattering.hh"
-#include "G4GammaConversion.hh"
-#include "G4PhotoElectricEffect.hh"
-
-#include "G4MultipleScattering.hh"
-
-#include "G4eIonisation.hh"
-#include "G4eBremsstrahlung.hh"
-#include "G4eplusAnnihilation.hh"
-
-#include "G4MuIonisation.hh"
-#include "G4MuBremsstrahlung.hh"
-#include "G4MuPairProduction.hh"
-
-#include "G4hIonisation.hh"
-#include "G4hLowEnergyIonisation.hh"
-#include "G4ionLowEnergyIonisation.hh"
-
-#include "Em6StepCut.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructEM()
-{
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    G4String particleName = particle->GetParticleName();
-     
-    if (particleName == "gamma") {
-    // gamma
-      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
-      pmanager->AddDiscreteProcess(new G4ComptonScattering);
-      pmanager->AddDiscreteProcess(new G4GammaConversion);    
-      
-    } else if (particleName == "e-") {
-      //electron
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);       
-
-      Em6StepCut* theeminusStepCut = new Em6StepCut();
-      theeminusStepCut->SetMaxStep(MaxChargedStep);  
-      pmanager->AddProcess(theeminusStepCut,         -1,-1,4);
-
-    } else if (particleName == "e+") {
-      //positron      
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);
-      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,4);
-                  
-      Em6StepCut* theeplusStepCut = new Em6StepCut();
-      theeplusStepCut->SetMaxStep(MaxChargedStep) ;          
-      pmanager->AddProcess(theeplusStepCut,          -1,-1,5);
-  
-    } else if( particleName == "mu+" || 
-               particleName == "mu-"    ) {
-     //muon  
-     pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-     pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
-     pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1,3);
-     pmanager->AddProcess(new G4MuPairProduction,  -1,-1,4);       	       
-
-    } else if (
-                particleName == "proton"  
-               || particleName == "antiproton"  
-               || particleName == "pi+"  
-               || particleName == "pi-"  
-               || particleName == "kaon+"  
-               || particleName == "kaon-"  
-              )
-    {
-      pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
-
-      cout << "Hadronic processes for " << particleName << endl; 
-
-      // Standard ionisation
-      // G4hIonisation* hIon = new G4hIonisation() ;
-
-      // Standard ionisation with low energy extantion
-         G4hLowEnergyIonisation* hIon = new G4hLowEnergyIonisation() ;
-         hIon->SetNuclearStoppingOff() ;
-       //hIon->SetNuclearStoppingOn() ;
-
-       //hIon->SetStoppingPowerTableName("Ziegler1977He") ;
-       //hIon->SetStoppingPowerTableName("Ziegler1977H") ;
-         hIon->SetStoppingPowerTableName("ICRU_R49p") ;
-       //hIon->SetStoppingPowerTableName("ICRU_R49He") ;
-       //hIon->SetStoppingPowerTableName("ICRU_R49PowersHe") ;
-
-      pmanager->AddProcess(hIon,-1,2,2);
-      
-      Em6StepCut* thehadronStepCut = new Em6StepCut();
-      thehadronStepCut->SetMaxStep(MaxChargedStep);          		       
-      pmanager->AddProcess( thehadronStepCut,       -1,-1,3);
-   
-    } else if (   particleName == "alpha"  
-               || particleName == "deuteron"  
-//               || particleName == "IonC12"  
-//               || particleName == "IonAr40"  
-//               || particleName == "IonFe56"  
-              )
-    {
-      pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
-
-      cout << "Ionic processes for " << particleName << endl; 
-
-      // Standard ionisation
-      // G4hIonisation* hIon = new G4ionIonisation() ;
-
-      // Standard ionisation with low energy extantion
-        G4ionLowEnergyIonisation* iIon = new G4ionLowEnergyIonisation() ;
-        iIon->SetNuclearStoppingOff() ;
-      //iIon->SetNuclearStoppingOn() ;
-        iIon->SetIonDefinition(particle) ;
-
-      //iIon->SetStoppingPowerTableName("Ziegler1977He") ;
-      //iIon->SetStoppingPowerTableName("Ziegler1977H") ;
-	iIon->SetStoppingPowerTableName("ICRU_R49p") ;
-      //iIon->SetStoppingPowerTableName("ICRU_R49He") ;
-      //iIon->SetStoppingPowerTableName("ICRU_R49PowersHe") ;
-
-      pmanager->AddProcess(iIon,-1,2,2);
-      
-      Em6StepCut* theIonStepCut = new Em6StepCut();
-      theIonStepCut->SetMaxStep(MaxChargedStep);          		       
-      pmanager->AddProcess( theIonStepCut,       -1,-1,3);
-    }
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "G4Decay.hh"
-
-void Em6PhysicsList::ConstructGeneral()
-{
-  // Add Decay Process
-   G4Decay* theDecayProcess = new G4Decay();
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    if (theDecayProcess->IsApplicable(*particle)) { 
-      pmanager ->AddProcess(theDecayProcess);
-      // set ordering for PostStepDoIt and AtRestDoIt
-      pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep);
-      pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest);
-    }
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetCuts()
-{
-  G4Timer theTimer ;
-  theTimer.Start() ;
-  if (verboseLevel >0){
-    G4cout << "Em6PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
-  }  
-  // set cut values for gamma at first and for e- second and next for e+,
-  // because some processes for e+/e- need cut values for gamma 
-   SetCutValue(cutForGamma,"gamma");
-
-   SetCutValue(cutForElectron,"e-");
-   SetCutValue(cutForElectron,"e+");
-
-   SetCutValue(defaultCutValue,"mu-");
-   SetCutValue(defaultCutValue,"mu+");
-
-  // set cut values for proton and anti_proton before all other hadrons
-  // because some processes for hadrons need cut values for proton/anti_proton 
-
-  SetCutValue(defaultCutValue, "proton");
-  SetCutValue(defaultCutValue, "anti_proton");
-
-  SetCutValueForOthers(defaultCutValue);
-              
-  if (verboseLevel>0) DumpCutValuesTable();
-
-  theTimer.Stop();
-  G4cout.precision(6);
-  G4cout << endl ;
-  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<endl;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetGammaCut(G4double val)
-{
-  ResetCuts();
-  cutForGamma = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetElectronCut(G4double val)
-{
-  ResetCuts();
-  cutForElectron = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetProtonCut(G4double val)
-{
-  ResetCuts();
-  cutForProton = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetCutsByEnergy(G4double val)
-{
-  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
-  G4Material* currMat = pDet->GetAbsorberMaterial();
-
-  // set cut values for gamma at first and for e- second and next for e+,
-  // because some processes for e+/e- need cut values for gamma
-  G4ParticleDefinition* part;
-  G4double cut;
-
-  part = theParticleTable->FindParticle("e-");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "e-");
-
-  part = theParticleTable->FindParticle("e+");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "e+");
-
-  // set cut values for proton and anti_proton before all other hadrons
-  // because some processes for hadrons need cut values for proton/anti_proton
-  part = theParticleTable->FindParticle("proton");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "proton");
-
-  part = theParticleTable->FindParticle("anti_proton");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "anti_proton");
-
-  SetCutValueForOthers(cut);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::GetRange(G4double val)
-{
-  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
-  G4Material* currMat = pDet->GetAbsorberMaterial();
-
-  G4ParticleDefinition* part;
-  G4double cut;
-  part = theParticleTable->FindParticle("e-");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  G4cout << "material : " << currMat->GetName() << endl;
-  G4cout << "particle : " << part->GetParticleName() << endl;
-  G4cout << "energy   : " << val / keV << " (keV)" << endl;
-  G4cout << "range    : " << cut / mm << " (mm)" << endl;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetMaxStep(G4double step)
-{
-  MaxChargedStep = step ;
-  G4cout << " MaxChargedStep=" << MaxChargedStep << endl;
-  G4cout << endl;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-
-
-
-
-
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.protons b/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.protons
deleted file mode 100644
index 43037a338b..0000000000
--- a/examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.protons
+++ /dev/null
@@ -1,376 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-   
-#include "Em6PhysicsList.hh"
-#include "Em6DetectorConstruction.hh"
-#include "Em6PhysicsListMessenger.hh"
-
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
-#include "G4ProcessManager.hh"
-#include "G4ProcessVector.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-#include "G4Material.hh"
-#include "G4EnergyLossTables.hh"
-#include "G4Timer.hh"
-#include "G4ios.hh"
-#include <iomanip.h>                
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6PhysicsList::Em6PhysicsList(Em6DetectorConstruction* p)
-:G4VUserPhysicsList()
-{
-  pDet = p;
-
-  defaultCutValue = 0.5*mm;
-  cutForGamma     = defaultCutValue;
-  cutForElectron  = defaultCutValue;
-  cutForProton    = defaultCutValue;
-  
-  MaxChargedStep = DBL_MAX; 
-  
-  SetVerboseLevel(1);
-  physicsListMessenger = new Em6PhysicsListMessenger(this);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6PhysicsList::~Em6PhysicsList()
-{
-  delete physicsListMessenger; 
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructParticle()
-{
-  // In this method, static member functions should be called
-  // for all particles which you want to use.
-  // This ensures that objects of these particle types will be
-  // created in the program. 
-
-  ConstructBosons();
-  ConstructLeptons();
-  ConstructMesons();
-  ConstructBarions();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructBosons()
-{
-  // pseudo-particles
-  G4Geantino::GeantinoDefinition();
-  G4ChargedGeantino::ChargedGeantinoDefinition();
-  
-  // gamma
-  G4Gamma::GammaDefinition();
-}
- //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructLeptons()
-{
-  // leptons
-  G4Electron::ElectronDefinition();
-  G4Positron::PositronDefinition();
-  G4MuonPlus::MuonPlusDefinition();
-  G4MuonMinus::MuonMinusDefinition();
-
-  G4NeutrinoE::NeutrinoEDefinition();
-  G4AntiNeutrinoE::AntiNeutrinoEDefinition();
-  G4NeutrinoMu::NeutrinoMuDefinition();
-  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructMesons()
-{
- //  mesons
-  G4PionPlus::PionPlusDefinition();
-  G4PionMinus::PionMinusDefinition();
-  G4PionZero::PionZeroDefinition();
-  G4KaonPlus::KaonPlusDefinition();
-  G4KaonMinus::KaonMinusDefinition();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructBarions()
-{
-//  barions
-  G4Proton::ProtonDefinition();
-  G4AntiProton::AntiProtonDefinition();
-}
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructProcess()
-{
-  AddTransportation();
-  ConstructEM();
-  ConstructGeneral();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "G4ComptonScattering.hh"
-#include "G4GammaConversion.hh"
-#include "G4PhotoElectricEffect.hh"
-
-#include "G4MultipleScattering.hh"
-
-#include "G4eIonisation.hh"
-#include "G4eBremsstrahlung.hh"
-#include "G4eplusAnnihilation.hh"
-
-#include "G4MuIonisation.hh"
-#include "G4MuBremsstrahlung.hh"
-#include "G4MuPairProduction.hh"
-
-#include "G4hIonisation.hh"
-#include "G4hLowEnergyIonisation.hh"
-
-#include "Em6StepCut.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::ConstructEM()
-{
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    G4String particleName = particle->GetParticleName();
-     
-    if (particleName == "gamma") {
-    // gamma
-      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
-      pmanager->AddDiscreteProcess(new G4ComptonScattering);
-      pmanager->AddDiscreteProcess(new G4GammaConversion);    
-      
-    } else if (particleName == "e-") {
-      //electron
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);       
-
-      Em6StepCut* theeminusStepCut = new Em6StepCut();
-      theeminusStepCut->SetMaxStep(MaxChargedStep);  
-      pmanager->AddProcess(theeminusStepCut,         -1,-1,4);
-
-    } else if (particleName == "e+") {
-      //positron      
-      pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);
-      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,4);
-                  
-      Em6StepCut* theeplusStepCut = new Em6StepCut();
-      theeplusStepCut->SetMaxStep(MaxChargedStep) ;          
-      pmanager->AddProcess(theeplusStepCut,          -1,-1,5);
-  
-    } else if( particleName == "mu+" || 
-               particleName == "mu-"    ) {
-     //muon  
-     pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-     pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
-     pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1,3);
-     pmanager->AddProcess(new G4MuPairProduction,  -1,-1,4);       	       
-
-    } else if (
-                particleName == "proton"  
-               || particleName == "antiproton"  
-               || particleName == "pi+"  
-               || particleName == "pi-"  
-               || particleName == "kaon+"  
-               || particleName == "kaon-"  
-              )
-    {
-      pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
-
-      cout << "Hadronic processes for " << particleName << endl; 
-
-      // Standard ionisation
-      //      G4hIonisation* hIon = new G4hIonisation() ;
-
-      // Standard ionisation with low energy extantion
-      G4hLowEnergyIonisation* hIon = new G4hLowEnergyIonisation() ;
- 
-      // Definition of nuclear stopping
-      hIon->SetNuclearStoppingOff() ;
-       //hIon->SetNuclearStoppingOn() ;
-     
-      // Definition of the proton's table  
-       //hIon->SetStoppingPowerTableName("Ziegler1977H") ;
-      hIon->SetStoppingPowerTableName("ICRU_R49p") ;
- 
-      pmanager->AddProcess(hIon,-1,2,2);
-      
-      Em6StepCut* thehadronStepCut = new Em6StepCut();
-      thehadronStepCut->SetMaxStep(MaxChargedStep);          		       
-      pmanager->AddProcess( thehadronStepCut,       -1,-1,3);
-   
-    }
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "G4Decay.hh"
-
-void Em6PhysicsList::ConstructGeneral()
-{
-  // Add Decay Process
-   G4Decay* theDecayProcess = new G4Decay();
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    if (theDecayProcess->IsApplicable(*particle)) { 
-      pmanager ->AddProcess(theDecayProcess);
-      // set ordering for PostStepDoIt and AtRestDoIt
-      pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep);
-      pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest);
-    }
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetCuts()
-{
-  G4Timer theTimer ;
-  theTimer.Start() ;
-  if (verboseLevel >0){
-    G4cout << "Em6PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
-  }  
-  // set cut values for gamma at first and for e- second and next for e+,
-  // because some processes for e+/e- need cut values for gamma 
-   SetCutValue(cutForGamma,"gamma");
-
-   SetCutValue(cutForElectron,"e-");
-   SetCutValue(cutForElectron,"e+");
-
-   SetCutValue(defaultCutValue,"mu-");
-   SetCutValue(defaultCutValue,"mu+");
-
-  // set cut values for proton and anti_proton before all other hadrons
-  // because some processes for hadrons need cut values for proton/anti_proton 
-
-  SetCutValue(defaultCutValue, "proton");
-  SetCutValue(defaultCutValue, "anti_proton");
-
-  SetCutValueForOthers(defaultCutValue);
-              
-  if (verboseLevel>0) DumpCutValuesTable();
-
-  theTimer.Stop();
-  G4cout.precision(6);
-  G4cout << endl ;
-  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<endl;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetGammaCut(G4double val)
-{
-  ResetCuts();
-  cutForGamma = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetElectronCut(G4double val)
-{
-  ResetCuts();
-  cutForElectron = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetProtonCut(G4double val)
-{
-  ResetCuts();
-  cutForProton = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetCutsByEnergy(G4double val)
-{
-  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
-  G4Material* currMat = pDet->GetAbsorberMaterial();
-
-  // set cut values for gamma at first and for e- second and next for e+,
-  // because some processes for e+/e- need cut values for gamma
-  G4ParticleDefinition* part;
-  G4double cut;
-
-  part = theParticleTable->FindParticle("e-");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "e-");
-
-  part = theParticleTable->FindParticle("e+");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "e+");
-
-  // set cut values for proton and anti_proton before all other hadrons
-  // because some processes for hadrons need cut values for proton/anti_proton
-  part = theParticleTable->FindParticle("proton");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "proton");
-
-  part = theParticleTable->FindParticle("anti_proton");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  SetCutValue(cut, "anti_proton");
-
-  SetCutValueForOthers(cut);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::GetRange(G4double val)
-{
-  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
-  G4Material* currMat = pDet->GetAbsorberMaterial();
-
-  G4ParticleDefinition* part;
-  G4double cut;
-  part = theParticleTable->FindParticle("e-");
-  cut = G4EnergyLossTables::GetRange(part,val,currMat);
-  G4cout << "material : " << currMat->GetName() << endl;
-  G4cout << "particle : " << part->GetParticleName() << endl;
-  G4cout << "energy   : " << val / keV << " (keV)" << endl;
-  G4cout << "range    : " << cut / mm << " (mm)" << endl;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6PhysicsList::SetMaxStep(G4double step)
-{
-  MaxChargedStep = step ;
-  G4cout << " MaxChargedStep=" << MaxChargedStep << endl;
-  G4cout << endl;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-
-
-
-
-
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc b/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc
index 0131d8ec85..8d7253bed0 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc
@@ -17,10 +17,13 @@
 #include "G4UImanager.hh"
 #include "G4VVisManager.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
+#ifndef G4NOHIST
 #include "CLHEP/Hist/HBookFile.h"
 #include <assert.h>
+//#include <assert.h>
+#endif
 
 #include "G4hEnergyLoss.hh"
 #include "G4EnergyLossTables.hh"
@@ -30,10 +33,13 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em6RunAction::Em6RunAction()
-  :histName("histfile"),nbinStep(0.),nbinEn(0.),nbinTt(0.),nbinTb(0.),
+  :nbinStep(0.),nbinEn(0.),nbinTt(0.),nbinTb(0.),
    nbinTsec(0.),nbinTh(0.),nbinThback(0.),nbinR(0.),nbinGamma(0.),
-   nbinvertexz(0.),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
+   nbinvertexz(0.),
+#ifndef G4NOHIST
+   histName("histfile"),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
    histo6(0),histo7(0),histo8(0),histo9(0),histo10(0),
+#endif
    theProton (G4Proton::Proton()),
    theElectron ( G4Electron::Electron() ),
    LowestEnergy(0.01*keV),
@@ -48,6 +54,7 @@ Em6RunAction::Em6RunAction()
 Em6RunAction::~Em6RunAction()
 {
   delete runMessenger;
+#ifndef G4NOHIST
   if(histo1) delete histo1 ;
   if(histo2) delete histo2 ;
   if(histo3) delete histo3 ;
@@ -101,78 +108,80 @@ Em6RunAction::~Em6RunAction()
   delete histo85 ;
   delete histo86 ;
   delete hbookManager;
+#endif
 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+#ifndef G4NOHIST
 void Em6RunAction::bookHisto()
 {
   // init hbook
   hbookManager = new HBookFile(histName, 68);
-  assert (hbookManager != 0);
+  //  assert (hbookManager != 0);
 
   // book histograms
   if(nbinStep>0)
   {
     histo1 = hbookManager->histogram("number of steps/event"
                                    ,nbinStep,Steplow,Stephigh) ;
-    assert (histo1 != 0);
+    //    assert (histo1 != 0);
   }
   if(nbinEn>0)
   {
     histo2 = hbookManager->histogram("energy deposit in absorber(in MeV)"
                                      ,nbinEn,Enlow,Enhigh) ;
-    assert (histo2 != 0);
+    //    assert (histo2 != 0);
   }
   if(nbinTh>0)
   {
     histo3 = hbookManager->histogram("angle distribution at exit(deg)"
                                      ,nbinTh,Thlow/deg,Thhigh/deg) ;
-    assert (histo3 != 0);
+    //    assert (histo3 != 0);
   }
   if(nbinR>0)
   {
     histo4 = hbookManager->histogram("lateral distribution at exit(mm)"
                                      ,nbinR ,Rlow,Rhigh)  ;
-    assert (histo4 != 0);
+    //    assert (histo4 != 0);
   }
   if(nbinTt>0)
   {
     histo5 = hbookManager->histogram("kinetic energy of the primary at exit(MeV)"
                                      ,nbinTt,Ttlow,Tthigh)  ;
-    assert (histo5 != 0);
+    //    assert (histo5 != 0);
   }
   if(nbinThback>0)
   {
     histo6 = hbookManager->histogram("angle distribution of backscattered primaries(deg)"
                                      ,nbinThback,Thlowback/deg,Thhighback/deg) ;
-    assert (histo6 != 0);
+    //    assert (histo6 != 0);
   }
   if(nbinTb>0)
   {
     histo7 = hbookManager->histogram("kinetic energy of the backscattered primaries (MeV)"
                                      ,nbinTb,Tblow,Tbhigh)  ;
-    assert (histo7 != 0);
+    //    assert (histo7 != 0);
   }
   if(nbinTsec>0)
   {
     histo8 = hbookManager->histogram("kinetic energy of the charged secondaries (MeV)"
                                      ,nbinTsec,Tseclow,Tsechigh)  ;
-    assert (histo8 != 0);
+    //    assert (histo8 != 0);
   }
   if(nbinvertexz>0)
   {
     histo9 = hbookManager->histogram("z of secondary charged vertices(mm)"
                                      ,nbinvertexz ,zlow,zhigh)  ;
-    assert (histo9 != 0);
+    //    assert (histo9 != 0);
   }
   if(nbinGamma>0)
   {
     histo10= hbookManager->histogram("kinetic energy of gammas escaping the absorber (MeV)"
                                 //     ,nbinGamma,ElowGamma,EhighGamma)  ;
                                 ,nbinGamma,log10(ElowGamma),log10(EhighGamma))  ;
-    assert (histo10 != 0);
+    //    assert (histo10 != 0);
   }
 
   // Test on G4hLowEnergyIonisation
@@ -268,12 +277,13 @@ void Em6RunAction::bookHisto()
                                                   ,92,0.5,92.5) ;
 
 }
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em6RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
 
   G4UImanager* UI = G4UImanager::GetUIpointer();
    
@@ -281,8 +291,7 @@ void Em6RunAction::BeginOfRunAction(const G4Run* aRun)
 
   if(pVVisManager)
   {
-    UI->ApplyCommand("/vis/clear/view");
-    UI->ApplyCommand("/vis/draw/current");
+    UI->ApplyCommand("/vis/scene/notifyHandlers");
   }
       
   EnergySumAbs = 0. ;
@@ -426,7 +435,9 @@ void Em6RunAction::BeginOfRunAction(const G4Run* aRun)
     }
   }
 
+#ifndef G4NOHIST
   bookHisto();
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -484,72 +495,72 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
 
   Transmitted /=TotNbofEvents ;
   Reflected   /=TotNbofEvents ;
- G4cout << " ================== run summary =====================" << endl;
+ G4cout << " ================== run summary =====================" << G4endl;
  G4int prec = G4cout.precision(6);
   G4cout << " end of Run TotNbofEvents = " <<  
-           TotNbofEvents << endl ;
+           TotNbofEvents << G4endl ;
   G4cout << "    mean charged track length   in absorber=" <<
            tlSumAbs/mm      << " +- " << sAbs/mm    <<
-          "  mm  " << endl; 
-  G4cout << endl;
+          "  mm  " << G4endl; 
+  G4cout << G4endl;
   G4cout << "            mean energy deposit in absorber=" <<
            EnergySumAbs/MeV << " +- " << sigAbs/MeV <<
-          "  MeV " << endl ;
-  G4cout << endl ;
+          "  MeV " << G4endl ;
+  G4cout << G4endl ;
   G4cout << " mean number of steps in absorber (charged) =" <<
            nStepSumCharged         << " +- " << sigch     <<
-          "      " << endl ;
+          "      " << G4endl ;
   G4cout << " mean number of steps in absorber (neutral) =" <<
            nStepSumNeutral         << " +- " << signe     <<
-          "      " << endl ;
-  G4cout << endl ;
+          "      " << G4endl ;
+  G4cout << G4endl ;
   G4cout << "   mean number of charged secondaries = " <<
-           SumCharged << " +- " << sigcharged << endl;  
-  G4cout << endl ;
+           SumCharged << " +- " << sigcharged << G4endl;  
+  G4cout << G4endl ;
   G4cout << "   mean number of neutral secondaries = " <<
-           SumNeutral << " +- " << signeutral << endl;  
-  G4cout << endl ;
+           SumNeutral << " +- " << signeutral << G4endl;  
+  G4cout << G4endl ;
   
   G4cout << "   mean number of e-s =" << Selectron << 
-            "  and e+s =" << Spositron << endl;
-  G4cout << endl; 
+            "  and e+s =" << Spositron << G4endl;
+  G4cout << G4endl; 
   
   G4cout << "(number) transmission coeff=" << Transmitted <<
-            "  reflection coeff=" << Reflected << endl;
-  G4cout << endl; 
+            "  reflection coeff=" << Reflected << G4endl;
+  G4cout << G4endl; 
 
   if(nbinStep>0)
   {G4double E , dnorm, norm ;
-   G4cout << "   step number/event distribution " << endl ;
+   G4cout << "   step number/event distribution " << G4endl ;
    G4cout << "#entries=" << entryStep << "    #underflows=" << underStep <<
-             "    #overflows=" << overStep << endl ;
+             "    #overflows=" << overStep << G4endl ;
    if( entryStep>0.)
    {
      E = Steplow - dStep ;
      norm = TotNbofEvents ;
-     G4cout << " bin nb   nsteplow     entries     normalized " << endl ;
+     G4cout << " bin nb   nsteplow     entries     normalized " << G4endl ;
      for(G4int iss=0; iss<nbinStep; iss++)
      {
       E += dStep ;
       dnorm = distStep[iss]/norm;
-      G4cout << setw(5) << iss << setw(10) << E << 
-                setw(12) << distStep[iss] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << iss << G4std::setw(10) << E << 
+                G4std::setw(12) << distStep[iss] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinEn>0)
   {G4double E , dnorm, norm,fmax,Emp,width ;
    Emp=-999.999 ;
-   G4cout << " energy deposit distribution " << endl ;
+   G4cout << " energy deposit distribution " << G4endl ;
    G4cout << "#entries=" << entryEn << "    #underflows=" << underEn <<
-             "    #overflows=" << overEn << endl ;
+             "    #overflows=" << overEn << G4endl ;
    if( entryEn>0.)
    {
      E = Enlow - dEn ;
      norm = TotNbofEvents*dEn ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      fmax = 0. ;
      for(G4int ien=0; ien<nbinEn; ien++)
      {
@@ -560,11 +571,11 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
         Emp = E ;
       }
       dnorm = distEn[ien]/norm;
-      G4cout << setw(5) << ien << setw(10) << E << 
-                setw(12) << distEn[ien] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << E << 
+                G4std::setw(12) << distEn[ien] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
      G4int ii ;
      G4double E1,E2 ;
      E1=-1.e6 ;
@@ -590,16 +601,16 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
       if(distEn[i2] >= 0.5*fmax)
         E2=E ;
      }
-     G4cout << " Emp = " << setw(15) << Emp/MeV << "   width="
-            << setw(15) << (E2-E1)/MeV <<   "  MeV " << endl;
-     G4cout << endl ;
+     G4cout << " Emp = " << G4std::setw(15) << Emp/MeV << "   width="
+            << G4std::setw(15) << (E2-E1)/MeV <<   "  MeV " << G4endl;
+     G4cout << G4endl ;
    }     
   }
   if(nbinTt>0)
   {G4double E , dnorm, norm ,sig;
-   G4cout << " transmitted energy distribution " << endl ;
+   G4cout << " transmitted energy distribution " << G4endl ;
    G4cout << "#entries=" << entryTt << "    #underflows=" << underTt <<
-             "    #overflows=" << overTt << endl ;
+             "    #overflows=" << overTt << G4endl ;
    if( entryTt>0.)
    {
      Ttmean /= entryTt;
@@ -609,26 +620,26 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
      else
        sig=sqrt(sig/entryTt) ;
      G4cout << " mean energy of transmitted particles=" << Ttmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
+               " +- " << sig/keV << "  keV." << G4endl;
      E = Ttlow - dTt ;
      norm = TotNbofEvents*dTt ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTt; itt++)
      {
       E += dTt ;
       dnorm = distTt[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTt[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTt[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinTb>0)
   {G4double E , dnorm, norm ,sig;
-   G4cout << " backscattered energy distribution " << endl ;
+   G4cout << " backscattered energy distribution " << G4endl ;
    G4cout << "#entries=" << entryTb << "    #underflows=" << underTb <<
-             "    #overflows=" << overTb << endl ;
+             "    #overflows=" << overTb << G4endl ;
    if( entryTb>0.)
    {
      Tbmean /= entryTb;
@@ -638,48 +649,48 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
      else
        sig=sqrt(sig/entryTb) ;
      G4cout << " mean energy of backscattered particles=" << Tbmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
+               " +- " << sig/keV << "  keV." << G4endl;
      E = Tblow - dTb ;
      norm = TotNbofEvents*dTb ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTb; itt++)
      {
       E += dTb ;
       dnorm = distTb[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTb[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTb[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
   if(nbinTsec>0)
   {G4double E , dnorm, norm ;
-   G4cout << " energy distribution of charged secondaries " << endl ;
+   G4cout << " energy distribution of charged secondaries " << G4endl ;
    G4cout << "#entries=" << entryTsec << "    #underflows=" << underTsec <<
-             "    #overflows=" << overTsec << endl ;
+             "    #overflows=" << overTsec << G4endl ;
    if( entryTsec>0.)
    {
      E = Tseclow - dTsec ;
      norm = TotNbofEvents*dTsec ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     G4cout << " bin nb      Elow      entries     normalized " << G4endl ;
      for(G4int itt=0; itt<nbinTsec; itt++)
      {
       E += dTsec ;
       dnorm = distTsec[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTsec[itt] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(10) << E << 
+                G4std::setw(12) << distTsec[itt] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
 
   if(nbinR >0)
   {G4double R , dnorm, norm,sig  ;
-   G4cout << "  R  distribution " << endl ;
+   G4cout << "  R  distribution " << G4endl ;
    G4cout << "#entries=" << entryR  << "    #underflows=" << underR  <<
-             "    #overflows=" << overR  << endl ;
+             "    #overflows=" << overR  << G4endl ;
    if( entryR >0.)
    {
      Rmean /= entryR;
@@ -687,27 +698,27 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
      if(sig<=0.) sig=0. ;
      else        sig = sqrt(sig/entryR) ;
      G4cout << " mean lateral displacement at exit=" << Rmean/mm << " +- "
-            << sig/mm << "  mm." << endl ; 
+            << sig/mm << "  mm." << G4endl ; 
      R = Rlow - dR  ;
      norm = TotNbofEvents*dR  ;
-     G4cout << " bin nb      Rlow      entries     normalized " << endl ;
+     G4cout << " bin nb      Rlow      entries     normalized " << G4endl ;
      for(G4int ier=0; ier<nbinR ; ier++)
      {
       R+= dR  ;
       dnorm = distR[ier]/norm;
-      G4cout << setw(5) << ier << setw(10) << R  <<
-                setw(12) << distR[ier] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << ier << G4std::setw(10) << R  <<
+                G4std::setw(12) << distR[ier] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinTh>0)
   {G4double Th,Thdeg, dnorm, norm,fac0,fnorm,pere,Thpere,Thmean,sum;
-   G4cout << "      angle   distribution " << endl ;
+   G4cout << "      angle   distribution " << G4endl ;
    G4cout << "#entries=" << entryTh << "    #underflows=" << underTh <<
-             "    #overflows=" << overTh << endl ;
+             "    #overflows=" << overTh << G4endl ;
    if( entryTh>0.)
    {
      Th= Thlow - dTh ;
@@ -719,7 +730,7 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
      pere = 1./exp(1.) ;
 
      G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
+               " entries         normalized " << G4endl ;
      Thpere = 0. ;
      sum = 0. ;
      Thmean = 0. ;
@@ -733,27 +744,27 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
       fnorm = fac0*distTh[ien] ;
       if( fnorm > pere)
         Thpere = Th ; 
-      G4cout << setw(5) << ien << setw(10) << Thdeg << "   " <<
-                setw(10) << Th << "  " <<   
-                setw(12) << distTh[ien] << "  " <<
-                setw(12) << dnorm << "  " << setw(12) << fnorm <<endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << Thdeg << "   " <<
+                G4std::setw(10) << Th << "  " <<   
+                G4std::setw(12) << distTh[ien] << "  " <<
+                G4std::setw(12) << dnorm << "  " << G4std::setw(12) << fnorm <<G4endl ;
      }
      Thmean /= sum ;
-     G4cout << endl;
+     G4cout << G4endl;
      G4cout << " mean = " << Thmean << "  rad  or " << 180.*Thmean/pi <<
-               " deg." << endl;
+               " deg." << G4endl;
      G4cout << " theta(1/e)=" << Thpere << " - " << Thpere+dTh << " rad   "
             << " or " << 180.*Thpere/pi << " - " << 180.*(Thpere+dTh)/pi 
-            << " deg." << endl;
-     G4cout << endl;
+            << " deg." << G4endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinThback>0)
   {G4double Thb,Thdegb, dnormb, normb,fac0b,fnormb,pereb,Thpereb,Thmeanb,sumb;
-   G4cout << " backscattering angle   distribution " << endl ;
+   G4cout << " backscattering angle   distribution " << G4endl ;
    G4cout << "#entries=" << entryThback << "    #underflows=" << underThback <<
-             "    #overflows=" << overThback << endl ;
+             "    #overflows=" << overThback << G4endl ;
    if( entryThback>0.)
    {
      Thb= Thlowback - dThback ;
@@ -765,7 +776,7 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
      pereb = 1./exp(1.) ;
 
      G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
+               " entries         normalized " << G4endl ;
      Thpereb = 0. ;
      sumb = 0. ;
      Thmeanb = 0. ;
@@ -779,76 +790,78 @@ void Em6RunAction::EndOfRunAction(const G4Run* aRun)
       fnormb = fac0b*distThback[ien] ;
       if( fnormb > pereb)
         Thpereb = Thb ;
-      G4cout << setw(5) << ien << setw(10) << Thdegb << "   " <<
-                setw(10) << Thb << "  " <<
-                setw(12) << distThback[ien] << "  " <<
-                setw(12) << dnormb << "  " << setw(12) << fnormb <<endl ;
+      G4cout << G4std::setw(5) << ien << G4std::setw(10) << Thdegb << "   " <<
+                G4std::setw(10) << Thb << "  " <<
+                G4std::setw(12) << distThback[ien] << "  " <<
+                G4std::setw(12) << dnormb << "  " << G4std::setw(12) << fnormb <<G4endl ;
      }
      Thmeanb /= sumb ;
-     G4cout << endl;
+     G4cout << G4endl;
      G4cout << " mean = " << Thmeanb << "  rad  or " << 180.*Thmeanb/pi <<
-               " deg." << endl;
+               " deg." << G4endl;
      G4cout << " theta(1/e)=" << Thpereb << " - " << Thpereb+dThback << " rad   "
             << " or " << 180.*Thpereb/pi << " - " << 180.*(Thpereb+dThback)/pi
-            << " deg." << endl;
-     G4cout << endl;
+            << " deg." << G4endl;
+     G4cout << G4endl;
    }
   }
 
   if(nbinGamma>0)
   {G4double E , fact,dnorm, norm  ;
-   G4cout << " gamma energy distribution " << endl ;
+   G4cout << " gamma energy distribution " << G4endl ;
    G4cout << "#entries=" << entryGamma << "    #underflows=" << underGamma <<
-             "    #overflows=" << overGamma << endl ;
+             "    #overflows=" << overGamma << G4endl ;
    if( entryGamma>0.)
    {
      fact=exp(dEGamma) ;
      E = ElowGamma/fact  ;
      norm = TotNbofEvents*dEGamma;
-     G4cout << " bin nb         Elow      entries       normalized " << endl ;
+     G4cout << " bin nb         Elow      entries       normalized " << G4endl ;
      for(G4int itt=0; itt<nbinGamma; itt++)
      {
       E *= fact ;
       dnorm = distGamma[itt]/norm;
-      G4cout << setw(5) << itt << setw(13) << E << 
-                setw(12) << distGamma[itt] <<
-                setw(15) << dnorm << endl ;
+      G4cout << G4std::setw(5) << itt << G4std::setw(13) << E << 
+                G4std::setw(12) << distGamma[itt] <<
+                G4std::setw(15) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }     
   }
 
   if(nbinvertexz >0)
   {G4double z , dnorm, norm  ;
-   G4cout << " vertex Z  distribution " << endl ;
+   G4cout << " vertex Z  distribution " << G4endl ;
    G4cout << "#entries=" << entryvertexz  << "    #underflows=" << undervertexz  <<
-             "    #overflows=" << oververtexz  << endl ;
+             "    #overflows=" << oververtexz  << G4endl ;
    if( entryvertexz >0.)
    {
      z =zlow - dz  ;
      norm = TotNbofEvents*dz  ;
-     G4cout << " bin nb      zlow      entries     normalized " << endl ;
+     G4cout << " bin nb      zlow      entries     normalized " << G4endl ;
      for(G4int iez=0; iez<nbinvertexz ; iez++)
      {
       z+= dz  ;
       if(abs(z)<1.e-12) z=0.;
       dnorm = distvertexz[iez]/norm;
-      G4cout << setw(5) << iez << setw(10) << z  <<
-                setw(12) << distvertexz[iez] <<
-                setw(12) << dnorm << endl ;
+      G4cout << G4std::setw(5) << iez << G4std::setw(10) << z  <<
+                G4std::setw(12) << distvertexz[iez] <<
+                G4std::setw(12) << dnorm << G4endl ;
      }
-     G4cout << endl;
+     G4cout << G4endl;
    }
   }
   
  G4cout.precision(prec);
   
   if (G4VVisManager::GetConcreteInstance())
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
     
    // Write histogram file
+#ifndef G4NOHIST
    FillLowEnergyTest() ;
    hbookManager->write();
+#endif
 
 }
 
@@ -907,6 +920,7 @@ void Em6RunAction::FillNbOfSteps(G4double ns)
   G4double n,bin ;
   G4int ibin;
  
+#ifndef G4NOHIST
   if(histo1)
   {
     entryStep += 1. ;
@@ -924,6 +938,7 @@ void Em6RunAction::FillNbOfSteps(G4double ns)
     }
    histo1->accumulate(ns) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -933,6 +948,7 @@ void Em6RunAction::FillEn(G4double En)
   G4double bin ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo2)
   {
     entryEn += 1. ;
@@ -949,6 +965,7 @@ void Em6RunAction::FillEn(G4double En)
     }
   histo2->accumulate(En/MeV) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -958,6 +975,7 @@ void Em6RunAction::FillTt(G4double En)
   G4double bin ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo5)
   {
     entryTt += 1. ;
@@ -976,6 +994,7 @@ void Em6RunAction::FillTt(G4double En)
     }
   histo5->accumulate(En/MeV) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -985,6 +1004,7 @@ void Em6RunAction::FillTb(G4double En)
   G4double bin ;
   G4int ibin;
   
+#ifndef G4NOHIST
   if(histo7)
   {
     entryTb += 1. ;
@@ -1003,6 +1023,7 @@ void Em6RunAction::FillTb(G4double En)
     }
   histo7->accumulate(En/MeV) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -1012,6 +1033,7 @@ void Em6RunAction::FillTsec(G4double En)
   G4double bin ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo8)
   {
     entryTsec += 1. ;
@@ -1028,6 +1050,7 @@ void Em6RunAction::FillTsec(G4double En)
     }
   histo8->accumulate(En/MeV) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -1037,6 +1060,7 @@ void Em6RunAction::FillGammaSpectrum(G4double En)
   G4double bin ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo10)
   {
     entryGamma += 1. ;
@@ -1053,6 +1077,7 @@ void Em6RunAction::FillGammaSpectrum(G4double En)
     }
   histo10->accumulate(log10(En/MeV)) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -1065,6 +1090,7 @@ void Em6RunAction::FillTh(G4double Th)
   G4double bin,Thbin ,wg;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo3)
   {
     entryTh += 1. ;
@@ -1086,7 +1112,7 @@ void Em6RunAction::FillTh(G4double Th)
       {  
         G4double thdeg=Th*180./pi;
         G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
+               << G4std::setw(12) << G4std::setprecision(4) << thdeg << G4endl;
         wg=0. ; 
       }
       distTh[ibin] += wg  ;
@@ -1094,6 +1120,7 @@ void Em6RunAction::FillTh(G4double Th)
 
   histo3->accumulate(Th/deg, wg) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -1106,6 +1133,7 @@ void Em6RunAction::FillThBack(G4double Th)
   G4double bin,Thbin,wg ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo6)
   {
     entryThback += 1. ;
@@ -1125,13 +1153,14 @@ void Em6RunAction::FillThBack(G4double Th)
       {  
         G4double thdeg=Th*180./pi;
         G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
+               << G4std::setw(12) << G4std::setprecision(4) << thdeg << G4endl;
         wg=0. ; 
       }
       distThback[ibin] += wg  ;
     }
   histo6->accumulate(Th/deg, wg) ;
   }
+#endif
 
 }
 
@@ -1142,6 +1171,7 @@ void Em6RunAction::FillR(G4double R )
   G4double bin ;
   G4int ibin;
 
+#ifndef G4NOHIST
   if(histo4)
   {
     entryR  += 1. ;
@@ -1160,6 +1190,7 @@ void Em6RunAction::FillR(G4double R )
     }
   histo4->accumulate(R/mm) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -1169,6 +1200,7 @@ void Em6RunAction::Fillvertexz(G4double z )
   G4double bin ;
   G4int ibin;
   
+#ifndef G4NOHIST
   if(histo9)
   {
     entryvertexz  += 1. ;
@@ -1185,202 +1217,205 @@ void Em6RunAction::Fillvertexz(G4double z )
     }
   histo9->accumulate(z/mm) ;
   }
+#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+#ifndef G4NOHIST
 void Em6RunAction::SethistName(G4String name)
 {
   histName = name ;
-  G4cout << " hist file = " << histName << endl;
+  G4cout << " hist file = " << histName << G4endl;
 }
+#endif
 
 void Em6RunAction::SetnbinStep(G4int nbin)
 {
   nbinStep = nbin ;
   if(nbinStep>0)
-  G4cout << " Nb of bins in #step plot = " << nbinStep << endl ;
+  G4cout << " Nb of bins in #step plot = " << nbinStep << G4endl ;
 }
 void Em6RunAction::SetSteplow(G4double low)
 {
   Steplow = low ;
   if(nbinStep>0)
-  G4cout << " low  in the #step plot = " << Steplow << endl ;
+  G4cout << " low  in the #step plot = " << Steplow << G4endl ;
 }
 void Em6RunAction::SetStephigh(G4double high)
 {
   Stephigh = high ;
   if(nbinStep>0)
-  G4cout << " high in the #step plot = " << Stephigh << endl ;
+  G4cout << " high in the #step plot = " << Stephigh << G4endl ;
 }
 void Em6RunAction::SetnbinEn(G4int nbin)
 {
   nbinEn = nbin ;
   if(nbinEn>0)
-  G4cout << " Nb of bins in Edep plot = " << nbinEn << endl ;
+  G4cout << " Nb of bins in Edep plot = " << nbinEn << G4endl ;
 }
 void Em6RunAction::SetEnlow(G4double Elow)
 {
   Enlow = Elow ;
   if(nbinEn>0)
-  G4cout << " Elow  in the  Edep plot = " << Enlow << endl ;
+  G4cout << " Elow  in the  Edep plot = " << Enlow << G4endl ;
 }
 void Em6RunAction::SetEnhigh(G4double Ehigh)
 {
   Enhigh = Ehigh ;
   if(nbinEn>0)
-  G4cout << " Ehigh in the  Edep plot = " << Enhigh << endl ;
+  G4cout << " Ehigh in the  Edep plot = " << Enhigh << G4endl ;
 }
 
 void Em6RunAction::SetnbinGamma(G4int nbin)
 {
   nbinGamma = nbin ;
   if(nbinGamma>0)
-  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << endl ;
+  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << G4endl ;
 }
 void Em6RunAction::SetElowGamma(G4double Elow)
 {
   ElowGamma = Elow ;
   if(nbinGamma>0)
-  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << endl ;
+  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << G4endl ;
 }
 void Em6RunAction::SetEhighGamma(G4double Ehigh)
 {
   EhighGamma = Ehigh ;
   if(nbinGamma>0)
-  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << endl ;
+  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << G4endl ;
 }
 
 void Em6RunAction::SetnbinTt(G4int nbin)
 {
   nbinTt = nbin ;
   if(nbinTt>0)
-  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << endl ;
+  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << G4endl ;
 }
 void Em6RunAction::SetTtlow(G4double Elow)
 {
   Ttlow = Elow ;
   if(nbinTt>0)
-  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << endl ;
+  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << G4endl ;
 }
 void Em6RunAction::SetTthigh(G4double Ehigh)
 {
   Tthigh = Ehigh ;
   if(nbinTt>0)
-  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << endl ;
+  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << G4endl ;
 }
 void Em6RunAction::SetnbinTb(G4int nbin)
 {
   nbinTb = nbin ;
   if(nbinTb>0)
-  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << endl ;
+  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << G4endl ;
 }
 void Em6RunAction::SetTblow(G4double Elow)
 {
   Tblow = Elow ;
   if(nbinTb>0)
-  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << endl ;
+  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << G4endl ;
 }
 void Em6RunAction::SetTbhigh(G4double Ehigh)
 {
   Tbhigh = Ehigh ;
   if(nbinTb>0)
-  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << endl ;
+  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << G4endl ;
 }
 
 void Em6RunAction::SetnbinTsec(G4int nbin)
 {
   nbinTsec = nbin ;
   if(nbinTsec>0)
-  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << endl ;
+  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << G4endl ;
 }
 void Em6RunAction::SetTseclow(G4double Elow)
 {
   Tseclow = Elow ;
   if(nbinTsec>0)
-  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << endl ;
+  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << G4endl ;
 }
 void Em6RunAction::SetTsechigh(G4double Ehigh)
 {
   Tsechigh = Ehigh ;
   if(nbinTsec>0)
-  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << endl ;
+  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << G4endl ;
 }
  
 void Em6RunAction::SetnbinR(G4int nbin)
 {
   nbinR  = nbin ;
   if(nbinR>0)
-  G4cout << " Nb of bins in R plot = " << nbinR << endl ;
+  G4cout << " Nb of bins in R plot = " << nbinR << G4endl ;
 }
 void Em6RunAction::SetRlow(G4double rlow)
 {
   Rlow = rlow ;
   if(nbinR>0)
-  G4cout << " Rlow  in the  R plot = " << Rlow << endl ;
+  G4cout << " Rlow  in the  R plot = " << Rlow << G4endl ;
 }
 void Em6RunAction::SetRhigh(G4double rhigh)
 {
   Rhigh = rhigh ;
   if(nbinR>0)
-  G4cout << " Rhigh in the R plot = " << Rhigh << endl ;
+  G4cout << " Rhigh in the R plot = " << Rhigh << G4endl ;
 }
 
 void Em6RunAction::Setnbinzvertex(G4int nbin)
 {
   nbinvertexz  = nbin ;
   if(nbinvertexz>0)
-  G4cout << " Nb of bins in Z plot = " << nbinvertexz << endl ;
+  G4cout << " Nb of bins in Z plot = " << nbinvertexz << G4endl ;
 }
 void Em6RunAction::Setzlow(G4double z)
 {
   zlow = z ;
   if(nbinvertexz>0)
-  G4cout << " zlow  in the  Z plot = " << zlow << endl ;
+  G4cout << " zlow  in the  Z plot = " << zlow << G4endl ;
 }
 void Em6RunAction::Setzhigh(G4double z)
 {
   zhigh = z ;
   if(nbinvertexz>0)
-  G4cout << " zhigh in the Z plot = " << zhigh << endl ;
+  G4cout << " zhigh in the Z plot = " << zhigh << G4endl ;
 }
 
 void Em6RunAction::SetnbinTh(G4int nbin)
 {
   nbinTh = nbin ;
   if(nbinTh>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinTh << endl ;
+  G4cout << " Nb of bins in Theta plot = " << nbinTh << G4endl ;
 }
 void Em6RunAction::SetThlow(G4double Tlow)
 {
   Thlow = Tlow ;
   if(nbinTh>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlow << endl ;
+  G4cout << " Tlow  in the  Theta plot = " << Thlow << G4endl ;
 }
 void Em6RunAction::SetThhigh(G4double Thigh)
 {
   Thhigh = Thigh ;
   if(nbinTh>0)
-  G4cout << " Thigh in the Theta plot = " << Thhigh << endl ;
+  G4cout << " Thigh in the Theta plot = " << Thhigh << G4endl ;
 }
 
 void Em6RunAction::SetnbinThBack(G4int nbin)
 {
   nbinThback = nbin ;
   if(nbinThback>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinThback << endl ;
+  G4cout << " Nb of bins in Theta plot = " << nbinThback << G4endl ;
 }
 void Em6RunAction::SetThlowBack(G4double Tlow)
 {
   Thlowback = Tlow ;
   if(nbinThback>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlowback << endl ;
+  G4cout << " Tlow  in the  Theta plot = " << Thlowback << G4endl ;
 }
 void Em6RunAction::SetThhighBack(G4double Thigh)
 {
   Thhighback = Thigh ;
   if(nbinThback>0)
-  G4cout << " Thigh in the Theta plot = " << Thhighback << endl ;
+  G4cout << " Thigh in the Theta plot = " << Thhighback << G4endl ;
 }
 void Em6RunAction::CountParticles(G4double nch,G4double nne)
 {
@@ -1397,6 +1432,7 @@ void Em6RunAction::AddEP(G4double nele,G4double npos)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+#ifndef G4NOHIST
 void Em6RunAction::FillLowEnergyTest( )
 {
   G4int J ;
@@ -1714,7 +1750,7 @@ void Em6RunAction::FillLowEnergyTest( )
         tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
         dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
 	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac) ;
-	//        G4cout << "Energy = " << tau << " MeV; dedx = " << dedx << endl;
+	//        G4cout << "Energy = " << tau << " MeV; dedx = " << dedx << G4endl;
         histo54->accumulate(log10(tau),dedx*cf) ;
       }
     } else if ("Graphite" == material->GetName()) {
@@ -1733,7 +1769,7 @@ void Em6RunAction::FillLowEnergyTest( )
     //    delete ionLEIonAr ;
     //    delete ionLEIonFe ;
 }
-
+#endif
 
 
 
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.ions b/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.ions
deleted file mode 100644
index 20a2e08e00..0000000000
--- a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.ions
+++ /dev/null
@@ -1,1728 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "Em6RunAction.hh"
-#include "Em6RunMessenger.hh"
-
-#include "G4Run.hh"
-#include "G4UImanager.hh"
-#include "G4VVisManager.hh"
-#include "G4ios.hh"
-#include <iomanip.h>
-
-#include "CLHEP/Hist/HBookFile.h"
-#include <assert.h>
-
-#include "G4hEnergyLoss.hh"
-#include "G4EnergyLossTables.hh"
-#include "G4hLowEnergyIonisation.hh"
-#include "G4ionLowEnergyIonisation.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6RunAction::Em6RunAction()
-  :histName("histfile"),nbinStep(0.),nbinEn(0.),nbinTt(0.),nbinTb(0.),
-   nbinTsec(0.),nbinTh(0.),nbinThback(0.),nbinR(0.),nbinGamma(0.),
-   nbinvertexz(0.),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
-   histo6(0),histo7(0),histo8(0),histo9(0),histo10(0),
-   theProton (G4Proton::Proton()),
-   theElectron ( G4Electron::Electron() ),
-   LowestEnergy(0.01*keV),
-   HighestEnergy(100.*TeV),
-   TotBin(200)
-{
-  runMessenger = new Em6RunMessenger(this);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6RunAction::~Em6RunAction()
-{
-  delete runMessenger;
-  if(histo1) delete histo1 ;
-  if(histo2) delete histo2 ;
-  if(histo3) delete histo3 ;
-  if(histo4) delete histo4 ;
-  if(histo5) delete histo5 ;
-  if(histo6) delete histo6 ;
-  if(histo7) delete histo7 ;
-  if(histo8) delete histo8 ;
-  if(histo9) delete histo9 ;
-  if(histo10) delete histo10 ;
-  delete histo11 ;
-  delete histo12 ;
-  delete histo13 ;
-  delete histo14 ;
-  delete histo15 ;
-  delete histo21 ;
-  delete histo22 ;
-  delete histo23 ;
-  delete histo24 ;
-  delete histo25 ;
-  delete histo31 ;
-  delete histo32 ;
-  delete histo33 ;
-  delete histo34 ;
-  delete histo35 ;
-  delete histo41 ;
-  delete histo42 ;
-  delete histo43 ;
-  delete histo44 ;
-  delete histo45 ;
-  delete histo51 ;
-  delete histo52 ;
-  delete histo53 ;
-  delete histo54 ;
-  delete histo55 ;
-  delete hbookManager;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::bookHisto()
-{
-  // init hbook
-  hbookManager = new HBookFile(histName, 68);
-  assert (hbookManager != 0);
-
-  // book histograms
-  if(nbinStep>0)
-  {
-    histo1 = hbookManager->histogram("number of steps/event"
-                                   ,nbinStep,Steplow,Stephigh) ;
-    assert (histo1 != 0);
-  }
-  if(nbinEn>0)
-  {
-    histo2 = hbookManager->histogram("energy deposit in absorber(in MeV)"
-                                     ,nbinEn,Enlow,Enhigh) ;
-    assert (histo2 != 0);
-  }
-  if(nbinTh>0)
-  {
-    histo3 = hbookManager->histogram("angle distribution at exit(deg)"
-                                     ,nbinTh,Thlow/deg,Thhigh/deg) ;
-    assert (histo3 != 0);
-  }
-  if(nbinR>0)
-  {
-    histo4 = hbookManager->histogram("lateral distribution at exit(mm)"
-                                     ,nbinR ,Rlow,Rhigh)  ;
-    assert (histo4 != 0);
-  }
-  if(nbinTt>0)
-  {
-    histo5 = hbookManager->histogram("kinetic energy of the primary at exit(MeV)"
-                                     ,nbinTt,Ttlow,Tthigh)  ;
-    assert (histo5 != 0);
-  }
-  if(nbinThback>0)
-  {
-    histo6 = hbookManager->histogram("angle distribution of backscattered primaries(deg)"
-                                     ,nbinThback,Thlowback/deg,Thhighback/deg) ;
-    assert (histo6 != 0);
-  }
-  if(nbinTb>0)
-  {
-    histo7 = hbookManager->histogram("kinetic energy of the backscattered primaries (MeV)"
-                                     ,nbinTb,Tblow,Tbhigh)  ;
-    assert (histo7 != 0);
-  }
-  if(nbinTsec>0)
-  {
-    histo8 = hbookManager->histogram("kinetic energy of the charged secondaries (MeV)"
-                                     ,nbinTsec,Tseclow,Tsechigh)  ;
-    assert (histo8 != 0);
-  }
-  if(nbinvertexz>0)
-  {
-    histo9 = hbookManager->histogram("z of secondary charged vertices(mm)"
-                                     ,nbinvertexz ,zlow,zhigh)  ;
-    assert (histo9 != 0);
-  }
-  if(nbinGamma>0)
-  {
-    histo10= hbookManager->histogram("kinetic energy of gammas escaping the absorber (MeV)"
-                                //     ,nbinGamma,ElowGamma,EhighGamma)  ;
-                                ,nbinGamma,log10(ElowGamma),log10(EhighGamma))  ;
-    assert (histo10 != 0);
-  }
-
-  // Test on G4hLowEnergyIonisation
-  histo11 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) Z77p"
-                                                  ,92,0.5,92.5) ;
-  histo12 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) Z77 p"
-                                                  ,92,0.5,92.5) ;
-  histo13 = hbookManager->histogram("He4 effective charge in Carbon"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo14 = hbookManager->histogram("C12 ionisation in Al (MeV/(mg/cm^2)) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo15 = hbookManager->histogram("Ar40 ionisation in Al (MeV/(mg/cm^2)) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo21 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo22 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo23 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo24 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo25 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo31 = hbookManager->histogram("proton ionisation in Carbon (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo32 = hbookManager->histogram("proton ionisation in Si (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo33 = hbookManager->histogram("proton ionisation in Cu (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo34 = hbookManager->histogram("proton ionisation in CH4 (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo35 = hbookManager->histogram("He effective charge for Au(79)"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo41 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo42 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo43 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo44 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo45 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo51 = hbookManager->histogram("proton ionisation in Al (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo52 = hbookManager->histogram("proton ionisation in Fe (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo53 = hbookManager->histogram("proton ionisation in Pb (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo54 = hbookManager->histogram("proton ionisation in H2O (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo55 = hbookManager->histogram("proton ionisation in Graphite (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-
-  histo61 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo62 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo63 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo64 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo65 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-
-  histo71 = hbookManager->histogram("He 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo72 = hbookManager->histogram("He 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo73 = hbookManager->histogram("He 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo74 = hbookManager->histogram("He 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo75 = hbookManager->histogram("He 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo76 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo81 = hbookManager->histogram("He 40 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo82 = hbookManager->histogram("He 100 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo83 = hbookManager->histogram("He 400 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo84 = hbookManager->histogram("He 1 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo85 = hbookManager->histogram("He 4 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo86 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::BeginOfRunAction(const G4Run* aRun)
-{  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
-
-  G4UImanager* UI = G4UImanager::GetUIpointer();
-   
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-
-  if(pVVisManager)
-  {
-    UI->ApplyCommand("/vis/clear/view");
-    UI->ApplyCommand("/vis/draw/current");
-  }
-      
-  EnergySumAbs = 0. ;
-  EnergySquareSumAbs = 0.;
-  tlSumAbs = 0. ;
-  tlsquareSumAbs = 0. ;
-  nStepSumCharged = 0. ;
-  nStepSum2Charged= 0. ;
-  nStepSumNeutral = 0. ;
-  nStepSum2Neutral= 0. ;
-  TotNbofEvents = 0. ;
-  SumCharged=0.;
-  SumNeutral=0.;
-  Sum2Charged=0.;
-  Sum2Neutral=0.;
-  Selectron=0.;
-  Spositron=0.;
-
-  Transmitted=0.;
-  Reflected  =0.;
-//  plot definitions     --------------------------------
-  if(nbinStep>0)
-  {
-    dStep=(Stephigh-Steplow)/nbinStep;
-    entryStep=0.;
-    underStep=0.;
-    overStep=0.;
-    for(G4int ist=0; ist<nbinStep; ist++)
-    {
-      distStep[ist]=0.;
-    }
-  }      
-  if(nbinEn>0)
-  {
-    dEn = (Enhigh-Enlow)/nbinEn ;
-    entryEn=0.;
-    underEn=0.;
-    overEn=0.;
-    for (G4int ien=0; ien<nbinEn; ien++)
-    {
-      distEn[ien]=0.;
-    }
-  }
-
-  if(nbinTt>0)
-  {
-    dTt = (Tthigh-Ttlow)/nbinTt ;
-    entryTt=0.;
-    underTt=0.;
-    overTt=0.;
-    for (G4int itt=0; itt<nbinTt; itt++)
-    {
-      distTt[itt]=0.;
-    }
-    Ttmean=0.;
-    Tt2mean=0.;
-  }
-  if(nbinTb>0)
-  {
-    dTb = (Tbhigh-Tblow)/nbinTb ;
-    entryTb=0.;
-    underTb=0.;
-    overTb=0.;
-    for (G4int itt=0; itt<nbinTb; itt++)
-    {
-      distTb[itt]=0.;
-    }
-    Tbmean=0.;
-    Tb2mean=0.;
-  }
-  if(nbinTsec>0)
-  {
-    dTsec = (Tsechigh-Tseclow)/nbinTsec ;
-    entryTsec=0.;
-    underTsec=0.;
-    overTsec=0.;
-    for (G4int its=0; its<nbinTsec; its++)
-    {
-      distTsec[its]=0.;
-    }
-  }
-  if(nbinTh>0)
-  {
-    dTh = (Thhigh-Thlow)/nbinTh ;
-    entryTh=0.;
-    underTh=0.;
-    overTh=0.;
-    for (G4int ith=0; ith<nbinTh; ith++)
-    {
-      distTh[ith]=0.;
-    }
-  }
-
-  if(nbinThback>0)
-  {
-    dThback = (Thhighback-Thlowback)/nbinThback ;
-    entryThback=0.;
-    underThback=0.;
-    overThback=0.;
-    for (G4int ithback=0; ithback<nbinThback; ithback++)
-    {
-      distThback[ithback]=0.;
-    }
-  }
-
-
-  if(nbinR >0)
-  {
-    dR  = (Rhigh-Rlow)/nbinR  ;
-    entryR =0.;
-    underR =0.;
-    overR =0.;
-    for (G4int ir =0; ir <nbinR ; ir++)
-    {
-      distR[ir]=0.;
-    }
-    Rmean=0.;
-    R2mean=0.;
-  }
-
-  if(nbinGamma>0)
-  {
-    dEGamma = log(EhighGamma/ElowGamma)/nbinGamma ;
-    entryGamma = 0.;
-    underGamma=0.;
-    overGamma=0.;
-    for (G4int ig=0; ig<nbinGamma; ig++)
-    {
-      distGamma[ig]=0.;
-    }
-  } 
-  if(nbinvertexz>0)
-  {
-    dz=(zhigh-zlow)/nbinvertexz;
-    entryvertexz=0.;
-    undervertexz=0.;
-    oververtexz=0.;
-    for(G4int iz=0; iz<nbinvertexz; iz++)
-    {
-      distvertexz[iz]=0.;
-    }
-  }
-
-  bookHisto();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::EndOfRunAction(const G4Run* aRun)
-{
-  G4double sAbs,sigAbs,sigstep,sigcharged,signeutral;
-
-  tlSumAbs /= TotNbofEvents ;
-  sAbs = tlsquareSumAbs/TotNbofEvents-tlSumAbs*tlSumAbs ;
-  if(sAbs>0.)
-    sAbs = sqrt(sAbs/TotNbofEvents) ;
-  else
-    sAbs = 0. ;
-  
-  EnergySumAbs /= TotNbofEvents ;
-  sigAbs = EnergySquareSumAbs/TotNbofEvents-EnergySumAbs*EnergySumAbs;
-  if(sigAbs>0.)
-    sigAbs = sqrt(sigAbs/TotNbofEvents);
-  else
-    sigAbs = 0.;
-
-  nStepSumCharged /= TotNbofEvents ;
-  sigstep = nStepSum2Charged/TotNbofEvents-nStepSumCharged*nStepSumCharged;
-  if(sigstep>0.)
-    sigstep = sqrt(sigstep/TotNbofEvents);
-  else
-    sigstep = 0.;
-  G4double sigch=sigstep ;
-  
-  nStepSumNeutral /= TotNbofEvents ;
-  sigstep = nStepSum2Neutral/TotNbofEvents-nStepSumNeutral*nStepSumNeutral;
-  if(sigstep>0.)
-    sigstep = sqrt(sigstep/TotNbofEvents);
-  else
-    sigstep = 0.;
-  G4double signe=sigstep ;
-  
-  SumCharged /= TotNbofEvents;
-  sigcharged = Sum2Charged/TotNbofEvents-SumCharged*SumCharged; 
-  if(sigcharged>0.)
-    sigcharged = sqrt(sigcharged/TotNbofEvents);
-  else
-    sigcharged = 0. ;
- 
-  SumNeutral /= TotNbofEvents;
-  signeutral = Sum2Neutral/TotNbofEvents-SumNeutral*SumNeutral; 
-  if(signeutral>0.)
-    signeutral = sqrt(signeutral/TotNbofEvents);
-  else
-    signeutral = 0. ;
- 
-  Selectron /= TotNbofEvents ;
-  Spositron /= TotNbofEvents ;
-
-  Transmitted /=TotNbofEvents ;
-  Reflected   /=TotNbofEvents ;
- G4cout << " ================== run summary =====================" << endl;
- G4int prec = G4cout.precision(6);
-  G4cout << " end of Run TotNbofEvents = " <<  
-           TotNbofEvents << endl ;
-  G4cout << "    mean charged track length   in absorber=" <<
-           tlSumAbs/mm      << " +- " << sAbs/mm    <<
-          "  mm  " << endl; 
-  G4cout << endl;
-  G4cout << "            mean energy deposit in absorber=" <<
-           EnergySumAbs/MeV << " +- " << sigAbs/MeV <<
-          "  MeV " << endl ;
-  G4cout << endl ;
-  G4cout << " mean number of steps in absorber (charged) =" <<
-           nStepSumCharged         << " +- " << sigch     <<
-          "      " << endl ;
-  G4cout << " mean number of steps in absorber (neutral) =" <<
-           nStepSumNeutral         << " +- " << signe     <<
-          "      " << endl ;
-  G4cout << endl ;
-  G4cout << "   mean number of charged secondaries = " <<
-           SumCharged << " +- " << sigcharged << endl;  
-  G4cout << endl ;
-  G4cout << "   mean number of neutral secondaries = " <<
-           SumNeutral << " +- " << signeutral << endl;  
-  G4cout << endl ;
-  
-  G4cout << "   mean number of e-s =" << Selectron << 
-            "  and e+s =" << Spositron << endl;
-  G4cout << endl; 
-  
-  G4cout << "(number) transmission coeff=" << Transmitted <<
-            "  reflection coeff=" << Reflected << endl;
-  G4cout << endl; 
-
-  if(nbinStep>0)
-  {G4double E , dnorm, norm ;
-   G4cout << "   step number/event distribution " << endl ;
-   G4cout << "#entries=" << entryStep << "    #underflows=" << underStep <<
-             "    #overflows=" << overStep << endl ;
-   if( entryStep>0.)
-   {
-     E = Steplow - dStep ;
-     norm = TotNbofEvents ;
-     G4cout << " bin nb   nsteplow     entries     normalized " << endl ;
-     for(G4int iss=0; iss<nbinStep; iss++)
-     {
-      E += dStep ;
-      dnorm = distStep[iss]/norm;
-      G4cout << setw(5) << iss << setw(10) << E << 
-                setw(12) << distStep[iss] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinEn>0)
-  {G4double E , dnorm, norm,fmax,Emp,width ;
-   Emp=-999.999 ;
-   G4cout << " energy deposit distribution " << endl ;
-   G4cout << "#entries=" << entryEn << "    #underflows=" << underEn <<
-             "    #overflows=" << overEn << endl ;
-   if( entryEn>0.)
-   {
-     E = Enlow - dEn ;
-     norm = TotNbofEvents*dEn ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     fmax = 0. ;
-     for(G4int ien=0; ien<nbinEn; ien++)
-     {
-      E += dEn ;
-      if(distEn[ien]>fmax)
-      {
-        fmax=distEn[ien];
-        Emp = E ;
-      }
-      dnorm = distEn[ien]/norm;
-      G4cout << setw(5) << ien << setw(10) << E << 
-                setw(12) << distEn[ien] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-     G4int ii ;
-     G4double E1,E2 ;
-     E1=-1.e6 ;
-     E2=+1.e6 ;
-     E = Enlow -dEn ;
-     ii = -1;
-     for(G4int i1=0; i1<nbinEn; i1++)
-     {
-      E += dEn ;
-     if(ii<0)
-     {
-      if(distEn[i1] >= 0.5*fmax)
-      {
-        E1=E ;
-        ii=i1 ;
-      }
-     }
-     }
-     E = Enlow -dEn ;
-     for(G4int i2=0; i2<nbinEn; i2++)
-     {
-      E += dEn ;
-      if(distEn[i2] >= 0.5*fmax)
-        E2=E ;
-     }
-     G4cout << " Emp = " << setw(15) << Emp/MeV << "   width="
-            << setw(15) << (E2-E1)/MeV <<   "  MeV " << endl;
-     G4cout << endl ;
-   }     
-  }
-  if(nbinTt>0)
-  {G4double E , dnorm, norm ,sig;
-   G4cout << " transmitted energy distribution " << endl ;
-   G4cout << "#entries=" << entryTt << "    #underflows=" << underTt <<
-             "    #overflows=" << overTt << endl ;
-   if( entryTt>0.)
-   {
-     Ttmean /= entryTt;
-     sig=Tt2mean/entryTt-Ttmean*Ttmean ;
-     if(sig<=0.)
-       sig=0.;
-     else
-       sig=sqrt(sig/entryTt) ;
-     G4cout << " mean energy of transmitted particles=" << Ttmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
-     E = Ttlow - dTt ;
-     norm = TotNbofEvents*dTt ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTt; itt++)
-     {
-      E += dTt ;
-      dnorm = distTt[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTt[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinTb>0)
-  {G4double E , dnorm, norm ,sig;
-   G4cout << " backscattered energy distribution " << endl ;
-   G4cout << "#entries=" << entryTb << "    #underflows=" << underTb <<
-             "    #overflows=" << overTb << endl ;
-   if( entryTb>0.)
-   {
-     Tbmean /= entryTb;
-     sig=Tb2mean/entryTb-Tbmean*Tbmean ;
-     if(sig<=0.)
-       sig=0.;
-     else
-       sig=sqrt(sig/entryTb) ;
-     G4cout << " mean energy of backscattered particles=" << Tbmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
-     E = Tblow - dTb ;
-     norm = TotNbofEvents*dTb ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTb; itt++)
-     {
-      E += dTb ;
-      dnorm = distTb[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTb[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinTsec>0)
-  {G4double E , dnorm, norm ;
-   G4cout << " energy distribution of charged secondaries " << endl ;
-   G4cout << "#entries=" << entryTsec << "    #underflows=" << underTsec <<
-             "    #overflows=" << overTsec << endl ;
-   if( entryTsec>0.)
-   {
-     E = Tseclow - dTsec ;
-     norm = TotNbofEvents*dTsec ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTsec; itt++)
-     {
-      E += dTsec ;
-      dnorm = distTsec[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTsec[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-
-  if(nbinR >0)
-  {G4double R , dnorm, norm,sig  ;
-   G4cout << "  R  distribution " << endl ;
-   G4cout << "#entries=" << entryR  << "    #underflows=" << underR  <<
-             "    #overflows=" << overR  << endl ;
-   if( entryR >0.)
-   {
-     Rmean /= entryR;
-     sig = R2mean/entryR - Rmean*Rmean;
-     if(sig<=0.) sig=0. ;
-     else        sig = sqrt(sig/entryR) ;
-     G4cout << " mean lateral displacement at exit=" << Rmean/mm << " +- "
-            << sig/mm << "  mm." << endl ; 
-     R = Rlow - dR  ;
-     norm = TotNbofEvents*dR  ;
-     G4cout << " bin nb      Rlow      entries     normalized " << endl ;
-     for(G4int ier=0; ier<nbinR ; ier++)
-     {
-      R+= dR  ;
-      dnorm = distR[ier]/norm;
-      G4cout << setw(5) << ier << setw(10) << R  <<
-                setw(12) << distR[ier] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }
-  }
-
-  if(nbinTh>0)
-  {G4double Th,Thdeg, dnorm, norm,fac0,fnorm,pere,Thpere,Thmean,sum;
-   G4cout << "      angle   distribution " << endl ;
-   G4cout << "#entries=" << entryTh << "    #underflows=" << underTh <<
-             "    #overflows=" << overTh << endl ;
-   if( entryTh>0.)
-   {
-     Th= Thlow - dTh ;
-     norm = TotNbofEvents ;
-     if(distTh[0] == 0.)
-       fac0 = 1. ;
-     else
-       fac0 = 1./distTh[0] ;
-     pere = 1./exp(1.) ;
-
-     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
-     Thpere = 0. ;
-     sum = 0. ;
-     Thmean = 0. ;
-     for(G4int ien=0; ien<nbinTh; ien++)
-     {
-      Th+= dTh ;
-      Thdeg = Th*180./pi ;
-      sum += distTh[ien] ;
-      Thmean += distTh[ien]*(Th+0.5*dTh) ;
-      dnorm = distTh[ien]/norm;
-      fnorm = fac0*distTh[ien] ;
-      if( fnorm > pere)
-        Thpere = Th ; 
-      G4cout << setw(5) << ien << setw(10) << Thdeg << "   " <<
-                setw(10) << Th << "  " <<   
-                setw(12) << distTh[ien] << "  " <<
-                setw(12) << dnorm << "  " << setw(12) << fnorm <<endl ;
-     }
-     Thmean /= sum ;
-     G4cout << endl;
-     G4cout << " mean = " << Thmean << "  rad  or " << 180.*Thmean/pi <<
-               " deg." << endl;
-     G4cout << " theta(1/e)=" << Thpere << " - " << Thpere+dTh << " rad   "
-            << " or " << 180.*Thpere/pi << " - " << 180.*(Thpere+dTh)/pi 
-            << " deg." << endl;
-     G4cout << endl;
-   }
-  }
-
-  if(nbinThback>0)
-  {G4double Thb,Thdegb, dnormb, normb,fac0b,fnormb,pereb,Thpereb,Thmeanb,sumb;
-   G4cout << " backscattering angle   distribution " << endl ;
-   G4cout << "#entries=" << entryThback << "    #underflows=" << underThback <<
-             "    #overflows=" << overThback << endl ;
-   if( entryThback>0.)
-   {
-     Thb= Thlowback - dThback ;
-     normb = TotNbofEvents ;
-     if(distThback[0] == 0.)
-       fac0b = 1. ;
-     else
-       fac0b = 1./distThback[0] ;
-     pereb = 1./exp(1.) ;
-
-     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
-     Thpereb = 0. ;
-     sumb = 0. ;
-     Thmeanb = 0. ;
-     for(G4int ien=0; ien<nbinThback; ien++)
-     {
-      Thb+= dThback ;
-      Thdegb = Thb*180./pi ;
-      sumb += distThback[ien] ;
-      Thmeanb += distThback[ien]*(Thb+0.5*dThback) ;
-      dnormb = distThback[ien]/normb;
-      fnormb = fac0b*distThback[ien] ;
-      if( fnormb > pereb)
-        Thpereb = Thb ;
-      G4cout << setw(5) << ien << setw(10) << Thdegb << "   " <<
-                setw(10) << Thb << "  " <<
-                setw(12) << distThback[ien] << "  " <<
-                setw(12) << dnormb << "  " << setw(12) << fnormb <<endl ;
-     }
-     Thmeanb /= sumb ;
-     G4cout << endl;
-     G4cout << " mean = " << Thmeanb << "  rad  or " << 180.*Thmeanb/pi <<
-               " deg." << endl;
-     G4cout << " theta(1/e)=" << Thpereb << " - " << Thpereb+dThback << " rad   "
-            << " or " << 180.*Thpereb/pi << " - " << 180.*(Thpereb+dThback)/pi
-            << " deg." << endl;
-     G4cout << endl;
-   }
-  }
-
-  if(nbinGamma>0)
-  {G4double E , fact,dnorm, norm  ;
-   G4cout << " gamma energy distribution " << endl ;
-   G4cout << "#entries=" << entryGamma << "    #underflows=" << underGamma <<
-             "    #overflows=" << overGamma << endl ;
-   if( entryGamma>0.)
-   {
-     fact=exp(dEGamma) ;
-     E = ElowGamma/fact  ;
-     norm = TotNbofEvents*dEGamma;
-     G4cout << " bin nb         Elow      entries       normalized " << endl ;
-     for(G4int itt=0; itt<nbinGamma; itt++)
-     {
-      E *= fact ;
-      dnorm = distGamma[itt]/norm;
-      G4cout << setw(5) << itt << setw(13) << E << 
-                setw(12) << distGamma[itt] <<
-                setw(15) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-
-  if(nbinvertexz >0)
-  {G4double z , dnorm, norm  ;
-   G4cout << " vertex Z  distribution " << endl ;
-   G4cout << "#entries=" << entryvertexz  << "    #underflows=" << undervertexz  <<
-             "    #overflows=" << oververtexz  << endl ;
-   if( entryvertexz >0.)
-   {
-     z =zlow - dz  ;
-     norm = TotNbofEvents*dz  ;
-     G4cout << " bin nb      zlow      entries     normalized " << endl ;
-     for(G4int iez=0; iez<nbinvertexz ; iez++)
-     {
-      z+= dz  ;
-      if(abs(z)<1.e-12) z=0.;
-      dnorm = distvertexz[iez]/norm;
-      G4cout << setw(5) << iez << setw(10) << z  <<
-                setw(12) << distvertexz[iez] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }
-  }
-  
- G4cout.precision(prec);
-  
-  if (G4VVisManager::GetConcreteInstance())
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
-    
-   // Write histogram file
-   FillLowEnergyTest() ;
-   hbookManager->write();
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::CountEvent()
-{
-  TotNbofEvents += 1. ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddnStepsCharged(G4double ns)
-{
-  nStepSumCharged += ns;
-  nStepSum2Charged += ns*ns;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddnStepsNeutral(G4double ns)
-{
-  nStepSumNeutral += ns;
-  nStepSum2Neutral += ns*ns;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddEdeps(G4double Eabs)
-{
-  EnergySumAbs += Eabs;
-  EnergySquareSumAbs += Eabs*Eabs;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddTrackLength(G4double tlabs)
-{
-  tlSumAbs += tlabs;
-  tlsquareSumAbs += tlabs*tlabs ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddTrRef(G4double tr,G4double ref)
-{
-  Transmitted += tr ;
-  Reflected   += ref;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillNbOfSteps(G4double ns)
-{
-  const G4double eps = 1.e-10 ;
-  G4double n,bin ;
-  G4int ibin;
- 
-  if(histo1)
-  {
-    entryStep += 1. ;
- 
-    if(ns<Steplow)
-      underStep += 1. ;
-    else if(ns>=Stephigh)
-      overStep  += 1. ;
-    else
-    {
-      n = ns+eps ;
-      bin = (n-Steplow)/dStep ;
-      ibin= bin ;
-      distStep[ibin] += 1. ;
-    }
-   histo1->accumulate(ns) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillEn(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo2)
-  {
-    entryEn += 1. ;
- 
-    if(En<Enlow)
-      underEn += 1. ;
-    else if(En>=Enhigh)
-      overEn  += 1. ;
-    else
-    {
-      bin = (En-Enlow)/dEn ;
-      ibin= bin ;
-      distEn[ibin] += 1. ;
-    }
-  histo2->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTt(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo5)
-  {
-    entryTt += 1. ;
-    Ttmean += En ;
-    Tt2mean += En*En ;
-
-    if(En<Ttlow)
-      underTt += 1. ;
-    else if(En>=Tthigh)
-      overTt  += 1. ;
-    else
-    {
-      bin = (En-Ttlow)/dTt ;
-      ibin= bin ;
-      distTt[ibin] += 1. ;
-    }
-  histo5->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTb(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-  
-  if(histo7)
-  {
-    entryTb += 1. ;
-    Tbmean += En ;
-    Tb2mean += En*En ;
-
-    if(En<Tblow)
-      underTb += 1. ;
-    else if(En>=Tbhigh)
-      overTb  += 1. ;
-    else
-    {
-      bin = (En-Tblow)/dTb ;
-      ibin= bin ;
-      distTb[ibin] += 1. ;
-    }
-  histo7->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTsec(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo8)
-  {
-    entryTsec += 1. ;
-
-    if(En<Tseclow)
-      underTsec += 1. ;
-    else if(En>=Tsechigh)
-      overTsec  += 1. ;
-    else
-    {
-      bin = (En-Tseclow)/dTsec ;
-      ibin= bin ;
-      distTsec[ibin] += 1. ;
-    }
-  histo8->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillGammaSpectrum(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo10)
-  {
-    entryGamma += 1. ;
-
-    if(En<ElowGamma)
-      underGamma += 1. ;
-    else if(En>=EhighGamma)
-      overGamma  += 1. ;
-    else
-    {
-      bin = log(En/ElowGamma)/dEGamma;
-      ibin= bin ;
-      distGamma[ibin] += 1. ;
-    }
-  histo10->accumulate(log10(En/MeV)) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTh(G4double Th)
-{
-  static const G4double cn=pi/(64800.*dTh) ;
-  static const G4double cs=pi/
-        (64800.*(cos(Thlow)-cos(Thlow+dTh)));      
-  G4double bin,Thbin ,wg;
-  G4int ibin;
-
-  if(histo3)
-  {
-    entryTh += 1. ;
-
-    wg = 0.;
-
-    if(Th<Thlow)
-      underTh += 1. ;
-    else if(Th>=Thhigh)
-      overTh  += 1. ;
-    else
-    {
-      bin = (Th-Thlow)/dTh ;
-      ibin= bin ;
-      Thbin = Thlow+ibin*dTh ;
-      if(Th > 0.001*dTh)
-        wg=cn/sin(Th) ;
-      else
-      {  
-        G4double thdeg=Th*180./pi;
-        G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
-        wg=0. ; 
-      }
-      distTh[ibin] += wg  ;
-    }
-
-  histo3->accumulate(Th/deg, wg) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillThBack(G4double Th)
-{
-  static const G4double cn=pi/(64800.*dThback) ;
-  static const G4double cs=pi/
-        (64800.*(cos(Thlowback)-cos(Thlowback+dThback)));      
-  G4double bin,Thbin,wg ;
-  G4int ibin;
-
-  if(histo6)
-  {
-    entryThback += 1. ;
-
-    if(Th<Thlowback)
-      underThback += 1. ;
-    else if(Th>=Thhighback)
-      overThback  += 1. ;
-    else
-    {
-      bin = (Th-Thlowback)/dThback ;
-      ibin= bin ;
-      Thbin = Thlowback+ibin*dThback ;
-      if(Th > 0.001*dThback)
-        wg=cn/sin(Th) ;
-      else
-      {  
-        G4double thdeg=Th*180./pi;
-        G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
-        wg=0. ; 
-      }
-      distThback[ibin] += wg  ;
-    }
-  histo6->accumulate(Th/deg, wg) ;
-  }
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillR(G4double R )
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo4)
-  {
-    entryR  += 1. ;
-    Rmean += R ;
-    R2mean += R*R ;
-
-    if(R <Rlow)
-      underR  += 1. ;
-    else if(R >=Rhigh)
-      overR   += 1. ;
-    else
-    {
-      bin = (R -Rlow)/dR  ;
-      ibin= bin ;
-      distR[ibin] += 1. ;
-    }
-  histo4->accumulate(R/mm) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::Fillvertexz(G4double z )
-{
-  G4double bin ;
-  G4int ibin;
-  
-  if(histo9)
-  {
-    entryvertexz  += 1. ;
-
-    if(z <zlow)
-      undervertexz  += 1. ;
-    else if(z >=zhigh)
-      oververtexz   += 1. ;
-    else
-    {
-      bin = (z -zlow)/dz  ;
-      ibin= bin ;
-      distvertexz[ibin] += 1. ;
-    }
-  histo9->accumulate(z/mm) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::SethistName(G4String name)
-{
-  histName = name ;
-  G4cout << " hist file = " << histName << endl;
-}
-
-void Em6RunAction::SetnbinStep(G4int nbin)
-{
-  nbinStep = nbin ;
-  if(nbinStep>0)
-  G4cout << " Nb of bins in #step plot = " << nbinStep << endl ;
-}
-void Em6RunAction::SetSteplow(G4double low)
-{
-  Steplow = low ;
-  if(nbinStep>0)
-  G4cout << " low  in the #step plot = " << Steplow << endl ;
-}
-void Em6RunAction::SetStephigh(G4double high)
-{
-  Stephigh = high ;
-  if(nbinStep>0)
-  G4cout << " high in the #step plot = " << Stephigh << endl ;
-}
-void Em6RunAction::SetnbinEn(G4int nbin)
-{
-  nbinEn = nbin ;
-  if(nbinEn>0)
-  G4cout << " Nb of bins in Edep plot = " << nbinEn << endl ;
-}
-void Em6RunAction::SetEnlow(G4double Elow)
-{
-  Enlow = Elow ;
-  if(nbinEn>0)
-  G4cout << " Elow  in the  Edep plot = " << Enlow << endl ;
-}
-void Em6RunAction::SetEnhigh(G4double Ehigh)
-{
-  Enhigh = Ehigh ;
-  if(nbinEn>0)
-  G4cout << " Ehigh in the  Edep plot = " << Enhigh << endl ;
-}
-
-void Em6RunAction::SetnbinGamma(G4int nbin)
-{
-  nbinGamma = nbin ;
-  if(nbinGamma>0)
-  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << endl ;
-}
-void Em6RunAction::SetElowGamma(G4double Elow)
-{
-  ElowGamma = Elow ;
-  if(nbinGamma>0)
-  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << endl ;
-}
-void Em6RunAction::SetEhighGamma(G4double Ehigh)
-{
-  EhighGamma = Ehigh ;
-  if(nbinGamma>0)
-  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << endl ;
-}
-
-void Em6RunAction::SetnbinTt(G4int nbin)
-{
-  nbinTt = nbin ;
-  if(nbinTt>0)
-  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << endl ;
-}
-void Em6RunAction::SetTtlow(G4double Elow)
-{
-  Ttlow = Elow ;
-  if(nbinTt>0)
-  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << endl ;
-}
-void Em6RunAction::SetTthigh(G4double Ehigh)
-{
-  Tthigh = Ehigh ;
-  if(nbinTt>0)
-  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << endl ;
-}
-void Em6RunAction::SetnbinTb(G4int nbin)
-{
-  nbinTb = nbin ;
-  if(nbinTb>0)
-  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << endl ;
-}
-void Em6RunAction::SetTblow(G4double Elow)
-{
-  Tblow = Elow ;
-  if(nbinTb>0)
-  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << endl ;
-}
-void Em6RunAction::SetTbhigh(G4double Ehigh)
-{
-  Tbhigh = Ehigh ;
-  if(nbinTb>0)
-  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << endl ;
-}
-
-void Em6RunAction::SetnbinTsec(G4int nbin)
-{
-  nbinTsec = nbin ;
-  if(nbinTsec>0)
-  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << endl ;
-}
-void Em6RunAction::SetTseclow(G4double Elow)
-{
-  Tseclow = Elow ;
-  if(nbinTsec>0)
-  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << endl ;
-}
-void Em6RunAction::SetTsechigh(G4double Ehigh)
-{
-  Tsechigh = Ehigh ;
-  if(nbinTsec>0)
-  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << endl ;
-}
- 
-void Em6RunAction::SetnbinR(G4int nbin)
-{
-  nbinR  = nbin ;
-  if(nbinR>0)
-  G4cout << " Nb of bins in R plot = " << nbinR << endl ;
-}
-void Em6RunAction::SetRlow(G4double rlow)
-{
-  Rlow = rlow ;
-  if(nbinR>0)
-  G4cout << " Rlow  in the  R plot = " << Rlow << endl ;
-}
-void Em6RunAction::SetRhigh(G4double rhigh)
-{
-  Rhigh = rhigh ;
-  if(nbinR>0)
-  G4cout << " Rhigh in the R plot = " << Rhigh << endl ;
-}
-
-void Em6RunAction::Setnbinzvertex(G4int nbin)
-{
-  nbinvertexz  = nbin ;
-  if(nbinvertexz>0)
-  G4cout << " Nb of bins in Z plot = " << nbinvertexz << endl ;
-}
-void Em6RunAction::Setzlow(G4double z)
-{
-  zlow = z ;
-  if(nbinvertexz>0)
-  G4cout << " zlow  in the  Z plot = " << zlow << endl ;
-}
-void Em6RunAction::Setzhigh(G4double z)
-{
-  zhigh = z ;
-  if(nbinvertexz>0)
-  G4cout << " zhigh in the Z plot = " << zhigh << endl ;
-}
-
-void Em6RunAction::SetnbinTh(G4int nbin)
-{
-  nbinTh = nbin ;
-  if(nbinTh>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinTh << endl ;
-}
-void Em6RunAction::SetThlow(G4double Tlow)
-{
-  Thlow = Tlow ;
-  if(nbinTh>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlow << endl ;
-}
-void Em6RunAction::SetThhigh(G4double Thigh)
-{
-  Thhigh = Thigh ;
-  if(nbinTh>0)
-  G4cout << " Thigh in the Theta plot = " << Thhigh << endl ;
-}
-
-void Em6RunAction::SetnbinThBack(G4int nbin)
-{
-  nbinThback = nbin ;
-  if(nbinThback>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinThback << endl ;
-}
-void Em6RunAction::SetThlowBack(G4double Tlow)
-{
-  Thlowback = Tlow ;
-  if(nbinThback>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlowback << endl ;
-}
-void Em6RunAction::SetThhighBack(G4double Thigh)
-{
-  Thhighback = Thigh ;
-  if(nbinThback>0)
-  G4cout << " Thigh in the Theta plot = " << Thhighback << endl ;
-}
-void Em6RunAction::CountParticles(G4double nch,G4double nne)
-{
-  SumCharged += nch ;
-  SumNeutral += nne ;
-  Sum2Charged += nch*nch ;
-  Sum2Neutral += nne*nne ;
-}
-void Em6RunAction::AddEP(G4double nele,G4double npos) 
-{
-  Selectron += nele;
-  Spositron += npos;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillLowEnergyTest( )
-{
-  G4int J ;
-  G4double* DeltaCutInKineticEnergy = theElectron->GetCutsInEnergy() ;
-  G4hLowEnergyIonisation* hLEIon = new G4hLowEnergyIonisation() ;
-  G4ParticleDefinition* theH = G4Proton::Proton() ;
-
-  //G4double fac = 4.026/1.0073 ;
-  //G4double cac = 1.0 ;
-  //  theProton = G4Proton::Proton() ;
-    G4double fac = 1.0 ;
-    G4double cac = 2.0 ;
-  theProton = G4Alpha::Alpha() ;
-  G4ionLowEnergyIonisation* ionLEIon = new G4ionLowEnergyIonisation() ;
-  ionLEIon->SetIonDefinition(theProton) ;
-
-  G4ionLowEnergyIonisation* ionLEIonC = new G4ionLowEnergyIonisation() ;
-  G4ParticleDefinition* theC12 = G4IonC12::IonC12() ;
-  ionLEIonC->SetIonDefinition(theC12) ;
-  G4double chc = 6.0 ;
-
-  G4ionLowEnergyIonisation* ionLEIonAr = new G4ionLowEnergyIonisation() ;
-  G4ParticleDefinition* theAr40 = G4IonAr40::IonAr40() ;
-  ionLEIonAr->SetIonDefinition(theAr40) ;
-  G4double cha = 18.0 ;
-
-
-  //  G4ionLowEnergyIonisation* ionLEIonFe = new G4ionLowEnergyIonisation() ;
-  //  G4ParticleDefinition* theFe56 = G4IonFe56::IonFe56() ;
-  //  ionLEIonFe->SetIonDefinition(theFe56) ;
-  //  G4double chf = 26.0 ;
-
-  G4double mrC12 = (theC12->GetPDGMass()) / (theH->GetPDGMass()) ; 
-  G4double mrAr40 = (theAr40->GetPDGMass()) / (theH->GetPDGMass()) ; 
-
-  G4double de ;
-
-  // Ziegler1977p
-  G4double tau = 40*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo21->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo22->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo23->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo24->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo25->accumulate(double(J),de) ;
-  }
-
-  // Ziegler1977He
-  tau = 40*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo61->accumulate(double(J),de) ;
-  }
-  tau = 100*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo62->accumulate(double(J),de) ;
-  }
-  tau = 400*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo63->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo64->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo65->accumulate(double(J),de) ;
-  }
-
-  // ICRU_49p
-  tau = 40*keV ;
- 
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo41->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo42->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo43->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo44->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV ;
-   for ( J=1; J<93; J++)
-  { 
-   de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-   histo45->accumulate(double(J),de) ;
-  }
- 
-  for ( J=1; J<93; J++)
-  { 
-    static G4double S40[92] = {
-    6.22, 6.55, 7.61, 10.4, 12.9, 13.9, 15.9, 14.6, 11.7, 11.1,
-    14.2, 20.6, 20.7,  22.3, 18.1, 19.3, 27.5, 30.5, 27.9, 29.8,
-    28.3, 26.7, 25.1,  22.5, 19.8, 20.1, 18.0, 20.1, 20.4, 23.4,
-    27.5, 29.0, 29.3,  31.0, 31.1, 34.8, 31.5, 35.0, 35.5, 37.3,
-    38.3, 35.9, 38.0,  34.4, 33.4, 29.8, 30.9, 32.7, 34.9, 36.0,
-    40.9, 39.1, 43.1,  45.8, 40.8, 44.1, 44.9, 42.0, 41.0, 40.0,
-    39.0, 38.0, 37.1,  38.2, 35.3, 31.5, 29.9, 29.1, 28.3, 27.5, 
-    28.1, 28.9, 27.3,  26.3, 29.9, 29.1, 28.4, 25.8, 28.0, 24.9,
-    27.3, 30.7, 34.3,  35.4, 35.6, 35.5, 39.8, 42.9, 43.7, 44.1,
-    42.4, 41.8} ;
-    histo11->accumulate(double(J),S40[J-1]) ;
-  }
-
-  //============================ He ions ===========
-  // Ziegler1977He
-  tau = 40*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo71->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo81->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo72->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo82->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo73->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo83->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo74->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo84->accumulate(double(J),de) ;
-  }
-  tau = 4*MeV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo75->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo85->accumulate(double(J),de) ;
-  }
-  tau = 10*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo76->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo86->accumulate(double(J),de) ;
-  }
- 
-  for ( J=1; J<93; J++)
-  { 
-    static G4double Q40[92] = {
-    11.8, 16.7, 21.9,  24.1, 34.7, 36.1, 45.5, 46.1, 45.8, 44.9,
-    46.9, 51.7, 54.9,  63.2, 63.8, 67.4, 79.8, 80.8, 78.0, 83.2,
-    85.4, 84.2, 90.6,  85.7, 84.1, 86.4, 82.0, 77.7, 74.4, 75.1,
-    75.6, 80.7, 84.9,  87.0, 88.6, 103.0, 103.0, 113.0, 116.0, 123.0,
-    120.0, 115.0, 118.0, 115.0, 113.0, 112.0, 111.0, 110.0, 116.0, 117.0,
-    119.0, 123.0, 122.0, 139.0, 138.0, 143.0, 152.0, 141.0, 139.0, 137.0,
-    135.0, 134.0, 130.0, 137.0, 129.0, 128.0, 124.0, 125.0, 120.0, 118.0, 
-    119.0, 120.0, 121.0, 122.0, 125.0, 127.0, 128.0, 120.0, 125.0, 128.0,
-    136.0, 138.0, 144.0, 148.0, 151.0, 162.0, 166.0, 177.0, 179.0, 183.0, 
-    177.0, 176.0 } ;   
-    histo12->accumulate(double(J),Q40[J-1]) ;
-  }
-  //============================ He ions ===========
-
-
-  //  find out materials table
-  static const G4MaterialTable* theMaterialTable=
-                                   G4Material::GetMaterialTable();
-
-  G4int numOfMaterials = theMaterialTable->length();
-  G4double dedx ;
-    // create physics vector and fill it
-
-  G4PhysicsLogVector* aVector = new G4PhysicsLogVector(
-               LowestEnergy, HighestEnergy, TotBin);
-
-
-  //  loop for materials - the parametrisation is defined in the G4PhysicsList
-
-  for ( J=0; J<numOfMaterials; J++)
-  {
-    G4Material* material = (*theMaterialTable)[J];
-    if ("Carbon" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5*(aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	//	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-	G4double cf = ionLEIon->GetHeEffChargeSquare(6, tau) / (cac*cac);
-        histo31->accumulate(log10(tau),dedx*cf) ;
-        histo13->accumulate(log10(tau),cf*cac*cac) ;
-      }
-    } else if ("Silicon" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo32->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Copper" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo33->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("CH_4" == material->GetChemicalFormula()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-	tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo34->accumulate(log10(tau),dedx*cf) ;
-	cf = hLEIon->GetHeEffChargeSquare(79, tau*4.026/1.0073) ;
-        histo35->accumulate(log10(tau),cf) ;
-      }
-    } else if ("Aluminum" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo51->accumulate(log10(tau),dedx*cf) ;
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theC12,tau*mrC12,material) ;
-	cf = ionLEIonC->GetIonEffChargeSquare(material, tau*mrC12, chc) / (chc*chc);
-        histo14->accumulate(log10(tau), dedx*cf / 270.0  ) ;
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theAr40,tau*mrAr40,material) ;
-	cf = ionLEIonAr->GetIonEffChargeSquare(material, tau*mrAr40, cha) / (cha*cha);
-        histo15->accumulate(log10(tau), dedx*cf / 270.0  ) ;
-      }
-    } else if ("Iron" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo52->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Lead" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	//	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-	G4double cf = hLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo53->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Water" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac) ;
-	//        G4cout << "Energy = " << tau << " MeV; dedx = " << dedx << endl;
-        histo54->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Graphite" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-	{
-	  tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-	  dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac) ;
-	  histo55->accumulate(log10(tau),dedx*cf) ;
-	}
-    }
-  } 
-    delete hLEIon ;
-    delete ionLEIon ;
-    delete ionLEIonC ;
-    delete ionLEIonAr ;
-    //    delete ionLEIonFe ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.protons b/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.protons
deleted file mode 100644
index 0131d8ec85..0000000000
--- a/examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.protons
+++ /dev/null
@@ -1,1748 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "Em6RunAction.hh"
-#include "Em6RunMessenger.hh"
-
-#include "G4Run.hh"
-#include "G4UImanager.hh"
-#include "G4VVisManager.hh"
-#include "G4ios.hh"
-#include <iomanip.h>
-
-#include "CLHEP/Hist/HBookFile.h"
-#include <assert.h>
-
-#include "G4hEnergyLoss.hh"
-#include "G4EnergyLossTables.hh"
-#include "G4hLowEnergyIonisation.hh"
-#include "G4ionLowEnergyIonisation.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6RunAction::Em6RunAction()
-  :histName("histfile"),nbinStep(0.),nbinEn(0.),nbinTt(0.),nbinTb(0.),
-   nbinTsec(0.),nbinTh(0.),nbinThback(0.),nbinR(0.),nbinGamma(0.),
-   nbinvertexz(0.),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
-   histo6(0),histo7(0),histo8(0),histo9(0),histo10(0),
-   theProton (G4Proton::Proton()),
-   theElectron ( G4Electron::Electron() ),
-   LowestEnergy(0.01*keV),
-   HighestEnergy(100.*TeV),
-   TotBin(200)
-{
-  runMessenger = new Em6RunMessenger(this);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em6RunAction::~Em6RunAction()
-{
-  delete runMessenger;
-  if(histo1) delete histo1 ;
-  if(histo2) delete histo2 ;
-  if(histo3) delete histo3 ;
-  if(histo4) delete histo4 ;
-  if(histo5) delete histo5 ;
-  if(histo6) delete histo6 ;
-  if(histo7) delete histo7 ;
-  if(histo8) delete histo8 ;
-  if(histo9) delete histo9 ;
-  if(histo10) delete histo10 ;
-  delete histo11 ;
-  delete histo12 ;
-  delete histo13 ;
-  delete histo14 ;
-  delete histo15 ;
-  delete histo21 ;
-  delete histo22 ;
-  delete histo23 ;
-  delete histo24 ;
-  delete histo25 ;
-  delete histo31 ;
-  delete histo32 ;
-  delete histo33 ;
-  delete histo34 ;
-  delete histo35 ;
-  delete histo41 ;
-  delete histo42 ;
-  delete histo43 ;
-  delete histo44 ;
-  delete histo45 ;
-  delete histo51 ;
-  delete histo52 ;
-  delete histo53 ;
-  delete histo54 ;
-  delete histo55 ;
-  delete histo61 ;
-  delete histo62 ;
-  delete histo63 ;
-  delete histo64 ;
-  delete histo65 ;
-  delete histo71 ;
-  delete histo72 ;
-  delete histo73 ;
-  delete histo74 ;
-  delete histo75 ;
-  delete histo76 ;
-  delete histo81 ;
-  delete histo82 ;
-  delete histo83 ;
-  delete histo84 ;
-  delete histo85 ;
-  delete histo86 ;
-  delete hbookManager;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::bookHisto()
-{
-  // init hbook
-  hbookManager = new HBookFile(histName, 68);
-  assert (hbookManager != 0);
-
-  // book histograms
-  if(nbinStep>0)
-  {
-    histo1 = hbookManager->histogram("number of steps/event"
-                                   ,nbinStep,Steplow,Stephigh) ;
-    assert (histo1 != 0);
-  }
-  if(nbinEn>0)
-  {
-    histo2 = hbookManager->histogram("energy deposit in absorber(in MeV)"
-                                     ,nbinEn,Enlow,Enhigh) ;
-    assert (histo2 != 0);
-  }
-  if(nbinTh>0)
-  {
-    histo3 = hbookManager->histogram("angle distribution at exit(deg)"
-                                     ,nbinTh,Thlow/deg,Thhigh/deg) ;
-    assert (histo3 != 0);
-  }
-  if(nbinR>0)
-  {
-    histo4 = hbookManager->histogram("lateral distribution at exit(mm)"
-                                     ,nbinR ,Rlow,Rhigh)  ;
-    assert (histo4 != 0);
-  }
-  if(nbinTt>0)
-  {
-    histo5 = hbookManager->histogram("kinetic energy of the primary at exit(MeV)"
-                                     ,nbinTt,Ttlow,Tthigh)  ;
-    assert (histo5 != 0);
-  }
-  if(nbinThback>0)
-  {
-    histo6 = hbookManager->histogram("angle distribution of backscattered primaries(deg)"
-                                     ,nbinThback,Thlowback/deg,Thhighback/deg) ;
-    assert (histo6 != 0);
-  }
-  if(nbinTb>0)
-  {
-    histo7 = hbookManager->histogram("kinetic energy of the backscattered primaries (MeV)"
-                                     ,nbinTb,Tblow,Tbhigh)  ;
-    assert (histo7 != 0);
-  }
-  if(nbinTsec>0)
-  {
-    histo8 = hbookManager->histogram("kinetic energy of the charged secondaries (MeV)"
-                                     ,nbinTsec,Tseclow,Tsechigh)  ;
-    assert (histo8 != 0);
-  }
-  if(nbinvertexz>0)
-  {
-    histo9 = hbookManager->histogram("z of secondary charged vertices(mm)"
-                                     ,nbinvertexz ,zlow,zhigh)  ;
-    assert (histo9 != 0);
-  }
-  if(nbinGamma>0)
-  {
-    histo10= hbookManager->histogram("kinetic energy of gammas escaping the absorber (MeV)"
-                                //     ,nbinGamma,ElowGamma,EhighGamma)  ;
-                                ,nbinGamma,log10(ElowGamma),log10(EhighGamma))  ;
-    assert (histo10 != 0);
-  }
-
-  // Test on G4hLowEnergyIonisation
-  histo11 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) Z77p"
-                                                  ,92,0.5,92.5) ;
-  histo12 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) Z77 p"
-                                                  ,92,0.5,92.5) ;
-  histo13 = hbookManager->histogram("He4 effective charge in Carbon"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo14 = hbookManager->histogram("C12 ionisation in Al (MeV/(mg/cm^2)) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo15 = hbookManager->histogram("Ar40 ionisation in Al (MeV/(mg/cm^2)) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo21 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo22 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo23 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo24 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo25 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977p"
-                                                  ,92,0.5,92.5) ;
-  histo31 = hbookManager->histogram("proton ionisation in Carbon (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo32 = hbookManager->histogram("proton ionisation in Si (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo33 = hbookManager->histogram("proton ionisation in Cu (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo34 = hbookManager->histogram("proton ionisation in CH4 (MeV/mm) Geant4 Ziegler"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo35 = hbookManager->histogram("He effective charge for Au(79)"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-  histo41 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo42 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo43 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo44 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo45 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU_49p"
-                                                  ,92,0.5,92.5) ;
-  histo51 = hbookManager->histogram("proton ionisation in Al (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo52 = hbookManager->histogram("proton ionisation in Fe (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo53 = hbookManager->histogram("proton ionisation in Pb (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo54 = hbookManager->histogram("proton ionisation in H2O (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-  histo55 = hbookManager->histogram("proton ionisation in Graphite (MeV/mm) Geant4"
-                                   ,TotBin,log10(LowestEnergy),log10(HighestEnergy)) ;
-
-
-  histo61 = hbookManager->histogram("proton 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo62 = hbookManager->histogram("proton 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo63 = hbookManager->histogram("proton 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo64 = hbookManager->histogram("proton 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo65 = hbookManager->histogram("proton 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-
-  histo71 = hbookManager->histogram("He 40 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo72 = hbookManager->histogram("He 100 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo73 = hbookManager->histogram("He 400 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo74 = hbookManager->histogram("He 1 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo75 = hbookManager->histogram("He 4 MeV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo76 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) G4 Ziegler1977He"
-                                                  ,92,0.5,92.5) ;
-  histo81 = hbookManager->histogram("He 40 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo82 = hbookManager->histogram("He 100 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo83 = hbookManager->histogram("He 400 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo84 = hbookManager->histogram("He 1 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo85 = hbookManager->histogram("He 4 MeV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-  histo86 = hbookManager->histogram("He 10 keV ionisation (keV*cm2/10^15!atoms) G4 ICRU49He"
-                                                  ,92,0.5,92.5) ;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::BeginOfRunAction(const G4Run* aRun)
-{  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
-
-  G4UImanager* UI = G4UImanager::GetUIpointer();
-   
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-
-  if(pVVisManager)
-  {
-    UI->ApplyCommand("/vis/clear/view");
-    UI->ApplyCommand("/vis/draw/current");
-  }
-      
-  EnergySumAbs = 0. ;
-  EnergySquareSumAbs = 0.;
-  tlSumAbs = 0. ;
-  tlsquareSumAbs = 0. ;
-  nStepSumCharged = 0. ;
-  nStepSum2Charged= 0. ;
-  nStepSumNeutral = 0. ;
-  nStepSum2Neutral= 0. ;
-  TotNbofEvents = 0. ;
-  SumCharged=0.;
-  SumNeutral=0.;
-  Sum2Charged=0.;
-  Sum2Neutral=0.;
-  Selectron=0.;
-  Spositron=0.;
-
-  Transmitted=0.;
-  Reflected  =0.;
-//  plot definitions     --------------------------------
-  if(nbinStep>0)
-  {
-    dStep=(Stephigh-Steplow)/nbinStep;
-    entryStep=0.;
-    underStep=0.;
-    overStep=0.;
-    for(G4int ist=0; ist<nbinStep; ist++)
-    {
-      distStep[ist]=0.;
-    }
-  }      
-  if(nbinEn>0)
-  {
-    dEn = (Enhigh-Enlow)/nbinEn ;
-    entryEn=0.;
-    underEn=0.;
-    overEn=0.;
-    for (G4int ien=0; ien<nbinEn; ien++)
-    {
-      distEn[ien]=0.;
-    }
-  }
-
-  if(nbinTt>0)
-  {
-    dTt = (Tthigh-Ttlow)/nbinTt ;
-    entryTt=0.;
-    underTt=0.;
-    overTt=0.;
-    for (G4int itt=0; itt<nbinTt; itt++)
-    {
-      distTt[itt]=0.;
-    }
-    Ttmean=0.;
-    Tt2mean=0.;
-  }
-  if(nbinTb>0)
-  {
-    dTb = (Tbhigh-Tblow)/nbinTb ;
-    entryTb=0.;
-    underTb=0.;
-    overTb=0.;
-    for (G4int itt=0; itt<nbinTb; itt++)
-    {
-      distTb[itt]=0.;
-    }
-    Tbmean=0.;
-    Tb2mean=0.;
-  }
-  if(nbinTsec>0)
-  {
-    dTsec = (Tsechigh-Tseclow)/nbinTsec ;
-    entryTsec=0.;
-    underTsec=0.;
-    overTsec=0.;
-    for (G4int its=0; its<nbinTsec; its++)
-    {
-      distTsec[its]=0.;
-    }
-  }
-  if(nbinTh>0)
-  {
-    dTh = (Thhigh-Thlow)/nbinTh ;
-    entryTh=0.;
-    underTh=0.;
-    overTh=0.;
-    for (G4int ith=0; ith<nbinTh; ith++)
-    {
-      distTh[ith]=0.;
-    }
-  }
-
-  if(nbinThback>0)
-  {
-    dThback = (Thhighback-Thlowback)/nbinThback ;
-    entryThback=0.;
-    underThback=0.;
-    overThback=0.;
-    for (G4int ithback=0; ithback<nbinThback; ithback++)
-    {
-      distThback[ithback]=0.;
-    }
-  }
-
-
-  if(nbinR >0)
-  {
-    dR  = (Rhigh-Rlow)/nbinR  ;
-    entryR =0.;
-    underR =0.;
-    overR =0.;
-    for (G4int ir =0; ir <nbinR ; ir++)
-    {
-      distR[ir]=0.;
-    }
-    Rmean=0.;
-    R2mean=0.;
-  }
-
-  if(nbinGamma>0)
-  {
-    dEGamma = log(EhighGamma/ElowGamma)/nbinGamma ;
-    entryGamma = 0.;
-    underGamma=0.;
-    overGamma=0.;
-    for (G4int ig=0; ig<nbinGamma; ig++)
-    {
-      distGamma[ig]=0.;
-    }
-  } 
-  if(nbinvertexz>0)
-  {
-    dz=(zhigh-zlow)/nbinvertexz;
-    entryvertexz=0.;
-    undervertexz=0.;
-    oververtexz=0.;
-    for(G4int iz=0; iz<nbinvertexz; iz++)
-    {
-      distvertexz[iz]=0.;
-    }
-  }
-
-  bookHisto();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::EndOfRunAction(const G4Run* aRun)
-{
-  G4double sAbs,sigAbs,sigstep,sigcharged,signeutral;
-
-  tlSumAbs /= TotNbofEvents ;
-  sAbs = tlsquareSumAbs/TotNbofEvents-tlSumAbs*tlSumAbs ;
-  if(sAbs>0.)
-    sAbs = sqrt(sAbs/TotNbofEvents) ;
-  else
-    sAbs = 0. ;
-  
-  EnergySumAbs /= TotNbofEvents ;
-  sigAbs = EnergySquareSumAbs/TotNbofEvents-EnergySumAbs*EnergySumAbs;
-  if(sigAbs>0.)
-    sigAbs = sqrt(sigAbs/TotNbofEvents);
-  else
-    sigAbs = 0.;
-
-  nStepSumCharged /= TotNbofEvents ;
-  sigstep = nStepSum2Charged/TotNbofEvents-nStepSumCharged*nStepSumCharged;
-  if(sigstep>0.)
-    sigstep = sqrt(sigstep/TotNbofEvents);
-  else
-    sigstep = 0.;
-  G4double sigch=sigstep ;
-  
-  nStepSumNeutral /= TotNbofEvents ;
-  sigstep = nStepSum2Neutral/TotNbofEvents-nStepSumNeutral*nStepSumNeutral;
-  if(sigstep>0.)
-    sigstep = sqrt(sigstep/TotNbofEvents);
-  else
-    sigstep = 0.;
-  G4double signe=sigstep ;
-  
-  SumCharged /= TotNbofEvents;
-  sigcharged = Sum2Charged/TotNbofEvents-SumCharged*SumCharged; 
-  if(sigcharged>0.)
-    sigcharged = sqrt(sigcharged/TotNbofEvents);
-  else
-    sigcharged = 0. ;
- 
-  SumNeutral /= TotNbofEvents;
-  signeutral = Sum2Neutral/TotNbofEvents-SumNeutral*SumNeutral; 
-  if(signeutral>0.)
-    signeutral = sqrt(signeutral/TotNbofEvents);
-  else
-    signeutral = 0. ;
- 
-  Selectron /= TotNbofEvents ;
-  Spositron /= TotNbofEvents ;
-
-  Transmitted /=TotNbofEvents ;
-  Reflected   /=TotNbofEvents ;
- G4cout << " ================== run summary =====================" << endl;
- G4int prec = G4cout.precision(6);
-  G4cout << " end of Run TotNbofEvents = " <<  
-           TotNbofEvents << endl ;
-  G4cout << "    mean charged track length   in absorber=" <<
-           tlSumAbs/mm      << " +- " << sAbs/mm    <<
-          "  mm  " << endl; 
-  G4cout << endl;
-  G4cout << "            mean energy deposit in absorber=" <<
-           EnergySumAbs/MeV << " +- " << sigAbs/MeV <<
-          "  MeV " << endl ;
-  G4cout << endl ;
-  G4cout << " mean number of steps in absorber (charged) =" <<
-           nStepSumCharged         << " +- " << sigch     <<
-          "      " << endl ;
-  G4cout << " mean number of steps in absorber (neutral) =" <<
-           nStepSumNeutral         << " +- " << signe     <<
-          "      " << endl ;
-  G4cout << endl ;
-  G4cout << "   mean number of charged secondaries = " <<
-           SumCharged << " +- " << sigcharged << endl;  
-  G4cout << endl ;
-  G4cout << "   mean number of neutral secondaries = " <<
-           SumNeutral << " +- " << signeutral << endl;  
-  G4cout << endl ;
-  
-  G4cout << "   mean number of e-s =" << Selectron << 
-            "  and e+s =" << Spositron << endl;
-  G4cout << endl; 
-  
-  G4cout << "(number) transmission coeff=" << Transmitted <<
-            "  reflection coeff=" << Reflected << endl;
-  G4cout << endl; 
-
-  if(nbinStep>0)
-  {G4double E , dnorm, norm ;
-   G4cout << "   step number/event distribution " << endl ;
-   G4cout << "#entries=" << entryStep << "    #underflows=" << underStep <<
-             "    #overflows=" << overStep << endl ;
-   if( entryStep>0.)
-   {
-     E = Steplow - dStep ;
-     norm = TotNbofEvents ;
-     G4cout << " bin nb   nsteplow     entries     normalized " << endl ;
-     for(G4int iss=0; iss<nbinStep; iss++)
-     {
-      E += dStep ;
-      dnorm = distStep[iss]/norm;
-      G4cout << setw(5) << iss << setw(10) << E << 
-                setw(12) << distStep[iss] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinEn>0)
-  {G4double E , dnorm, norm,fmax,Emp,width ;
-   Emp=-999.999 ;
-   G4cout << " energy deposit distribution " << endl ;
-   G4cout << "#entries=" << entryEn << "    #underflows=" << underEn <<
-             "    #overflows=" << overEn << endl ;
-   if( entryEn>0.)
-   {
-     E = Enlow - dEn ;
-     norm = TotNbofEvents*dEn ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     fmax = 0. ;
-     for(G4int ien=0; ien<nbinEn; ien++)
-     {
-      E += dEn ;
-      if(distEn[ien]>fmax)
-      {
-        fmax=distEn[ien];
-        Emp = E ;
-      }
-      dnorm = distEn[ien]/norm;
-      G4cout << setw(5) << ien << setw(10) << E << 
-                setw(12) << distEn[ien] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-     G4int ii ;
-     G4double E1,E2 ;
-     E1=-1.e6 ;
-     E2=+1.e6 ;
-     E = Enlow -dEn ;
-     ii = -1;
-     for(G4int i1=0; i1<nbinEn; i1++)
-     {
-      E += dEn ;
-     if(ii<0)
-     {
-      if(distEn[i1] >= 0.5*fmax)
-      {
-        E1=E ;
-        ii=i1 ;
-      }
-     }
-     }
-     E = Enlow -dEn ;
-     for(G4int i2=0; i2<nbinEn; i2++)
-     {
-      E += dEn ;
-      if(distEn[i2] >= 0.5*fmax)
-        E2=E ;
-     }
-     G4cout << " Emp = " << setw(15) << Emp/MeV << "   width="
-            << setw(15) << (E2-E1)/MeV <<   "  MeV " << endl;
-     G4cout << endl ;
-   }     
-  }
-  if(nbinTt>0)
-  {G4double E , dnorm, norm ,sig;
-   G4cout << " transmitted energy distribution " << endl ;
-   G4cout << "#entries=" << entryTt << "    #underflows=" << underTt <<
-             "    #overflows=" << overTt << endl ;
-   if( entryTt>0.)
-   {
-     Ttmean /= entryTt;
-     sig=Tt2mean/entryTt-Ttmean*Ttmean ;
-     if(sig<=0.)
-       sig=0.;
-     else
-       sig=sqrt(sig/entryTt) ;
-     G4cout << " mean energy of transmitted particles=" << Ttmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
-     E = Ttlow - dTt ;
-     norm = TotNbofEvents*dTt ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTt; itt++)
-     {
-      E += dTt ;
-      dnorm = distTt[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTt[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinTb>0)
-  {G4double E , dnorm, norm ,sig;
-   G4cout << " backscattered energy distribution " << endl ;
-   G4cout << "#entries=" << entryTb << "    #underflows=" << underTb <<
-             "    #overflows=" << overTb << endl ;
-   if( entryTb>0.)
-   {
-     Tbmean /= entryTb;
-     sig=Tb2mean/entryTb-Tbmean*Tbmean ;
-     if(sig<=0.)
-       sig=0.;
-     else
-       sig=sqrt(sig/entryTb) ;
-     G4cout << " mean energy of backscattered particles=" << Tbmean/keV << 
-               " +- " << sig/keV << "  keV." << endl;
-     E = Tblow - dTb ;
-     norm = TotNbofEvents*dTb ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTb; itt++)
-     {
-      E += dTb ;
-      dnorm = distTb[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTb[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-  if(nbinTsec>0)
-  {G4double E , dnorm, norm ;
-   G4cout << " energy distribution of charged secondaries " << endl ;
-   G4cout << "#entries=" << entryTsec << "    #underflows=" << underTsec <<
-             "    #overflows=" << overTsec << endl ;
-   if( entryTsec>0.)
-   {
-     E = Tseclow - dTsec ;
-     norm = TotNbofEvents*dTsec ;
-     G4cout << " bin nb      Elow      entries     normalized " << endl ;
-     for(G4int itt=0; itt<nbinTsec; itt++)
-     {
-      E += dTsec ;
-      dnorm = distTsec[itt]/norm;
-      G4cout << setw(5) << itt << setw(10) << E << 
-                setw(12) << distTsec[itt] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-
-  if(nbinR >0)
-  {G4double R , dnorm, norm,sig  ;
-   G4cout << "  R  distribution " << endl ;
-   G4cout << "#entries=" << entryR  << "    #underflows=" << underR  <<
-             "    #overflows=" << overR  << endl ;
-   if( entryR >0.)
-   {
-     Rmean /= entryR;
-     sig = R2mean/entryR - Rmean*Rmean;
-     if(sig<=0.) sig=0. ;
-     else        sig = sqrt(sig/entryR) ;
-     G4cout << " mean lateral displacement at exit=" << Rmean/mm << " +- "
-            << sig/mm << "  mm." << endl ; 
-     R = Rlow - dR  ;
-     norm = TotNbofEvents*dR  ;
-     G4cout << " bin nb      Rlow      entries     normalized " << endl ;
-     for(G4int ier=0; ier<nbinR ; ier++)
-     {
-      R+= dR  ;
-      dnorm = distR[ier]/norm;
-      G4cout << setw(5) << ier << setw(10) << R  <<
-                setw(12) << distR[ier] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }
-  }
-
-  if(nbinTh>0)
-  {G4double Th,Thdeg, dnorm, norm,fac0,fnorm,pere,Thpere,Thmean,sum;
-   G4cout << "      angle   distribution " << endl ;
-   G4cout << "#entries=" << entryTh << "    #underflows=" << underTh <<
-             "    #overflows=" << overTh << endl ;
-   if( entryTh>0.)
-   {
-     Th= Thlow - dTh ;
-     norm = TotNbofEvents ;
-     if(distTh[0] == 0.)
-       fac0 = 1. ;
-     else
-       fac0 = 1./distTh[0] ;
-     pere = 1./exp(1.) ;
-
-     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
-     Thpere = 0. ;
-     sum = 0. ;
-     Thmean = 0. ;
-     for(G4int ien=0; ien<nbinTh; ien++)
-     {
-      Th+= dTh ;
-      Thdeg = Th*180./pi ;
-      sum += distTh[ien] ;
-      Thmean += distTh[ien]*(Th+0.5*dTh) ;
-      dnorm = distTh[ien]/norm;
-      fnorm = fac0*distTh[ien] ;
-      if( fnorm > pere)
-        Thpere = Th ; 
-      G4cout << setw(5) << ien << setw(10) << Thdeg << "   " <<
-                setw(10) << Th << "  " <<   
-                setw(12) << distTh[ien] << "  " <<
-                setw(12) << dnorm << "  " << setw(12) << fnorm <<endl ;
-     }
-     Thmean /= sum ;
-     G4cout << endl;
-     G4cout << " mean = " << Thmean << "  rad  or " << 180.*Thmean/pi <<
-               " deg." << endl;
-     G4cout << " theta(1/e)=" << Thpere << " - " << Thpere+dTh << " rad   "
-            << " or " << 180.*Thpere/pi << " - " << 180.*(Thpere+dTh)/pi 
-            << " deg." << endl;
-     G4cout << endl;
-   }
-  }
-
-  if(nbinThback>0)
-  {G4double Thb,Thdegb, dnormb, normb,fac0b,fnormb,pereb,Thpereb,Thmeanb,sumb;
-   G4cout << " backscattering angle   distribution " << endl ;
-   G4cout << "#entries=" << entryThback << "    #underflows=" << underThback <<
-             "    #overflows=" << overThback << endl ;
-   if( entryThback>0.)
-   {
-     Thb= Thlowback - dThback ;
-     normb = TotNbofEvents ;
-     if(distThback[0] == 0.)
-       fac0b = 1. ;
-     else
-       fac0b = 1./distThback[0] ;
-     pereb = 1./exp(1.) ;
-
-     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
-               " entries         normalized " << endl ;
-     Thpereb = 0. ;
-     sumb = 0. ;
-     Thmeanb = 0. ;
-     for(G4int ien=0; ien<nbinThback; ien++)
-     {
-      Thb+= dThback ;
-      Thdegb = Thb*180./pi ;
-      sumb += distThback[ien] ;
-      Thmeanb += distThback[ien]*(Thb+0.5*dThback) ;
-      dnormb = distThback[ien]/normb;
-      fnormb = fac0b*distThback[ien] ;
-      if( fnormb > pereb)
-        Thpereb = Thb ;
-      G4cout << setw(5) << ien << setw(10) << Thdegb << "   " <<
-                setw(10) << Thb << "  " <<
-                setw(12) << distThback[ien] << "  " <<
-                setw(12) << dnormb << "  " << setw(12) << fnormb <<endl ;
-     }
-     Thmeanb /= sumb ;
-     G4cout << endl;
-     G4cout << " mean = " << Thmeanb << "  rad  or " << 180.*Thmeanb/pi <<
-               " deg." << endl;
-     G4cout << " theta(1/e)=" << Thpereb << " - " << Thpereb+dThback << " rad   "
-            << " or " << 180.*Thpereb/pi << " - " << 180.*(Thpereb+dThback)/pi
-            << " deg." << endl;
-     G4cout << endl;
-   }
-  }
-
-  if(nbinGamma>0)
-  {G4double E , fact,dnorm, norm  ;
-   G4cout << " gamma energy distribution " << endl ;
-   G4cout << "#entries=" << entryGamma << "    #underflows=" << underGamma <<
-             "    #overflows=" << overGamma << endl ;
-   if( entryGamma>0.)
-   {
-     fact=exp(dEGamma) ;
-     E = ElowGamma/fact  ;
-     norm = TotNbofEvents*dEGamma;
-     G4cout << " bin nb         Elow      entries       normalized " << endl ;
-     for(G4int itt=0; itt<nbinGamma; itt++)
-     {
-      E *= fact ;
-      dnorm = distGamma[itt]/norm;
-      G4cout << setw(5) << itt << setw(13) << E << 
-                setw(12) << distGamma[itt] <<
-                setw(15) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }     
-  }
-
-  if(nbinvertexz >0)
-  {G4double z , dnorm, norm  ;
-   G4cout << " vertex Z  distribution " << endl ;
-   G4cout << "#entries=" << entryvertexz  << "    #underflows=" << undervertexz  <<
-             "    #overflows=" << oververtexz  << endl ;
-   if( entryvertexz >0.)
-   {
-     z =zlow - dz  ;
-     norm = TotNbofEvents*dz  ;
-     G4cout << " bin nb      zlow      entries     normalized " << endl ;
-     for(G4int iez=0; iez<nbinvertexz ; iez++)
-     {
-      z+= dz  ;
-      if(abs(z)<1.e-12) z=0.;
-      dnorm = distvertexz[iez]/norm;
-      G4cout << setw(5) << iez << setw(10) << z  <<
-                setw(12) << distvertexz[iez] <<
-                setw(12) << dnorm << endl ;
-     }
-     G4cout << endl;
-   }
-  }
-  
- G4cout.precision(prec);
-  
-  if (G4VVisManager::GetConcreteInstance())
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/show/view");
-    
-   // Write histogram file
-   FillLowEnergyTest() ;
-   hbookManager->write();
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::CountEvent()
-{
-  TotNbofEvents += 1. ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddnStepsCharged(G4double ns)
-{
-  nStepSumCharged += ns;
-  nStepSum2Charged += ns*ns;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddnStepsNeutral(G4double ns)
-{
-  nStepSumNeutral += ns;
-  nStepSum2Neutral += ns*ns;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddEdeps(G4double Eabs)
-{
-  EnergySumAbs += Eabs;
-  EnergySquareSumAbs += Eabs*Eabs;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddTrackLength(G4double tlabs)
-{
-  tlSumAbs += tlabs;
-  tlsquareSumAbs += tlabs*tlabs ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::AddTrRef(G4double tr,G4double ref)
-{
-  Transmitted += tr ;
-  Reflected   += ref;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillNbOfSteps(G4double ns)
-{
-  const G4double eps = 1.e-10 ;
-  G4double n,bin ;
-  G4int ibin;
- 
-  if(histo1)
-  {
-    entryStep += 1. ;
- 
-    if(ns<Steplow)
-      underStep += 1. ;
-    else if(ns>=Stephigh)
-      overStep  += 1. ;
-    else
-    {
-      n = ns+eps ;
-      bin = (n-Steplow)/dStep ;
-      ibin= bin ;
-      distStep[ibin] += 1. ;
-    }
-   histo1->accumulate(ns) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillEn(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo2)
-  {
-    entryEn += 1. ;
- 
-    if(En<Enlow)
-      underEn += 1. ;
-    else if(En>=Enhigh)
-      overEn  += 1. ;
-    else
-    {
-      bin = (En-Enlow)/dEn ;
-      ibin= bin ;
-      distEn[ibin] += 1. ;
-    }
-  histo2->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTt(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo5)
-  {
-    entryTt += 1. ;
-    Ttmean += En ;
-    Tt2mean += En*En ;
-
-    if(En<Ttlow)
-      underTt += 1. ;
-    else if(En>=Tthigh)
-      overTt  += 1. ;
-    else
-    {
-      bin = (En-Ttlow)/dTt ;
-      ibin= bin ;
-      distTt[ibin] += 1. ;
-    }
-  histo5->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTb(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-  
-  if(histo7)
-  {
-    entryTb += 1. ;
-    Tbmean += En ;
-    Tb2mean += En*En ;
-
-    if(En<Tblow)
-      underTb += 1. ;
-    else if(En>=Tbhigh)
-      overTb  += 1. ;
-    else
-    {
-      bin = (En-Tblow)/dTb ;
-      ibin= bin ;
-      distTb[ibin] += 1. ;
-    }
-  histo7->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTsec(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo8)
-  {
-    entryTsec += 1. ;
-
-    if(En<Tseclow)
-      underTsec += 1. ;
-    else if(En>=Tsechigh)
-      overTsec  += 1. ;
-    else
-    {
-      bin = (En-Tseclow)/dTsec ;
-      ibin= bin ;
-      distTsec[ibin] += 1. ;
-    }
-  histo8->accumulate(En/MeV) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillGammaSpectrum(G4double En)
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo10)
-  {
-    entryGamma += 1. ;
-
-    if(En<ElowGamma)
-      underGamma += 1. ;
-    else if(En>=EhighGamma)
-      overGamma  += 1. ;
-    else
-    {
-      bin = log(En/ElowGamma)/dEGamma;
-      ibin= bin ;
-      distGamma[ibin] += 1. ;
-    }
-  histo10->accumulate(log10(En/MeV)) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillTh(G4double Th)
-{
-  static const G4double cn=pi/(64800.*dTh) ;
-  static const G4double cs=pi/
-        (64800.*(cos(Thlow)-cos(Thlow+dTh)));      
-  G4double bin,Thbin ,wg;
-  G4int ibin;
-
-  if(histo3)
-  {
-    entryTh += 1. ;
-
-    wg = 0.;
-
-    if(Th<Thlow)
-      underTh += 1. ;
-    else if(Th>=Thhigh)
-      overTh  += 1. ;
-    else
-    {
-      bin = (Th-Thlow)/dTh ;
-      ibin= bin ;
-      Thbin = Thlow+ibin*dTh ;
-      if(Th > 0.001*dTh)
-        wg=cn/sin(Th) ;
-      else
-      {  
-        G4double thdeg=Th*180./pi;
-        G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
-        wg=0. ; 
-      }
-      distTh[ibin] += wg  ;
-    }
-
-  histo3->accumulate(Th/deg, wg) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillThBack(G4double Th)
-{
-  static const G4double cn=pi/(64800.*dThback) ;
-  static const G4double cs=pi/
-        (64800.*(cos(Thlowback)-cos(Thlowback+dThback)));      
-  G4double bin,Thbin,wg ;
-  G4int ibin;
-
-  if(histo6)
-  {
-    entryThback += 1. ;
-
-    if(Th<Thlowback)
-      underThback += 1. ;
-    else if(Th>=Thhighback)
-      overThback  += 1. ;
-    else
-    {
-      bin = (Th-Thlowback)/dThback ;
-      ibin= bin ;
-      Thbin = Thlowback+ibin*dThback ;
-      if(Th > 0.001*dThback)
-        wg=cn/sin(Th) ;
-      else
-      {  
-        G4double thdeg=Th*180./pi;
-        G4cout << "theta < 0.001*dth (from plot excluded) theta="
-               << setw(12) << setprecision(4) << thdeg << endl;
-        wg=0. ; 
-      }
-      distThback[ibin] += wg  ;
-    }
-  histo6->accumulate(Th/deg, wg) ;
-  }
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillR(G4double R )
-{
-  G4double bin ;
-  G4int ibin;
-
-  if(histo4)
-  {
-    entryR  += 1. ;
-    Rmean += R ;
-    R2mean += R*R ;
-
-    if(R <Rlow)
-      underR  += 1. ;
-    else if(R >=Rhigh)
-      overR   += 1. ;
-    else
-    {
-      bin = (R -Rlow)/dR  ;
-      ibin= bin ;
-      distR[ibin] += 1. ;
-    }
-  histo4->accumulate(R/mm) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::Fillvertexz(G4double z )
-{
-  G4double bin ;
-  G4int ibin;
-  
-  if(histo9)
-  {
-    entryvertexz  += 1. ;
-
-    if(z <zlow)
-      undervertexz  += 1. ;
-    else if(z >=zhigh)
-      oververtexz   += 1. ;
-    else
-    {
-      bin = (z -zlow)/dz  ;
-      ibin= bin ;
-      distvertexz[ibin] += 1. ;
-    }
-  histo9->accumulate(z/mm) ;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::SethistName(G4String name)
-{
-  histName = name ;
-  G4cout << " hist file = " << histName << endl;
-}
-
-void Em6RunAction::SetnbinStep(G4int nbin)
-{
-  nbinStep = nbin ;
-  if(nbinStep>0)
-  G4cout << " Nb of bins in #step plot = " << nbinStep << endl ;
-}
-void Em6RunAction::SetSteplow(G4double low)
-{
-  Steplow = low ;
-  if(nbinStep>0)
-  G4cout << " low  in the #step plot = " << Steplow << endl ;
-}
-void Em6RunAction::SetStephigh(G4double high)
-{
-  Stephigh = high ;
-  if(nbinStep>0)
-  G4cout << " high in the #step plot = " << Stephigh << endl ;
-}
-void Em6RunAction::SetnbinEn(G4int nbin)
-{
-  nbinEn = nbin ;
-  if(nbinEn>0)
-  G4cout << " Nb of bins in Edep plot = " << nbinEn << endl ;
-}
-void Em6RunAction::SetEnlow(G4double Elow)
-{
-  Enlow = Elow ;
-  if(nbinEn>0)
-  G4cout << " Elow  in the  Edep plot = " << Enlow << endl ;
-}
-void Em6RunAction::SetEnhigh(G4double Ehigh)
-{
-  Enhigh = Ehigh ;
-  if(nbinEn>0)
-  G4cout << " Ehigh in the  Edep plot = " << Enhigh << endl ;
-}
-
-void Em6RunAction::SetnbinGamma(G4int nbin)
-{
-  nbinGamma = nbin ;
-  if(nbinGamma>0)
-  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << endl ;
-}
-void Em6RunAction::SetElowGamma(G4double Elow)
-{
-  ElowGamma = Elow ;
-  if(nbinGamma>0)
-  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << endl ;
-}
-void Em6RunAction::SetEhighGamma(G4double Ehigh)
-{
-  EhighGamma = Ehigh ;
-  if(nbinGamma>0)
-  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << endl ;
-}
-
-void Em6RunAction::SetnbinTt(G4int nbin)
-{
-  nbinTt = nbin ;
-  if(nbinTt>0)
-  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << endl ;
-}
-void Em6RunAction::SetTtlow(G4double Elow)
-{
-  Ttlow = Elow ;
-  if(nbinTt>0)
-  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << endl ;
-}
-void Em6RunAction::SetTthigh(G4double Ehigh)
-{
-  Tthigh = Ehigh ;
-  if(nbinTt>0)
-  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << endl ;
-}
-void Em6RunAction::SetnbinTb(G4int nbin)
-{
-  nbinTb = nbin ;
-  if(nbinTb>0)
-  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << endl ;
-}
-void Em6RunAction::SetTblow(G4double Elow)
-{
-  Tblow = Elow ;
-  if(nbinTb>0)
-  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << endl ;
-}
-void Em6RunAction::SetTbhigh(G4double Ehigh)
-{
-  Tbhigh = Ehigh ;
-  if(nbinTb>0)
-  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << endl ;
-}
-
-void Em6RunAction::SetnbinTsec(G4int nbin)
-{
-  nbinTsec = nbin ;
-  if(nbinTsec>0)
-  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << endl ;
-}
-void Em6RunAction::SetTseclow(G4double Elow)
-{
-  Tseclow = Elow ;
-  if(nbinTsec>0)
-  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << endl ;
-}
-void Em6RunAction::SetTsechigh(G4double Ehigh)
-{
-  Tsechigh = Ehigh ;
-  if(nbinTsec>0)
-  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << endl ;
-}
- 
-void Em6RunAction::SetnbinR(G4int nbin)
-{
-  nbinR  = nbin ;
-  if(nbinR>0)
-  G4cout << " Nb of bins in R plot = " << nbinR << endl ;
-}
-void Em6RunAction::SetRlow(G4double rlow)
-{
-  Rlow = rlow ;
-  if(nbinR>0)
-  G4cout << " Rlow  in the  R plot = " << Rlow << endl ;
-}
-void Em6RunAction::SetRhigh(G4double rhigh)
-{
-  Rhigh = rhigh ;
-  if(nbinR>0)
-  G4cout << " Rhigh in the R plot = " << Rhigh << endl ;
-}
-
-void Em6RunAction::Setnbinzvertex(G4int nbin)
-{
-  nbinvertexz  = nbin ;
-  if(nbinvertexz>0)
-  G4cout << " Nb of bins in Z plot = " << nbinvertexz << endl ;
-}
-void Em6RunAction::Setzlow(G4double z)
-{
-  zlow = z ;
-  if(nbinvertexz>0)
-  G4cout << " zlow  in the  Z plot = " << zlow << endl ;
-}
-void Em6RunAction::Setzhigh(G4double z)
-{
-  zhigh = z ;
-  if(nbinvertexz>0)
-  G4cout << " zhigh in the Z plot = " << zhigh << endl ;
-}
-
-void Em6RunAction::SetnbinTh(G4int nbin)
-{
-  nbinTh = nbin ;
-  if(nbinTh>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinTh << endl ;
-}
-void Em6RunAction::SetThlow(G4double Tlow)
-{
-  Thlow = Tlow ;
-  if(nbinTh>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlow << endl ;
-}
-void Em6RunAction::SetThhigh(G4double Thigh)
-{
-  Thhigh = Thigh ;
-  if(nbinTh>0)
-  G4cout << " Thigh in the Theta plot = " << Thhigh << endl ;
-}
-
-void Em6RunAction::SetnbinThBack(G4int nbin)
-{
-  nbinThback = nbin ;
-  if(nbinThback>0)
-  G4cout << " Nb of bins in Theta plot = " << nbinThback << endl ;
-}
-void Em6RunAction::SetThlowBack(G4double Tlow)
-{
-  Thlowback = Tlow ;
-  if(nbinThback>0)
-  G4cout << " Tlow  in the  Theta plot = " << Thlowback << endl ;
-}
-void Em6RunAction::SetThhighBack(G4double Thigh)
-{
-  Thhighback = Thigh ;
-  if(nbinThback>0)
-  G4cout << " Thigh in the Theta plot = " << Thhighback << endl ;
-}
-void Em6RunAction::CountParticles(G4double nch,G4double nne)
-{
-  SumCharged += nch ;
-  SumNeutral += nne ;
-  Sum2Charged += nch*nch ;
-  Sum2Neutral += nne*nne ;
-}
-void Em6RunAction::AddEP(G4double nele,G4double npos) 
-{
-  Selectron += nele;
-  Spositron += npos;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em6RunAction::FillLowEnergyTest( )
-{
-  G4int J ;
-  G4double* DeltaCutInKineticEnergy = theElectron->GetCutsInEnergy() ;
-  G4hLowEnergyIonisation* hLEIon = new G4hLowEnergyIonisation() ;
-  G4ParticleDefinition* theH = G4Proton::Proton() ;
-
-  //G4double fac = 4.026/1.0073 ;
-  //G4double cac = 1.0 ;
-  //  theProton = G4Proton::Proton() ;
-    G4double fac = 1.0 ;
-    G4double cac = 2.0 ;
-    theProton = G4Alpha::Alpha() ;
-
-    G4ionLowEnergyIonisation* ionLEIon = new G4ionLowEnergyIonisation() ;
-    ionLEIon->SetIonDefinition(theProton) ;
-
-    //  G4ionLowEnergyIonisation* ionLEIonC = new G4ionLowEnergyIonisation() ;
-    //  G4ParticleDefinition* theC12 = G4IonC12::IonC12() ;
-    //  ionLEIonC->SetIonDefinition(theC12) ;
-  G4double chc = 6.0 ;
-
-  //  G4ionLowEnergyIonisation* ionLEIonAr = new G4ionLowEnergyIonisation() ;
-  //  G4ParticleDefinition* theAr40 = G4IonAr40::IonAr40() ;
-  //  ionLEIonAr->SetIonDefinition(theAr40) ;
-  G4double cha = 18.0 ;
-
-
-  //  G4ionLowEnergyIonisation* ionLEIonFe = new G4ionLowEnergyIonisation() ;
-  //  G4ParticleDefinition* theFe56 = G4IonFe56::IonFe56() ;
-  //  ionLEIonFe->SetIonDefinition(theFe56) ;
-  //  G4double chf = 26.0 ;
-
-  //  G4double mrC12 = (theC12->GetPDGMass()) / (theH->GetPDGMass()) ; 
-  //  G4double mrAr40 = (theAr40->GetPDGMass()) / (theH->GetPDGMass()) ; 
-
-  G4double de ;
-
-  // Ziegler1977p
-  G4double tau = 40*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo21->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo22->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo23->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo24->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPower1977H(J, tau) ;
-    histo25->accumulate(double(J),de) ;
-  }
-
-  // Ziegler1977He
-  tau = 40*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo61->accumulate(double(J),de) ;
-  }
-  tau = 100*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo62->accumulate(double(J),de) ;
-  }
-  tau = 400*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo63->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo64->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV*4.026/1.0073 ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) /
-                  (hLEIon->GetHeEffChargeSquare(J, tau)) ;
-    histo65->accumulate(double(J),de) ;
-  }
-
-  // ICRU_49p
-  tau = 40*keV ;
- 
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo41->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo42->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo43->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-    histo44->accumulate(double(J),de) ;
-  }
-  tau = 4000*keV ;
-   for ( J=1; J<93; J++)
-  { 
-   de = hLEIon->GetStoppingPowerICRU_R49p(J, tau, "Ele") ;
-   histo45->accumulate(double(J),de) ;
-  }
- 
-  for ( J=1; J<93; J++)
-  { 
-    static G4double S40[92] = {
-    6.22, 6.55, 7.61, 10.4, 12.9, 13.9, 15.9, 14.6, 11.7, 11.1,
-    14.2, 20.6, 20.7,  22.3, 18.1, 19.3, 27.5, 30.5, 27.9, 29.8,
-    28.3, 26.7, 25.1,  22.5, 19.8, 20.1, 18.0, 20.1, 20.4, 23.4,
-    27.5, 29.0, 29.3,  31.0, 31.1, 34.8, 31.5, 35.0, 35.5, 37.3,
-    38.3, 35.9, 38.0,  34.4, 33.4, 29.8, 30.9, 32.7, 34.9, 36.0,
-    40.9, 39.1, 43.1,  45.8, 40.8, 44.1, 44.9, 42.0, 41.0, 40.0,
-    39.0, 38.0, 37.1,  38.2, 35.3, 31.5, 29.9, 29.1, 28.3, 27.5, 
-    28.1, 28.9, 27.3,  26.3, 29.9, 29.1, 28.4, 25.8, 28.0, 24.9,
-    27.3, 30.7, 34.3,  35.4, 35.6, 35.5, 39.8, 42.9, 43.7, 44.1,
-    42.4, 41.8} ;
-    histo11->accumulate(double(J),S40[J-1]) ;
-  }
-
-  //============================ He ions ===========
-  // Ziegler1977He
-  tau = 40*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo71->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo81->accumulate(double(J),de) ;
-  }
-  tau = 100*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo72->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo82->accumulate(double(J),de) ;
-  }
-  tau = 400*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo73->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo83->accumulate(double(J),de) ;
-  }
-  tau = 1000*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo74->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo84->accumulate(double(J),de) ;
-  }
-  tau = 4*MeV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo75->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo85->accumulate(double(J),de) ;
-  }
-  tau = 10*keV ;
-  for ( J=1; J<93; J++)
-  { 
-    de = (hLEIon->GetStoppingPower1977He(J, tau)) ;
-    histo76->accumulate(double(J),de) ;
-    de = hLEIon->GetStoppingPowerICRU_R49He(J, tau ) ;
-    histo86->accumulate(double(J),de) ;
-  }
- 
-  for ( J=1; J<93; J++)
-  { 
-    static G4double Q40[92] = {
-    11.8, 16.7, 21.9,  24.1, 34.7, 36.1, 45.5, 46.1, 45.8, 44.9,
-    46.9, 51.7, 54.9,  63.2, 63.8, 67.4, 79.8, 80.8, 78.0, 83.2,
-    85.4, 84.2, 90.6,  85.7, 84.1, 86.4, 82.0, 77.7, 74.4, 75.1,
-    75.6, 80.7, 84.9,  87.0, 88.6, 103.0, 103.0, 113.0, 116.0, 123.0,
-    120.0, 115.0, 118.0, 115.0, 113.0, 112.0, 111.0, 110.0, 116.0, 117.0,
-    119.0, 123.0, 122.0, 139.0, 138.0, 143.0, 152.0, 141.0, 139.0, 137.0,
-    135.0, 134.0, 130.0, 137.0, 129.0, 128.0, 124.0, 125.0, 120.0, 118.0, 
-    119.0, 120.0, 121.0, 122.0, 125.0, 127.0, 128.0, 120.0, 125.0, 128.0,
-    136.0, 138.0, 144.0, 148.0, 151.0, 162.0, 166.0, 177.0, 179.0, 183.0, 
-    177.0, 176.0 } ;   
-    histo12->accumulate(double(J),Q40[J-1]) ;
-  }
-  //============================ He ions ===========
-
-
-  //  find out materials table
-  static const G4MaterialTable* theMaterialTable=
-                                   G4Material::GetMaterialTable();
-
-  G4int numOfMaterials = theMaterialTable->length();
-  G4double dedx ;
-    // create physics vector and fill it
-
-  G4PhysicsLogVector* aVector = new G4PhysicsLogVector(
-               LowestEnergy, HighestEnergy, TotBin);
-
-
-  //  loop for materials - the parametrisation is defined in the G4PhysicsList
-
-  for ( J=0; J<numOfMaterials; J++)
-  {
-    G4Material* material = (*theMaterialTable)[J];
-    if ("Carbon" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5*(aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	//	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-	G4double cf = ionLEIon->GetHeEffChargeSquare(6, tau) / (cac*cac);
-        histo31->accumulate(log10(tau),dedx*cf) ;
-        histo13->accumulate(log10(tau),cf*cac*cac) ;
-      }
-    } else if ("Silicon" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo32->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Copper" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo33->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("CH_4" == material->GetChemicalFormula()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-	tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo34->accumulate(log10(tau),dedx*cf) ;
-	cf = hLEIon->GetHeEffChargeSquare(79, tau*4.026/1.0073) ;
-        histo35->accumulate(log10(tau),cf) ;
-      }
-    } else if ("Aluminum" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo51->accumulate(log10(tau),dedx*cf) ;
-	/*
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theC12,tau*mrC12,material) ;
-	cf = ionLEIonC->GetIonEffChargeSquare(material, tau*mrC12, chc) / (chc*chc);
-        histo14->accumulate(log10(tau), dedx*cf / 270.0  ) ;
-	dedx = G4EnergyLossTables::GetPreciseDEDX(theAr40,tau*mrAr40,material) ;
-	cf = ionLEIonAr->GetIonEffChargeSquare(material, tau*mrAr40, cha) / (cha*cha);
-        histo15->accumulate(log10(tau), dedx*cf / 270.0  ) ;
-	*/
-      }
-    } else if ("Iron" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo52->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Lead" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	//	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-	G4double cf = hLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac);
-        histo53->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Water" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-      {
-        tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-        dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac) ;
-	//        G4cout << "Energy = " << tau << " MeV; dedx = " << dedx << endl;
-        histo54->accumulate(log10(tau),dedx*cf) ;
-      }
-    } else if ("Graphite" == material->GetName()) {
-      for (G4int i = 0 ; i < TotBin-1 ; i++)
-	{
-	  tau = 0.5 * (aVector->GetLowEdgeEnergy(i) + aVector->GetLowEdgeEnergy(i+1)) ;
-	  dedx = G4EnergyLossTables::GetPreciseDEDX(theProton,tau/fac,material) ;
-	G4double cf = ionLEIon->GetIonEffChargeSquare(material, tau, cac) / (cac*cac) ;
-	  histo55->accumulate(log10(tau),dedx*cf) ;
-	}
-    }
-  } 
-    delete hLEIon ;
-    delete ionLEIon ;
-    //    delete ionLEIonC ;
-    //    delete ionLEIonAr ;
-    //    delete ionLEIonFe ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6RunMessenger.cc b/examples/extended/electromagnetic/TestEm6/src/Em6RunMessenger.cc
index 5dae51bcf1..48c1bf3acd 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6RunMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6RunMessenger.cc
@@ -28,8 +28,10 @@ Em6RunMessenger::Em6RunMessenger(Em6RunAction* RA)
   plotDir = new G4UIdirectory("/plots/");
   plotDir->SetGuidance("plot control");
 
+#ifndef G4NOHIST
   sethistNameCmd = new G4UIcmdWithAString("/plots/sethistName",this);
   sethistNameCmd->SetGuidance("set name for the histogram file"); 
+#endif
 
   setnbinStepCmd = new G4UIcmdWithAnInteger("/plots/setnbinStep",this);
   setnbinStepCmd->SetGuidance("set nb of bins in #step plot");
@@ -160,7 +162,9 @@ Em6RunMessenger::Em6RunMessenger(Em6RunAction* RA)
 
 Em6RunMessenger::~Em6RunMessenger()
 {
+#ifndef G4NOHIST
   delete sethistNameCmd;
+#endif
 
   delete setnbinStepCmd;
   delete setSteplowCmd;
@@ -211,10 +215,12 @@ Em6RunMessenger::~Em6RunMessenger()
 void Em6RunMessenger::
          SetNewValue(G4UIcommand* command,G4String newValues)
 {
+#ifndef G4NOHIST
   if( command == sethistNameCmd)
     runAction
     ->SethistName(newValues) ;
-    
+#endif    
+
   if( command == setnbinStepCmd)
     runAction
     ->SetnbinStep(setnbinStepCmd->GetNewIntValue(newValues));
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6StepCut.cc b/examples/extended/electromagnetic/TestEm6/src/Em6StepCut.cc
index 0da1157952..8fee956b74 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6StepCut.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6StepCut.cc
@@ -23,7 +23,7 @@ Em6StepCut::Em6StepCut(const G4String& aName)
   : G4VDiscreteProcess(aName),MaxChargedStep(DBL_MAX)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
 }
 
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6SteppingAction.cc b/examples/extended/electromagnetic/TestEm6/src/Em6SteppingAction.cc
index 51f0e881e1..548cd5ea52 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6SteppingAction.cc
@@ -22,7 +22,7 @@
 #include "G4EventManager.hh"
 #include "Em6SteppingMessenger.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "G4UImanager.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm6/src/Em6SteppingVerbose.cc
new file mode 100644
index 0000000000..8b8a42f96e
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em6SteppingVerbose.cc,v 1.2 1999/12/15 14:49:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em6SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em6SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em6SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em6SteppingVerbose::Em6SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em6SteppingVerbose::~Em6SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em6SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em6SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm6/src/Em6VisManager.cc b/examples/extended/electromagnetic/TestEm6/src/Em6VisManager.cc
index 8ee1f88537..6118c1e543 100644
--- a/examples/extended/electromagnetic/TestEm6/src/Em6VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/Em6VisManager.cc
@@ -128,7 +128,7 @@ void Em6VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/extended/electromagnetic/TestEm6/src/G4IonAr40.cc b/examples/extended/electromagnetic/TestEm6/src/G4IonAr40.cc
index 8d50e97447..a926811a66 100644
--- a/examples/extended/electromagnetic/TestEm6/src/G4IonAr40.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/G4IonAr40.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonAr40.cc,v 1.1.4.1 1999/12/07 20:47:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonAr40.cc,v 1.3 2000/01/19 20:55:13 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Fixed  parameters by H.Kurashige, 25 Apr 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4IonAr40.hh"
 
@@ -75,3 +75,5 @@ G4IonAr40* G4IonAr40::IonAr40Definition(){return &theIonAr40;}
 G4double   G4IonAr40::theIonAr40LengthCut;
 G4double*  G4IonAr40::theIonAr40KineticEnergyCuts;
 
+
+
diff --git a/examples/extended/electromagnetic/TestEm6/src/G4IonC12.cc b/examples/extended/electromagnetic/TestEm6/src/G4IonC12.cc
index 703fa44690..0537197594 100644
--- a/examples/extended/electromagnetic/TestEm6/src/G4IonC12.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/G4IonC12.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonC12.cc,v 1.1.4.1 1999/12/07 20:47:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonC12.cc,v 1.3 2000/01/19 20:55:13 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Fixed  parameters by H.Kurashige, 25 Apr 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4IonC12.hh"
 
diff --git a/examples/extended/electromagnetic/TestEm6/src/G4IonFe56.cc b/examples/extended/electromagnetic/TestEm6/src/G4IonFe56.cc
index c59d300b3a..a64c5c859d 100644
--- a/examples/extended/electromagnetic/TestEm6/src/G4IonFe56.cc
+++ b/examples/extended/electromagnetic/TestEm6/src/G4IonFe56.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonFe56.cc,v 1.1.4.1 1999/12/07 20:47:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonFe56.cc,v 1.3 2000/01/19 20:55:13 vnivanch Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Fixed  parameters by H.Kurashige, 25 Apr 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4IonFe56.hh"
 
diff --git a/examples/extended/electromagnetic/TestEm8/GNUmakefile b/examples/extended/electromagnetic/TestEm8/GNUmakefile
new file mode 100644
index 0000000000..dc2fedfe8c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/GNUmakefile
@@ -0,0 +1,22 @@
+# $Id: GNUmakefile,v 1.1 2000/01/07 14:48:45 grichine Exp $
+# --------------------------------------------------------------
+# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
+# --------------------------------------------------------------
+
+name := TestEm8
+G4TARGET := $(name)
+G4EXLIB := true
+
+ifndef G4INSTALL
+  G4INSTALL = ../../../../..
+endif
+
+.PHONY: all
+all: lib bin
+
+include $(G4INSTALL)/config/architecture.gmk
+
+LDFLAGS  += -L/cern/pro/lib
+LOADLIBS += -lpacklib $(FCLIBS)
+
+include $(G4INSTALL)/config/binmake.gmk
diff --git a/examples/extended/electromagnetic/TestEm8/README b/examples/extended/electromagnetic/TestEm8/README
new file mode 100644
index 0000000000..ff691ae968
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/README
@@ -0,0 +1,138 @@
+$Id: README,v 1.1 2000/01/07 14:49:04 grichine Exp $
+-------------------------------------------------------------------
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                            TestEm8 (based on TestEm5)  
+                            -------------------------
+
+    Test for investigation of ionisation in thin absorbers, transition 
+    and synchrotron radiations.
+
+	
+ 1- GEOMETRY DEFINITION
+ 
+ 	The "absorber" is a tube made of a given material.                
+ 	
+ 	Three parameters define the absorber :
+ 	- the material of the absorber,
+	- the thickness of an absorber,
+ 	- the transverse size of the absorber (the input face is a square). 
+    
+        The volume "World" contains the "absorber". 
+        In this test the parameters of the "World" can be changed , too.
+
+ 	In addition a transverse uniform magnetic field can be applied.
+ 	
+ 	The default geometry is constructed in DetectorConstruction class,
+ 	but all the parameters can be changed via
+ 	the commands defined in the DetectorMessenger class.
+ 	
+ 2- AN EVENT : THE PRIMARY GENERATOR
+ 
+ 	The primary kinematic consists of a single particle which hits the
+ 	absorber perpendicular to the input face. The type of the particle
+ 	and its energy are set in the PrimaryGeneratorAction class, and can
+ 	be changed via the G4 build-in commands of ParticleGun class (see
+ 	the macros provided with this example).
+ 	
+ 	A RUN is a set of events.
+ 	
+ 3- DETECTOR RESPONSE
+
+        Here we test G4PAIionisation , G4IonisationByLogicalVolume and 
+        transition radiation processes
+ 
+ 	A HIT is a record, event per event , of all the 
+ 	informations needed to simulate and analyse the detector response.
+ 	
+ 	In this example a CalorHit is defined as a set of 2 informations:
+ 	- the total energy deposit in the absorber,
+ 	- the total tracklength of all charged particles in the absorber,  
+ 	
+ 	Therefore  the absorber is declared
+ 	'sensitive detector' (SD), which means they can contribute to the hit.
+ 	
+ 	At the end of a run, from the histogram(s), one can study 
+	different physics quantities such as :
+                                - angle distribution,
+				- energy deposit,
+ 				- transmission/backscattering,
+ 				-  ...
+        
+        The test contains 10 built-in histograms, which can be activated by
+        interactive commands (see the macros runxx.mac for details).
+        The histograms/plots are in printed form in the corresponding 
+        resultxx (for GEANT4) and outxx (for GEANT3) files, and they are
+        saved as geant4.plotxx and geant3.plotxx histogram files, too.
+
+        The histogram files can be viewed using PAW e.g with the commands 
+
+                paw> h/file 1 geant4.plot01 or g4.p11
+                paw> option stat
+                paw> h/pl 1
+
+
+ 				
+ 4- PHYSICS DEMO
+ 
+ 	The particle's type and the physic processes which will be available
+ 	in this example are set in PhysicsList class.
+ 	
+ 	The  messenger classes introduce interactive commands . Using these
+        commands the geometry of the detector, the data of the primary
+        particle, the limits of the histograms , etc. can be changed.
+ 	
+
+ 5- HOW TO START ?
+ 
+ 	- compile and link to generate an executable
+ 		% cd TestEm8
+ 		% gmake
+ 		
+ 	- execute TestEm5 in 'batch' mode from macro files e.g.
+ 		% $(G4INSTALL)/bin/$(G4SYSTEM)/TestEm8   run11.mac
+		
+ 	- execute TestEm5 in 'interactive' mode with visualization e.g.
+ 		% $(G4INSTALL)/bin/$(G4SYSTEM)/TestEm8
+		....
+		Idle> type your commands
+		....
+		
+ 6- GEANT4/GEANT3/exp.data comparison
+
+        A GEANT4/GEANT3/exp. data comparison is given here for a few cases.
+        
+        The GEANT4 results can be found in the results/ directory, the resultxx
+        output was obtained with the runxx.mac macro.
+
+        The relevant part of the GEANT3 code is in the geant3/ directory
+        together with the runxx.dat input files. The outputs of the GEANT3 runs
+        geant3/results subdirectory.
+	
+        In order to make an executable of GEANT3 the gmakeB command should be
+        used in the geant3/ subdirectory.To run this executable with a given
+        input file the input file name should be given when it is being asked
+        by the program.(see geant3/README)
+ 		
+ 	The expdata/  directory contains some information
+        on the experimental data. 
+ 	  
+ 	
+ List of the built-in histograms
+ -------------------------------
+
+        1.   number of (tracking) steps/event
+        2.   energy deposit distribution in the absorber (in MeV)
+        3.   angle distribution of the primary particle at the exit
+             of the absorber (deg)
+        4.   distribution of the lateral displacement at exit(mm)
+        5.   kinetic energy of the transmitted primaries (MeV)
+        6.   angle distribution of the backscattered primaries (deg)
+        7.   kinetic energy of the backscattered primary particles (MeV)
+        8.   kinetic energy of the charged secondary particles (MeV)
+        9.   z distribution of the secondary charged vertices (mm)
+       10.   kinetic energy of the photons escaping the absorber (MeV)
+        
diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.cc b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
new file mode 100644
index 0000000000..d043d41afb
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
@@ -0,0 +1,119 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: TestEm8.cc,v 1.1 2000/01/07 14:49:19 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+// --------------------------------------------------------------
+//      GEANT 4 - TestEm8 
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD Group
+// --------------------------------------------------------------
+// Comments
+//     
+//   
+// --------------------------------------------------------------
+
+#include "G4RunManager.hh"
+#include "G4UImanager.hh"
+#include "G4UIterminal.hh"
+#include "Randomize.hh"
+
+#ifdef G4VIS_USE
+#include "Em8VisManager.hh"
+#endif
+
+#include "Em8DetectorConstruction.hh"
+#include "Em8PhysicsList.hh"
+#include "Em8PrimaryGeneratorAction.hh"
+#include "Em8RunAction.hh"
+#include "Em8EventAction.hh"
+#include "Em8SteppingAction.hh"
+#include "Em8SteppingVerbose.hh"
+
+int main(int argc,char** argv) 
+{
+
+  //choose the Random engine
+
+  HepRandom::setTheEngine(new RanecuEngine);
+  
+  //my Verbose output class
+
+  G4VSteppingVerbose::SetInstance(new Em8SteppingVerbose);
+    
+  // Construct the default run manager
+
+  G4RunManager * runManager = new G4RunManager;
+
+  // set mandatory initialization classes
+
+  Em8DetectorConstruction* detector;
+  detector = new Em8DetectorConstruction;
+  runManager->SetUserInitialization(detector);
+  runManager->SetUserInitialization(new Em8PhysicsList(detector));
+  
+#ifdef G4VIS_USE
+
+  // visualization manager
+
+  G4VisManager* visManager = new Em8VisManager;
+  visManager->Initialize();
+
+#endif 
+ 
+  // set user action classes
+
+  runManager->SetUserAction(new Em8PrimaryGeneratorAction(detector));
+
+  Em8RunAction* runAction = new Em8RunAction;
+
+  runManager->SetUserAction(runAction);
+
+  Em8EventAction* eventAction = new Em8EventAction(runAction);
+
+  runManager->SetUserAction(eventAction);
+
+  Em8SteppingAction* steppingAction = new Em8SteppingAction(detector,
+                                                            eventAction, 
+                                                            runAction);
+  runManager->SetUserAction(steppingAction);
+  
+  //Initialize G4 kernel, physics tables ...
+
+  runManager->Initialize();
+    
+  // get the pointer to the User Interface manager 
+
+  G4UImanager* UI = G4UImanager::GetUIpointer();  
+ 
+  if (argc==1)   // Define UI terminal for interactive mode  
+  { 
+     G4UIsession * session = new G4UIterminal;
+     UI->ApplyCommand("/control/execute init.mac");    
+     session->SessionStart();
+     delete session;
+  }
+  else           // Batch mode
+  { 
+     G4String command = "/control/execute ";
+     G4String fileName = argv[1];
+     UI->ApplyCommand(command+fileName);
+  }
+    
+  // job termination
+
+#ifdef G4VIS_USE
+  delete visManager;
+#endif  
+  delete runManager;
+
+  return 0;
+}
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
new file mode 100644
index 0000000000..56694624a5
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
@@ -0,0 +1,81 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8CalorHit.hh,v 1.1 2000/01/07 14:50:20 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8CalorHit_h
+#define Em8CalorHit_h 1
+
+#include "G4VHit.hh"
+#include "G4THitsCollection.hh"
+#include "G4Allocator.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8CalorHit : public G4VHit
+{
+  public:
+
+      Em8CalorHit();
+     ~Em8CalorHit();
+      Em8CalorHit(const Em8CalorHit&);
+      const Em8CalorHit& operator=(const Em8CalorHit&);
+      int operator==(const Em8CalorHit&) const;
+
+      inline void* operator new(size_t);
+      inline void  operator delete(void*);
+
+      void Print();
+      
+  public:
+  
+      void AddAbs(G4double de, G4double dl) {EdepAbs += de; TrackLengthAbs += dl;};
+      void AddGap(G4double de, G4double dl) {EdepGap += de; TrackLengthGap += dl;};      
+                 
+      G4double GetEdepAbs()     { return EdepAbs; };
+      G4double GetTrakAbs()     { return TrackLengthAbs; };
+      G4double GetEdepGap()     { return EdepGap; };
+      G4double GetTrakGap()     { return TrackLengthGap; };
+     
+  private:
+  
+      G4double EdepAbs, TrackLengthAbs;
+      G4double EdepGap, TrackLengthGap;
+      
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+typedef G4THitsCollection<Em8CalorHit> Em8CalorHitsCollection;
+
+extern G4Allocator<Em8CalorHit> Em8CalorHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void* Em8CalorHit::operator new(size_t)
+{
+  void* aHit;
+  aHit = (void*) Em8CalorHitAllocator.MallocSingle();
+  return aHit;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void Em8CalorHit::operator delete(void* aHit)
+{
+  Em8CalorHitAllocator.FreeSingle((Em8CalorHit*) aHit);
+}
+
+#endif
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
new file mode 100644
index 0000000000..a391edbf1e
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
@@ -0,0 +1,50 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8CalorimeterSD.hh,v 1.1 2000/01/07 14:50:20 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8CalorimeterSD_h
+#define Em8CalorimeterSD_h 1
+
+#include "G4VSensitiveDetector.hh"
+#include "globals.hh"
+
+class Em8DetectorConstruction;
+class G4HCofThisEvent;
+class G4Step;
+#include "Em8CalorHit.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8CalorimeterSD : public G4VSensitiveDetector
+{
+  public:
+  
+      Em8CalorimeterSD(G4String, Em8DetectorConstruction* );
+     ~Em8CalorimeterSD();
+
+      void Initialize(G4HCofThisEvent*);
+      G4bool ProcessHits(G4Step*,G4TouchableHistory*);
+      void EndOfEvent(G4HCofThisEvent*);
+      void clear();
+      void PrintAll();
+
+  private:
+  
+      Em8CalorHitsCollection*  CalCollection;      
+      Em8DetectorConstruction* Detector;
+      G4int*                   HitID;
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
new file mode 100644
index 0000000000..71781b1211
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
@@ -0,0 +1,156 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8DetectorConstruction.hh,v 1.1 2000/01/07 14:50:20 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8DetectorConstruction_h
+#define Em8DetectorConstruction_h 1
+
+#include "G4VUserDetectorConstruction.hh"
+#include "globals.hh"
+#include "G4ios.hh"
+
+class G4Box;
+class G4Tubs;
+class G4LogicalVolume;
+class G4VPhysicalVolume;
+class G4Material;
+class G4UniformMagField;
+class Em8DetectorMessenger;
+class Em8CalorimeterSD;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8DetectorConstruction : public G4VUserDetectorConstruction
+{
+  public:
+  
+    Em8DetectorConstruction();
+   ~Em8DetectorConstruction();
+
+  public:
+     
+     void SetAbsorberMaterial (G4String);     
+     void SetAbsorberThickness(G4double);     
+     void SetAbsorberRadius(G4double);          
+      
+     void SetAbsorberZpos(G4double);
+
+     void SetWorldMaterial(G4String);
+     void SetWorldSizeZ(G4double);
+     void SetWorldSizeR(G4double);
+
+     void SetMagField(G4double);
+     
+     G4VPhysicalVolume* Construct();
+
+     void UpdateGeometry();
+     
+  public:
+  
+     void PrintCalorParameters(); 
+                    
+     G4Material* GetWorldMaterial()    {return WorldMaterial;};
+     G4double GetWorldSizeZ()          {return WorldSizeZ;}; 
+     G4double GetWorldSizeR()          {return WorldSizeR;};
+     
+     G4double GetAbsorberZpos()        {return zAbsorber;}; 
+     G4double GetzstartAbs()           {return zstartAbs;};
+     G4double GetzendAbs()             {return zendAbs;};
+
+     G4Material* GetAbsorberMaterial()  {return AbsorberMaterial;};
+     G4double    GetAbsorberThickness() {return AbsorberThickness;};      
+     G4double GetAbsorberRadius()       {return AbsorberRadius;};
+     
+     const G4VPhysicalVolume* GetphysiWorld() {return physiWorld;};           
+     const G4VPhysicalVolume* GetAbsorber()   {return physiAbsorber;};
+     G4LogicalVolume* GetLogicalAbsorber()   {return logicAbsorber;};
+                 
+  private:
+     
+     G4bool             worldchanged;
+     G4Material*        AbsorberMaterial;
+     G4double           AbsorberThickness;
+     G4double           AbsorberRadius;
+ 
+     G4double           zAbsorber ;
+     G4double           zstartAbs , zendAbs ;
+     
+     G4Material*        WorldMaterial;
+     G4double           WorldSizeR;
+     G4double           WorldSizeZ;
+            
+     G4Tubs*             solidWorld;    //pointer to the solid World 
+     G4LogicalVolume*   logicWorld;    //pointer to the logical World
+     G4VPhysicalVolume* physiWorld;    //pointer to the physical World
+
+  // TR radiator volumes and dimensions
+          
+     G4Tubs*            fSolidRadSlice;   // pointer to the solid  z-slice 
+     G4LogicalVolume*   fLogicRadSlice;   // pointer to the logical z-slide
+     G4VPhysicalVolume* fPhysicRadSlice;  // pointer to the physical z-slide
+
+     G4Tubs*            fSolidRadRing;    // pointer to the solid  R-slice 
+     G4LogicalVolume*   fLogicRadRing;    // pointer to the logical R-slide
+     G4VPhysicalVolume* fPhysicRadRing;   // pointer to the physical R-slide
+
+     G4Material* fRadiatorMat;        //pointer to the TR radiator material
+
+     G4double fRadThickness ;
+     G4double fGasGap       ;
+
+     G4int fFoilNumber ;
+
+     G4double fDetThickness ;
+     G4double fDetLength    ;
+     G4double fDetGap       ;
+
+     G4double fStartR       ;
+     G4double fStartZ       ;
+
+     G4int fModuleNumber ;   // the number of Rad-Det modules
+
+     G4Tubs*             solidAbsorber; //pointer to the solid Absorber
+     G4LogicalVolume*   logicAbsorber; //pointer to the logical Absorber
+     G4VPhysicalVolume* physiAbsorber; //pointer to the physical Absorber
+     
+     G4UniformMagField* magField;      //pointer to the magnetic field
+     
+     Em8DetectorMessenger* detectorMessenger;  //pointer to the Messenger
+     Em8CalorimeterSD* calorimeterSD;  //pointer to the sensitive detector
+      
+  private:
+    
+     void DefineMaterials();
+     void ComputeCalorParameters();
+     G4VPhysicalVolume* ConstructCalorimeter();     
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void Em8DetectorConstruction::ComputeCalorParameters()
+{
+  // Compute derived parameters of the calorimeter
+     if(!worldchanged)
+     {
+       //  WorldSizeR=2.*AbsorberRadius ;
+       //  WorldSizeZ=2.*AbsorberThickness ;
+     }
+     
+     zstartAbs = zAbsorber-0.5*AbsorberThickness; 
+     zendAbs   = zAbsorber+0.5*AbsorberThickness; 
+
+}
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
new file mode 100644
index 0000000000..b58d009336
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
@@ -0,0 +1,60 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8DetectorMessenger.hh,v 1.1 2000/01/07 14:50:21 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8DetectorMessenger_h
+#define Em8DetectorMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+
+class Em8DetectorConstruction;
+class G4UIdirectory;
+class G4UIcmdWithAString;
+class G4UIcmdWithAnInteger;
+class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWithoutParameter;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8DetectorMessenger: public G4UImessenger
+{
+  public:
+    Em8DetectorMessenger(Em8DetectorConstruction* );
+   ~Em8DetectorMessenger();
+    
+    void SetNewValue(G4UIcommand*, G4String);
+    
+  private:
+    Em8DetectorConstruction*   Em8Detector;
+    
+    G4UIdirectory*             Em8detDir;
+
+    G4UIcmdWithAString*        AbsMaterCmd;
+    G4UIcmdWithADoubleAndUnit* AbsThickCmd;
+    G4UIcmdWithADoubleAndUnit* AbsRadCmd;
+
+    G4UIcmdWithADoubleAndUnit* AbsZposCmd;
+
+    G4UIcmdWithAString*        WorldMaterCmd;
+    G4UIcmdWithADoubleAndUnit* WorldZCmd;
+    G4UIcmdWithADoubleAndUnit* WorldRCmd;
+
+    G4UIcmdWithADoubleAndUnit* MagFieldCmd;
+    G4UIcmdWithoutParameter*   UpdateCmd;
+
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
new file mode 100644
index 0000000000..c35bd1e2d9
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
@@ -0,0 +1,67 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8EventAction.hh,v 1.1 2000/01/07 14:50:21 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8EventAction_h
+#define Em8EventAction_h 1
+
+#include "G4UserEventAction.hh"
+#include "globals.hh"
+
+class Em8RunAction;
+class Em8EventActionMessenger;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8EventAction : public G4UserEventAction
+{
+  public:
+    Em8EventAction(Em8RunAction* Em8RA);
+   ~Em8EventAction();
+
+  public:
+    void BeginOfEventAction(const G4Event*);
+    void   EndOfEventAction(const G4Event*);
+    G4int GetEventno();
+    void setEventVerbose(G4int level);
+    
+    void CountStepsCharged() ;
+    void CountStepsNeutral() ;
+    void AddCharged() ;
+    void AddNeutral() ;
+    void AddE();
+    void AddP();   
+    void SetTr();
+    void SetRef();
+    
+    void SetDrawFlag(G4String val)  {drawFlag = val;};
+    void SetPrintModulo(G4int val)  {printModulo = val;};
+        
+  private:
+    G4int    calorimeterCollID;
+    Em8EventActionMessenger*  eventMessenger;
+    Em8RunAction* runaction;
+    G4int verboselevel;
+    G4double nstep,nstepCharged,nstepNeutral;
+    G4double Nch,Nne;
+    G4double NE,NP;
+    G4double Transmitted,Reflected ;
+    
+    G4String drawFlag;
+    G4int    printModulo;             
+};
+
+#endif
+
+    
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
new file mode 100644
index 0000000000..4edf6fcc67
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
@@ -0,0 +1,44 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8EventActionMessenger.hh,v 1.1 2000/01/07 14:50:21 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8EventActionMessenger_h
+#define Em8EventActionMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+
+class Em8EventAction;
+class G4UIcmdWithAString;
+class G4UIcmdWithAnInteger;
+class G4UIcmdWithADoubleAndUnit;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8EventActionMessenger: public G4UImessenger
+{
+  public:
+    Em8EventActionMessenger(Em8EventAction*);
+   ~Em8EventActionMessenger();
+    
+    void SetNewValue(G4UIcommand*, G4String);
+    
+  private:
+    Em8EventAction* eventAction;   
+    G4UIcmdWithAnInteger* setVerboseCmd;
+    G4UIcmdWithAString*   DrawCmd;
+    G4UIcmdWithAnInteger* PrintCmd;
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
new file mode 100644
index 0000000000..5c85579f47
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
@@ -0,0 +1,118 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PhysicsList.hh,v 1.1 2000/01/07 14:50:21 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8PhysicsList_h
+#define Em8PhysicsList_h 1
+
+#include "G4VUserPhysicsList.hh"
+#include "globals.hh"
+
+class G4PhotoElectricEffect;
+class G4ComptonScattering;
+class G4GammaConversion;
+
+class G4MultipleScattering;
+
+class G4PAIonisation ;
+class G4ForwardXrayTR ;
+class G4eIonisation;
+class G4eBremsstrahlung;
+class G4eplusAnnihilation;
+
+class G4MuIonisation;
+class G4MuBremsstrahlung;
+class G4MuPairProduction;
+
+class G4hIonisation;
+class G4hIonisationPlus;
+
+class Em8StepCut;
+
+class Em8DetectorConstruction;
+class Em8PhysicsListMessenger;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8PhysicsList: public G4VUserPhysicsList
+{
+  public:
+    Em8PhysicsList( Em8DetectorConstruction*);
+   ~Em8PhysicsList();
+
+  protected:
+    // Construct particle and physics
+    void ConstructParticle();
+    void ConstructProcess();
+ 
+    void SetCuts();
+
+  protected:
+    // these methods Construct particles 
+    void ConstructBosons();
+    void ConstructLeptons();
+    void ConstructMesons();
+    void ConstructBarions();
+
+  protected:
+  // these methods Construct physics processes and register them
+    void ConstructGeneral();
+    void ConstructEM();
+    
+  public:
+
+    void SetGammaCut(G4double);
+    void SetElectronCut(G4double);
+    void SetProtonCut(G4double);
+    void SetCutsByEnergy(G4double);
+    void GetRange(G4double);
+
+    void SetMaxStep(G4double);
+
+  public:   
+
+    G4double MaxChargedStep;
+
+  private:
+
+    G4PhotoElectricEffect* thePhotoElectricEffect;
+    G4ComptonScattering*   theComptonScattering;
+    G4GammaConversion*     theGammaConversion;
+    
+    G4MultipleScattering*  theeminusMultipleScattering;
+    G4eIonisation*         theeminusIonisation;
+    G4eBremsstrahlung*     theeminusBremsstrahlung;
+
+    G4PAIonisation*        fPAIonisation ;
+    G4ForwardXrayTR*       fForwardXrayTR ;
+    
+    G4MultipleScattering*  theeplusMultipleScattering;
+    G4eIonisation*         theeplusIonisation;
+    G4eBremsstrahlung*     theeplusBremsstrahlung;
+    G4eplusAnnihilation*   theeplusAnnihilation;
+
+    Em8StepCut* theeminusStepCut ;
+    Em8StepCut* theeplusStepCut ;
+
+    G4double cutForGamma;
+    G4double cutForElectron;
+    G4double cutForProton;
+
+    Em8DetectorConstruction* pDet;
+    Em8PhysicsListMessenger* physicsListMessenger;
+};
+
+#endif
+
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
new file mode 100644
index 0000000000..af6b5c107c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
@@ -0,0 +1,50 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PhysicsListMessenger.hh,v 1.1 2000/01/07 14:50:22 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8PhysicsListMessenger_h
+#define Em8PhysicsListMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+
+class Em8PhysicsList;
+class G4UIcmdWithoutParameter;
+class G4UIcmdWithADouble;
+class G4UIcmdWithADoubleAndUnit;
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8PhysicsListMessenger: public G4UImessenger
+{
+  public:
+    Em8PhysicsListMessenger(Em8PhysicsList*);
+   ~Em8PhysicsListMessenger();
+    
+    void SetNewValue(G4UIcommand*, G4String);
+    
+  private:
+    Em8PhysicsList*          Em8List;
+
+    G4UIcmdWithADoubleAndUnit* setMaxStepCmd;
+
+    G4UIcmdWithADoubleAndUnit* cutGCmd;
+    G4UIcmdWithADoubleAndUnit* cutECmd;
+    G4UIcmdWithADoubleAndUnit* cutPCmd;
+    G4UIcmdWithADoubleAndUnit* rCmd;
+    G4UIcmdWithADoubleAndUnit* eCmd;
+ 
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
new file mode 100644
index 0000000000..8498501a30
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
@@ -0,0 +1,59 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PrimaryGeneratorAction.hh,v 1.1 2000/01/07 14:50:22 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8PrimaryGeneratorAction_h
+#define Em8PrimaryGeneratorAction_h 1
+
+#include "G4VUserPrimaryGeneratorAction.hh"
+#include "globals.hh"
+
+class G4ParticleGun;
+class G4Event;
+class Em8DetectorConstruction;
+class Em8PrimaryGeneratorMessenger;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
+{
+  public:
+    Em8PrimaryGeneratorAction(Em8DetectorConstruction*);    
+   ~Em8PrimaryGeneratorAction();
+
+  public:
+    void GeneratePrimaries(G4Event*);
+    void SetRndmFlag(G4String val) { rndmFlag = val;}
+    void Setxvertex(G4double x) ;
+    void Setyvertex(G4double y) ;
+    void Setzvertex(G4double z) ;
+
+    static G4String GetPrimaryName() ;                
+
+  private:
+    G4ParticleGun*                particleGun;	//pointer a to G4 service class
+    Em8DetectorConstruction*      Em8Detector; //pointer to the geometry
+    
+    Em8PrimaryGeneratorMessenger* gunMessenger; //messenger of this class
+    G4String                      rndmFlag;	//flag for a random impact point       
+
+    static G4String thePrimaryParticleName ;
+    G4double xvertex,yvertex,zvertex;
+    G4bool vertexdefined ;
+
+};
+
+#endif
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
new file mode 100644
index 0000000000..9231551eef
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
@@ -0,0 +1,45 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PrimaryGeneratorMessenger.hh,v 1.1 2000/01/07 14:50:22 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8PrimaryGeneratorMessenger_h
+#define Em8PrimaryGeneratorMessenger_h 1
+
+#include "G4UImessenger.hh"
+#include "globals.hh"
+
+class Em8PrimaryGeneratorAction;
+class G4UIcmdWithAString;
+class G4UIcmdWithADoubleAndUnit;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8PrimaryGeneratorMessenger: public G4UImessenger
+{
+  public:
+    Em8PrimaryGeneratorMessenger(Em8PrimaryGeneratorAction*);
+   ~Em8PrimaryGeneratorMessenger();
+    
+    void SetNewValue(G4UIcommand*, G4String);
+    
+  private:
+    Em8PrimaryGeneratorAction* Em8Action; 
+    G4UIcmdWithAString*        RndmCmd;
+    G4UIcmdWithADoubleAndUnit* setxvertexCmd;
+    G4UIcmdWithADoubleAndUnit* setyvertexCmd;
+    G4UIcmdWithADoubleAndUnit* setzvertexCmd;
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
new file mode 100644
index 0000000000..325686bdb3
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8RunAction.hh,v 1.1 2000/01/07 14:50:22 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8RunAction_h
+#define Em8RunAction_h 1
+
+#include "G4UserRunAction.hh"
+#include "globals.hh"
+#include <iostream.h>
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8RunMessenger;
+
+class HepTupleManager;
+class HepHistogram;
+
+class G4Run;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8RunAction : public G4UserRunAction
+{
+  public:
+    Em8RunAction();
+   ~Em8RunAction();
+
+  public:
+    void BeginOfRunAction(const G4Run*);
+    void   EndOfRunAction(const G4Run*);
+
+    void CountEvent();
+    void CountParticles(G4double,G4double);
+    void AddEP(G4double,G4double);
+    void AddEdeps(G4double Eabs); 
+    void AddTrackLength(G4double tlabs); 
+    void AddnStepsCharged(G4double ns);
+    void AddnStepsNeutral(G4double ns);
+
+    void AddTrRef(G4double tr,G4double ref);
+
+    void FillEn(G4double En);
+    void FillTh(G4double Th);
+    void FillThBack(G4double Th);
+    void FillR(G4double R);
+    void FillTt(G4double Tt);
+    void FillTb(G4double Tt);
+    void FillTsec(G4double T);
+    void FillGammaSpectrum(G4double E);
+    void FillNbOfSteps(G4double nstep);
+    void Fillvertexz(G4double z);
+
+    void SethistName(G4String name) ;
+
+    void SetnbinStep(G4int nbin);
+    void SetSteplow(G4double Slow);
+    void SetStephigh(G4double Shigh);
+
+    void SetnbinEn(G4int nbin);
+    void SetEnlow(G4double Elow);
+    void SetEnhigh(G4double Enhigh);
+
+    void SetnbinTt(G4int nbin);
+    void SetTtlow(G4double Ttlow);
+    void SetTthigh(G4double Tthigh);
+
+    void SetnbinTb(G4int nbin);
+    void SetTblow(G4double Tblow);
+    void SetTbhigh(G4double Tbhigh);
+
+    void SetnbinTsec(G4int nbin);
+    void SetTseclow(G4double Tlow);
+    void SetTsechigh(G4double Thigh);
+
+    void SetnbinTh(G4int nbin);
+    void SetThlow(G4double Thlow);
+    void SetThhigh(G4double Thhigh);
+
+    void SetnbinThBack(G4int nbin);
+    void SetThlowBack(G4double Thlow);
+    void SetThhighBack(G4double Thhigh);
+
+    void SetnbinR(G4int nbin);
+    void SetRlow(G4double Rlow);
+    void SetRhigh(G4double Rhigh);
+
+    void SetnbinGamma(G4int nbin);
+    void SetElowGamma(G4double Elow);
+    void SetEhighGamma(G4double Ehigh);
+
+    void Setnbinzvertex(G4int nbin);
+    void Setzlow(G4double z);
+    void Setzhigh(G4double z);
+    
+    void  SetRndmFreq(G4int val) {saveRndm = val;}
+    G4int GetRndmFreq()          {return saveRndm;}
+    
+  private:
+
+    void bookHisto();
+
+  private:
+
+    G4String histName ;
+    HepTupleManager* hbookManager;
+    HepHistogram *histo1, *histo2, *histo3, *histo4, *histo5 ;
+    HepHistogram *histo6, *histo7, *histo8, *histo9, *histo10;
+
+    G4double EnergySumAbs,EnergySquareSumAbs;
+    G4double tlSumAbs,tlsquareSumAbs;
+    G4double nStepSumCharged,nStepSum2Charged ;
+    G4double nStepSumNeutral,nStepSum2Neutral ;
+    G4double TotNbofEvents;
+    G4double SumCharged,Sum2Charged,SumNeutral,Sum2Neutral;
+    G4double Selectron,Spositron;
+
+    G4double Transmitted,Reflected ;
+
+    G4double entryStep,underStep,overStep,distStep[200];
+    G4double Steplow,Stephigh,dStep;
+    G4int    nbinStep;
+    G4double entryEn,underEn,overEn,distEn[200];
+    G4double Enlow,Enhigh,dEn;
+    G4int    nbinEn;
+    G4double entryTt,underTt,overTt,distTt[200];
+    G4double Ttlow,Tthigh,dTt;
+    G4int    nbinTt;
+    G4double Ttmean,Tt2mean;
+    G4double entryTb,underTb,overTb,distTb[200];
+    G4double Tblow,Tbhigh,dTb;
+    G4int    nbinTb;
+    G4double Tbmean,Tb2mean;
+    G4double entryTsec,underTsec,overTsec,distTsec[200];
+    G4double Tseclow,Tsechigh,dTsec;
+    G4int    nbinTsec;
+    G4double entryTh,underTh,overTh,distTh[200];
+    G4double Thlow,Thhigh,dTh;
+    G4int    nbinTh;
+    G4double entryThback,underThback,overThback,distThback[200];
+    G4double Thlowback,Thhighback,dThback;
+    G4int    nbinThback;
+    G4double entryR ,underR ,overR ,distR[200];
+    G4double Rlow,Rhigh,dR;
+    G4int    nbinR;
+    G4double Rmean,R2mean;
+    G4double entryGamma,underGamma,overGamma,distGamma[200];
+    G4double ElowGamma,EhighGamma,dEGamma;
+    G4int nbinGamma ;
+    G4double entryvertexz,undervertexz,oververtexz,distvertexz[200];
+    G4double zlow,zhigh,dz;
+    G4int nbinvertexz;
+ 
+    Em8RunMessenger* runMessenger;
+    G4int saveRndm;    
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
new file mode 100644
index 0000000000..2bfe049919
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
@@ -0,0 +1,99 @@
+
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8RunMessenger.hh,v 1.1 2000/01/07 14:50:22 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8RunMessenger_h
+#define Em8RunMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8RunAction;
+class G4UIdirectory;
+class G4UIcmdWithAnInteger;
+class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWithADouble;
+class G4UIcmdWithAString;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8RunMessenger: public G4UImessenger
+{
+  public:
+
+   Em8RunMessenger(Em8RunAction* );
+  ~Em8RunMessenger();
+
+   void SetNewValue(G4UIcommand* ,G4String );
+
+  private:
+
+   Em8RunAction*              runAction;
+   
+   G4UIdirectory*             plotDir;   
+
+   G4UIcmdWithAString*        sethistNameCmd;
+
+   G4UIcmdWithAnInteger*      setnbinStepCmd; 
+   G4UIcmdWithADouble*        setSteplowCmd; 
+   G4UIcmdWithADouble*        setStephighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinEnCmd; 
+   G4UIcmdWithADoubleAndUnit* setEnlowCmd; 
+   G4UIcmdWithADoubleAndUnit* setEnhighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinGammaCmd; 
+   G4UIcmdWithADoubleAndUnit* setElowGammaCmd; 
+   G4UIcmdWithADoubleAndUnit* setEhighGammaCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinTtCmd; 
+   G4UIcmdWithADoubleAndUnit* setTtlowCmd; 
+   G4UIcmdWithADoubleAndUnit* setTthighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinTbCmd; 
+   G4UIcmdWithADoubleAndUnit* setTblowCmd; 
+   G4UIcmdWithADoubleAndUnit* setTbhighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinTsecCmd; 
+   G4UIcmdWithADoubleAndUnit* setTseclowCmd; 
+   G4UIcmdWithADoubleAndUnit* setTsechighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinRCmd; 
+   G4UIcmdWithADoubleAndUnit* setRlowCmd; 
+   G4UIcmdWithADoubleAndUnit* setRhighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinThCmd; 
+   G4UIcmdWithADoubleAndUnit* setThlowCmd; 
+   G4UIcmdWithADoubleAndUnit* setThhighCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinThbackCmd; 
+   G4UIcmdWithADoubleAndUnit* setThlowbackCmd; 
+   G4UIcmdWithADoubleAndUnit* setThhighbackCmd; 
+
+   G4UIcmdWithAnInteger*      setnbinzvertexCmd; 
+   G4UIcmdWithADoubleAndUnit* setzlowCmd; 
+   G4UIcmdWithADoubleAndUnit* setzhighCmd;
+   
+   G4UIdirectory*             RndmDir;
+   G4UIcmdWithAnInteger*      RndmSaveCmd;    
+   G4UIcmdWithAString*        RndmReadCmd;    
+ 
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
new file mode 100644
index 0000000000..4463ee8a1b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
@@ -0,0 +1,117 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8StepCut.hh,v 1.1 2000/01/07 14:50:23 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+//
+//	For information related to this code contact:
+//	CERN, CN Division, ASD group
+// ------------------------------------------------------------
+//                  05 March 1999  L.Urban
+// ------------------------------------------------------------
+
+#ifndef Em8StepCut_h
+#define Em8StepCut_h 1
+
+#include "G4ios.hh"
+#include "globals.hh"
+#include "G4VDiscreteProcess.hh"
+#include "G4Step.hh"
+
+class Em8StepCut : public G4VDiscreteProcess
+{
+  public:     
+
+     Em8StepCut(const G4String& processName ="UserStepCut" );
+     Em8StepCut(Em8StepCut &);
+
+     ~Em8StepCut();
+
+     G4double PostStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+			     G4double   previousStepSize,
+			     G4ForceCondition* condition
+			    );
+
+     G4VParticleChange* PostStepDoIt(
+			     const G4Track& ,
+			     const G4Step& 
+			    );
+
+    void SetMaxStep(G4double);
+
+  protected:
+
+     // it is not needed here !
+     G4double GetMeanFreePath(const G4Track& aTrack,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            );
+
+			    
+  private:
+  
+  // hide assignment operator as private 
+      Em8StepCut & operator=(const Em8StepCut &right);
+
+  private:
+
+     G4double MaxChargedStep ;
+};
+
+// inlined function members implementation
+
+#include "G4Step.hh"
+#include "G4Track.hh"
+#include "G4UserLimits.hh"
+#include "G4VParticleChange.hh"
+#include "G4EnergyLossTables.hh"
+
+inline G4double Em8StepCut::PostStepGetPhysicalInteractionLength(
+                             const G4Track& aTrack,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            )
+{
+  // condition is set to "Not Forced"
+  *condition = NotForced;
+
+   G4double ProposedStep = DBL_MAX;
+
+   if((MaxChargedStep > 0.) &&
+      (aTrack.GetVolume() != NULL) &&
+      (aTrack.GetVolume()->GetName() == "Absorber") &&
+      (aTrack.GetDynamicParticle()->GetDefinition()->GetPDGCharge() != 0.))
+        ProposedStep = MaxChargedStep ;
+
+   return ProposedStep;
+}
+
+inline G4VParticleChange* Em8StepCut::PostStepDoIt(
+                             const G4Track& aTrack,
+                             const G4Step&
+                            )
+{
+   // do nothing
+   aParticleChange.Initialize(aTrack);
+   return &aParticleChange;
+}
+
+inline G4double Em8StepCut::GetMeanFreePath(const G4Track& aTrack,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            )
+{
+  return 0.;
+}
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
new file mode 100644
index 0000000000..e93c89d933
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
@@ -0,0 +1,52 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingAction.hh,v 1.1 2000/01/07 14:50:23 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8SteppingAction_h
+#define Em8SteppingAction_h 1
+
+#include "G4UserSteppingAction.hh"
+#include "G4Event.hh"
+#include "G4EventManager.hh"
+#include "G4ios.hh"
+#include "globals.hh"
+
+class Em8DetectorConstruction;
+class Em8RunAction;
+class Em8EventAction;
+class Em8SteppingMessenger;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8SteppingAction : public G4UserSteppingAction
+{
+  public:
+    Em8SteppingAction(Em8DetectorConstruction*, Em8EventAction*,
+                      Em8RunAction* );
+   ~Em8SteppingAction();
+
+    void UserSteppingAction(const G4Step*);
+
+  private:
+    Em8DetectorConstruction* detector;
+    Em8EventAction*          eventaction;
+    Em8RunAction*            runaction;
+    Em8SteppingMessenger*    steppingMessenger;
+
+    G4int IDnow,IDold;
+    G4int evnoold ;
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
new file mode 100644
index 0000000000..bcbf41ee97
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingMessenger.hh,v 1.1 2000/01/07 14:50:23 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8SteppingMessenger_h
+#define Em8SteppingMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8SteppingAction;
+class G4UIdirectory;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8SteppingMessenger: public G4UImessenger
+{
+  public:
+
+   Em8SteppingMessenger(Em8SteppingAction* );
+  ~Em8SteppingMessenger();
+
+   void SetNewValue(G4UIcommand* ,G4String );
+
+  private:
+
+   Em8SteppingAction* steppingAction;
+
+   G4UIdirectory*     steppingDir;
+
+};
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
new file mode 100644
index 0000000000..d206ddb3be
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingVerbose.hh,v 1.1 2000/01/07 14:50:23 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// Em8SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class Em8SteppingVerbose;
+
+#ifndef Em8SteppingVerbose_h
+#define Em8SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class Em8SteppingVerbose : public G4SteppingVerbose 
+{
+  public:   
+         // Constructor/Destructor
+
+    Em8SteppingVerbose();
+   ~Em8SteppingVerbose();
+
+    void StepInfo();
+    void TrackingStarted();
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
new file mode 100644
index 0000000000..5d1afb4283
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
@@ -0,0 +1,50 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8VisManager.hh,v 1.1 2000/01/07 14:50:24 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// Example Visualization Manager implementing virtual function
+//   RegisterGraphicsSystems.  Exploits C-pre-processor variables
+//   G4VIS_USE_DAWN, etc., which are set by the GNUmakefiles if
+//   environment variables of the same name are set.
+
+// So all you have to do is set environment variables and compile and
+//   instantiate this in your main().
+
+// Alternatively, you can implement an empty function here and just
+//   register the systems you want in your main(), e.g.:
+//   G4VisManager* myVisManager = new MyVisManager;
+//   myVisManager -> RegisterGraphicsSystem (new MyGraphicsSystem);
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifndef Em8VisManager_h
+#define Em8VisManager_h 1
+
+#include "G4VisManager.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class Em8VisManager: public G4VisManager 
+{
+  public:
+
+    Em8VisManager ();
+
+  private:
+
+    void RegisterGraphicsSystems ();
+
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
new file mode 100644
index 0000000000..d41fc7502c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
@@ -0,0 +1,27 @@
+
+#ifndef TRTDetectorConstruction_h
+#define TRTDetectorConstruction_h 1
+
+#include "G4VUserDetectorConstruction.hh"
+#include "Randomize.hh"
+
+class TRTTrackerSD;
+class SCTTrackerSD;
+class HepJamesRandom;
+
+class TRTDetectorConstruction : public G4VUserDetectorConstruction
+{
+  public:
+    TRTDetectorConstruction();
+    ~TRTDetectorConstruction();
+
+  public:
+     G4VPhysicalVolume* Construct();
+
+  private:
+    TRTTrackerSD *TRTStrawSD;
+    SCTTrackerSD *SCTStripSD;
+    HepJamesRandom theJamesEngine;    
+};
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
new file mode 100644
index 0000000000..1477c31f52
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
@@ -0,0 +1,93 @@
+#ifndef TRT_MATERIALS_HH
+#define TRT_MATERIALS_HH
+
+//--------- Material definition ---------
+
+  G4double a, iz, z, density;
+  G4String name, symbol;
+  G4int nel, nComponents;
+
+  a = 14.01*g/mole;
+  G4Element* elN  = new G4Element(name="Nitrogen", symbol="N", iz=7., a);
+  a = 16.00*g/mole;
+  G4Element* elO  = new G4Element(name="Oxygen", symbol="O", iz=8., a);
+  a = 12.01*g/mole;
+  G4Element* elC  = new G4Element(name="Carbon", symbol="C", iz=6., a);
+  a = 1.01*g/mole;
+  G4Element* elH  = new G4Element(name="Hydrogen", symbol="H", iz=1., a);
+  a = 131.29*g/mole;
+  G4Element* elXe = new G4Element(name="Xenon", symbol="Xe", iz=54., a);  
+  a = 19.00*g/mole;
+  G4Element* elF  = new G4Element(name="Fluorine", symbol="F", iz=9., a);
+
+  density = 1.205*mg/cm3;
+  G4Material* Air = new G4Material(name="Air", density, nel=2,
+					kStateGas,293.15*kelvin,1.*atmosphere);
+  Air->AddElement(elN, .7);
+  Air->AddElement(elO, .3);
+  
+  density = 1.39*g/cm3;
+  G4Material* Kapton = new G4Material(name="Kapton", density, nel=3);
+  Kapton->AddElement(elO,2);
+  Kapton->AddElement(elC,5);
+  Kapton->AddElement(elH,4);
+  
+  a = 63.55*g/mole;
+  density = 8.96*g/cm3;
+  G4Material* Copper = new G4Material(name="Copper", z=29.,a, density);
+
+  a = 26.98*g/mole;
+  density = 2.7*g/cm3;
+  G4Material* Al = new G4Material(name="Aluminum", z=13., a, density);
+
+  a = 28.09*g/mole;
+  density = 2.33*g/cm3;
+  G4Material* Si = new G4Material(name="Silicon", z=14., a, density);
+
+  density = 1.977*mg/cm3;
+  G4Material* CO2 = new G4Material(name="CO2", density, nel=2,
+				       kStateGas,273.15*kelvin,1.*atmosphere);
+  CO2->AddElement(elC,1);
+  CO2->AddElement(elO,2);
+
+  G4double TRT_Xe_density = 5.485*mg/cm3;
+  G4Material* TRT_Xe = new G4Material(name="TRT_Xe", TRT_Xe_density, nel=1,
+				      kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_Xe->AddElement(elXe,1);
+
+  G4double TRT_CO2_density = 1.842*mg/cm3;
+  G4Material* TRT_CO2 = new G4Material(name="TRT_CO2", TRT_CO2_density, nel=2,
+				       kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_CO2->AddElement(elC,1);
+  TRT_CO2->AddElement(elO,2);
+
+  G4double TRT_CF4_density = 3.9*mg/cm3;
+  G4Material* TRT_CF4 = new G4Material(name="TRT_CF4", TRT_CF4_density, nel=2,
+                                       kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_CF4->AddElement(elC,1);
+  TRT_CF4->AddElement(elF,4);
+
+  G4double XeCO2CF4_density = 4.76*mg/cm3;
+  G4Material* XeCO2CF4 = new G4Material(name="XeCO2CF4", XeCO2CF4_density,
+					nComponents=3,
+					kStateGas,293.15*kelvin,1.*atmosphere);
+  XeCO2CF4->AddMaterial(TRT_Xe,0.807);
+  XeCO2CF4->AddMaterial(TRT_CO2,0.039);
+  XeCO2CF4->AddMaterial(TRT_CF4,0.154);
+      
+  density = 0.935*g/cm3;
+  G4Material* TRT_CH2 = new G4Material(name="TRT_CH2",density, nel=2);
+  TRT_CH2->AddElement(elC,1);
+  TRT_CH2->AddElement(elH,2);
+
+  density = 0.059*g/cm3;
+  G4Material* Radiator = new G4Material(name="Radiator",density, nel=2);
+  Radiator->AddElement(elC,1);
+  Radiator->AddElement(elH,2);
+
+  density = 0.145*g/cm3;
+  G4Material* CarbonFiber = new G4Material(name="CarbonFiber",density, nel=1);
+  CarbonFiber->AddElement(elC,1);
+
+#endif
+
diff --git a/examples/extended/electromagnetic/TestEm8/init.mac b/examples/extended/electromagnetic/TestEm8/init.mac
new file mode 100644
index 0000000000..c3001cad62
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/init.mac
@@ -0,0 +1,10 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+/run/verbose 2
+#
+#
+
diff --git a/examples/extended/electromagnetic/TestEm8/run01.mac b/examples/extended/electromagnetic/TestEm8/run01.mac
new file mode 100644
index 0000000000..704b0462b7
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run01.mac
@@ -0,0 +1,37 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Gold      
+/calor/setAbsThick 9.658e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot01
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 100
+/plots/setThlow 0.0 deg
+/plots/setThhigh 10.0 deg
+#
+/calor/cutG 13.0 micrometer
+/calor/cutE 1.12 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 15.7 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run01a.mac b/examples/extended/electromagnetic/TestEm8/run01a.mac
new file mode 100644
index 0000000000..49dfbc5f49
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run01a.mac
@@ -0,0 +1,39 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Gold      
+/calor/setAbsThick 9.658e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot01a
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 60
+/plots/setThlow 0.0 deg
+/plots/setThhigh 30.0 deg
+#
+/calor/cutG 13.0 micrometer
+/calor/cutE 1.12 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 15.7 MeV
+#
+/run/beamOn 4186
+/tracking/verbose 1
+/run/beamOn 1
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run01b.mac b/examples/extended/electromagnetic/TestEm8/run01b.mac
new file mode 100644
index 0000000000..6b6adc5727
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run01b.mac
@@ -0,0 +1,38 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Gold      
+/calor/setAbsThick 9.658e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot01
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 100
+/plots/setThlow 0.0 deg
+/plots/setThhigh 10.0 deg
+#
+/calor/cutG 13.0 micrometer
+/calor/cutE 1.12 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 15.7 MeV
+#
+/event/verbose 1
+/run/beamOn 100000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run02.mac b/examples/extended/electromagnetic/TestEm8/run02.mac
new file mode 100644
index 0000000000..ce699b924b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run02.mac
@@ -0,0 +1,37 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Gold      
+/calor/setAbsThick 19.296e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot02
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 100
+/plots/setThlow 0.0 deg
+/plots/setThhigh 10.0 deg
+#
+/calor/cutG 13.0 micrometer
+/calor/cutE 1.12 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 15.7 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run02a.mac b/examples/extended/electromagnetic/TestEm8/run02a.mac
new file mode 100644
index 0000000000..2364009386
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run02a.mac
@@ -0,0 +1,37 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Gold      
+/calor/setAbsThick 19.296e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot02a
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 60
+/plots/setThlow 0.0 deg
+/plots/setThhigh 30.0 deg
+#
+/calor/cutG 13.0 micrometer
+/calor/cutE 1.12 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 15.7 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run03.mac b/examples/extended/electromagnetic/TestEm8/run03.mac
new file mode 100644
index 0000000000..51416ba5cc
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run03.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 50.000e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot03 
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 60
+/plots/setThlow 0.0 deg
+/plots/setThhigh 6.0 deg
+#
+/calor/cutG 2130.0 micrometer
+/calor/cutE 7.000 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle proton
+/gun/energy 6.56 MeV
+#
+/run/beamOn 100000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run04.mac b/examples/extended/electromagnetic/TestEm8/run04.mac
new file mode 100644
index 0000000000..beee74f869
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run04.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 92.600e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot04 
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 60
+/plots/setThlow 0.0 deg
+/plots/setThhigh 6.0 deg
+#
+/calor/cutG 2130.0 micrometer
+/calor/cutE 7.000 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle proton
+/gun/energy 6.56 MeV
+#
+/run/beamOn 100000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run05.mac b/examples/extended/electromagnetic/TestEm8/run05.mac
new file mode 100644
index 0000000000..a648f53b53
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run05.mac
@@ -0,0 +1,39 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Aluminium 
+/calor/setAbsThick 4.005  mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#
+#  hist file name
+/plots/sethistName geant4.plot05 
+#  PLOT: angle distr. of transmitted particles
+/plots/setnbinTh 100
+/plots/setThlow 0.0 deg
+/plots/setThhigh 0.01 deg
+#
+/calor/cutG 2250.0 micrometer
+/calor/cutE 6.050 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle proton
+# momentum 70 GeV/c ....
+/gun/energy 69068. MeV
+#
+/run/beamOn 100000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run1.mac b/examples/extended/electromagnetic/TestEm8/run1.mac
new file mode 100644
index 0000000000..a822392e01
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run1.mac
@@ -0,0 +1,95 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+# /run/setdefault  
+# /run/setintegral 
+# /run/setcontonly 
+# /run/setionplus  
+/run/setdefault 
+/run/setminDeltaEnergy 1. keV
+# /run/setdRoverR 0.001
+# /run/setfinalR  0.001 mm
+#
+#  PLOT: nb of steps ....................................................
+/plots/setnbinStep 100 
+/plots/setSteplow 0.
+/plots/setStephigh 2000.
+#  PLOT: sum of tracklength of charged particles .........................
+/plots/setnbinTl 0
+/plots/setTllow 0.0 mm
+/plots/setTlhigh 3.0 mm 
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 0
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.50 MeV  
+#  PLOT: energy of transmitted particles (with quantum numbers of the primary)
+/plots/setnbinTt 0
+/plots/setTtlow 0.0 MeV
+/plots/setTthigh 1.0 MeV 
+#  PLOT: angle distr. of transmitted particles 
+/plots/setnbinTh 0
+/plots/setThlow 0.0 deg    
+/plots/setThhigh 90. deg    
+#  PLOT: lateral displacement for transmitted particles at exit
+/plots/setnbinR 0
+/plots/setRlow 0.0 mm
+/plots/setRhigh 2.0 mm
+#  PLOT: energy of backscattered particles (with quantum numbers of the primary)
+/plots/setnbinTb 0
+/plots/setTblow 0.0 MeV
+/plots/setTbhigh 1.0 MeV 
+#  PLOT: angle distr. of backscattered particles
+/plots/setnbinThback 0
+/plots/setThlowback 0.0 deg    
+/plots/setThhighback 90.0 deg    
+#  PLOT: energy spectrum of charged secondaries
+/plots/setnbinTsec 0
+/plots/setTseclow 0.00 MeV
+/plots/setTsechigh 0.50 MeV 
+#  PLOT: z coord. of e+/e- production 
+/plots/setnbinzvertex 0
+/plots/setzlow -0.500 mm
+/plots/setzhigh 0.500 mm
+#  PLOT: energy spectrum of photons escaping the absorber (forward)
+/plots/setnbinGamma 0
+/plots/setElowGamma 1.0 keV
+/plots/setEhighGamma 1000.0 keV
+#
+/run/initialize
+/calor/setAbsMat Aluminium
+#
+/calor/setAbsThick 20.0 m  
+/calor/setAbsRad 10.00 m
+/calor/update
+#
+# /event/setsignoise 3.8 keV
+# /event/setcutlow 0.0 keV
+#
+/calor/cutG 2.2 mm    
+/calor/cutE 6.05 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 100. MeV
+/gun/xvertex 0.000 mm
+/gun/yvertex 0.000 mm
+/gun/zvertex -5.000 m
+#
+/tracking/verbose 0
+/stepping/setprintlimit 1000
+/event/setverbose 0
+/stepping/setverbose 0
+/stepping/setnbofevents 0
+/stepping/seteventno  99
+#
+/run/beamOn 10
+#
+
diff --git a/examples/extended/electromagnetic/TestEm8/run11.mac b/examples/extended/electromagnetic/TestEm8/run11.mac
new file mode 100644
index 0000000000..130d828be0
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run11.mac
@@ -0,0 +1,51 @@
+#
+# Macro file 'run11.mac' for the initialization phase of "TestEm8.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#
+#control/saveHistory
+#
+/run/verbose 2
+#
+/run/initialize
+#
+#/calor/setAbsMat Xenon
+#  
+#/calor/setAbsThick  20.0 mm 
+# 
+#/calor/setAbsRad 100.0 mm
+#
+#/calor/update
+#
+#  hist file name
+#
+/plots/sethistName g4.p11
+#
+#  PLOT: energy deposit distribution in absorber
+#
+/plots/setnbinEn 50
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 0.020  MeV  
+#
+#/calor/cutG 3.0 mm    
+#
+#/calor/cutE 3.0 mm
+#
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e-
+# 
+#/gun/energy 200.00 GeV
+#
+/gun/energy 2.00 MeV
+#
+#/tracking/verbose 2
+#
+/run/beamOn 1000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run12.mac b/examples/extended/electromagnetic/TestEm8/run12.mac
new file mode 100644
index 0000000000..40644b1b2a
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run12.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 105.0e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot12
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 55
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.1  MeV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.00 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1.00 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run13.mac b/examples/extended/electromagnetic/TestEm8/run13.mac
new file mode 100644
index 0000000000..f8f79673e0
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run13.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 191.0e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot13
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 55
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.1  MeV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.00 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1.00 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run14.mac b/examples/extended/electromagnetic/TestEm8/run14.mac
new file mode 100644
index 0000000000..e845b4468d
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run14.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 530.0e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot14
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 55
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.1  MeV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.00 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1.00 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run15.mac b/examples/extended/electromagnetic/TestEm8/run15.mac
new file mode 100644
index 0000000000..ec6cedd942
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run15.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 1000.0e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot15
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 55
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.1  MeV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.00 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1.00 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run16.mac b/examples/extended/electromagnetic/TestEm8/run16.mac
new file mode 100644
index 0000000000..7c7f9d7f7e
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run16.mac
@@ -0,0 +1,36 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+/run/initialize
+#
+/calor/setAbsMat Silicon   
+/calor/setAbsThick 3000.0e-3 mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+#  hist file name
+/plots/sethistName geant4.plot16
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 55
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.1  MeV  
+#
+/calor/cutG 2.13 mm    
+/calor/cutE 7.00 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1.00 MeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run2.mac b/examples/extended/electromagnetic/TestEm8/run2.mac
new file mode 100644
index 0000000000..e45c79971b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run2.mac
@@ -0,0 +1,93 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+# /run/setdefault  
+# /run/setintegral 
+# /run/setcontonly 
+# /run/setionplus  
+/run/setdefault 
+/run/setminDeltaEnergy 1. keV
+/run/setdRoverR 0.050
+/run/setfinalR  0.001 mm
+#
+#  PLOT: nb of steps ....................................................
+/plots/setnbinStep 100
+/plots/setSteplow 0.
+/plots/setStephigh 100.
+#  PLOT: sum of tracklength of charged particles .........................
+/plots/setnbinTl 50
+/plots/setTllow 0.0 mm
+/plots/setTlhigh 1.0 mm 
+#  PLOT: energy deposit distribution in absorber............................
+/plots/setnbinEn 60
+/plots/setEnlow 0.0 MeV
+/plots/setEnhigh 1.20 MeV  
+#  PLOT: energy of transmitted particles (with quantum numbers of the primary)
+/plots/setnbinTt 50
+/plots/setTtlow 0.0 MeV
+/plots/setTthigh 1.0 MeV 
+#  PLOT: angle distr. of transmitted particles 
+/plots/setnbinTh 30
+/plots/setThlow 0.0 deg    
+/plots/setThhigh 90. deg    
+#  PLOT: lateral displacement for transmitted particles at exit
+/plots/setnbinR 50
+/plots/setRlow 0.0 mm
+/plots/setRhigh 0.25 mm
+#  PLOT: energy of backscattered particles (with quantum numbers of the primary)
+/plots/setnbinTb 50
+/plots/setTblow 0.0 MeV
+/plots/setTbhigh 1.0 MeV 
+#  PLOT: andle distr. of backscattered particles
+/plots/setnbinThback 30
+/plots/setThlowback 0.0 deg    
+/plots/setThhighback 90.0 deg    
+#  PLOT: energy spectrum of charged secondaries
+/plots/setnbinTsec 100
+/plots/setTseclow 0.00 MeV
+/plots/setTsechigh 0.50 MeV 
+#  PLOT: z coord. of e+/e- production 
+/plots/setnbinzvertex 100
+/plots/setzlow -0.0500 mm
+/plots/setzhigh 0.0500 mm
+#  PLOT: energy spectrum of photons escaping the absorber (forward)
+/plots/setnbinGamma 100
+/plots/setElowGamma 1.0 keV
+/plots/setEhighGamma 1000.0 keV
+#
+/run/initialize
+/calor/setAbsMat Gold  
+#
+/calor/setAbsThick 0.10 mm 
+/calor/setAbsRad 10.00 mm
+/calor/update
+#
+# /event/setsignoise 3.8 keV
+# /event/setcutlow 0.0 keV
+#
+/run/particle/setCut 0.0001000 mm
+/run/initialize
+/run/particle/dumpCutValues
+#
+/gun/particle e- 
+/gun/energy 1. MeV
+/gun/xvertex 0.000 mm
+/gun/yvertex 0.000 mm
+/gun/zvertex -0.0500 mm
+#
+/tracking/verbose 0
+/stepping/setprintlimit 1000
+/event/setverbose 0
+/stepping/setverbose 0
+/stepping/setnbofevents 0
+/stepping/seteventno  99
+#
+/run/beamOn 10000
+#
+
diff --git a/examples/extended/electromagnetic/TestEm8/run21.mac b/examples/extended/electromagnetic/TestEm8/run21.mac
new file mode 100644
index 0000000000..6643769ac7
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run21.mac
@@ -0,0 +1,37 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+#  hist file name
+/plots/sethistName geant4.plot21
+#  PLOT: gamma energy at exit   
+/plots/setnbinGamma 80
+/plots/setElowGamma  0.1  MeV
+/plots/setEhighGamma 1. GeV
+#
+/run/initialize
+#
+/calor/setAbsMat Aluminium 
+/calor/setAbsThick 5.30  mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+/calor/cutG 1.00 mm
+/calor/cutE 5.0 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 25. GeV
+#
+/run/beamOn 100000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/run22.mac b/examples/extended/electromagnetic/TestEm8/run22.mac
new file mode 100644
index 0000000000..64f1b7d0ed
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/run22.mac
@@ -0,0 +1,37 @@
+#
+# Macro file for the initialization phase of "TestEm5.cc"
+#
+# It creates the default geometry (simple absorber cylinder )        
+#
+/control/verbose 2
+#control/saveHistory
+/run/verbose 2
+#
+#  hist file name
+/plots/sethistName geant4.plot22
+#  PLOT: gamma energy at exit   
+/plots/setnbinGamma 80
+/plots/setElowGamma  0.1  MeV
+/plots/setEhighGamma 1. GeV
+#
+/run/initialize
+#
+/calor/setAbsMat Lead 
+/calor/setAbsThick 0.15  mm  
+/calor/setAbsRad 100.0 mm
+/calor/update
+#
+/calor/cutG 1.00 mm
+/calor/cutE 5.0 micrometer
+/run/initialize
+/run/particle/dumpCutValues
+#
+#
+/gun/particle e- 
+/gun/energy 25. GeV
+#
+/run/beamOn 1000000
+#
+#
+
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
new file mode 100644
index 0000000000..d149acf2ab
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
@@ -0,0 +1,63 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8CalorHit.cc,v 1.1 2000/01/07 14:50:43 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8CalorHit.hh"
+
+G4Allocator<Em8CalorHit> Em8CalorHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8CalorHit::Em8CalorHit()
+{
+   EdepAbs = 0.; TrackLengthAbs = 0.;
+   EdepGap = 0.; TrackLengthGap = 0.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8CalorHit::~Em8CalorHit()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8CalorHit::Em8CalorHit(const Em8CalorHit& right)
+{
+  EdepAbs = right.EdepAbs; TrackLengthAbs = right.TrackLengthAbs;
+  EdepGap = right.EdepGap; TrackLengthGap = right.TrackLengthGap;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+const Em8CalorHit& Em8CalorHit::operator=(const Em8CalorHit& right)
+{
+  EdepAbs = right.EdepAbs; TrackLengthAbs = right.TrackLengthAbs;
+  EdepGap = right.EdepGap; TrackLengthGap = right.TrackLengthGap;
+  return *this;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+int Em8CalorHit::operator==(const Em8CalorHit& right) const
+{
+  return 0;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8CalorHit::Print()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
new file mode 100644
index 0000000000..bd2fee5cae
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
@@ -0,0 +1,115 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8CalorimeterSD.cc,v 1.1 2000/01/07 14:50:44 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8CalorimeterSD.hh"
+
+#include "Em8CalorHit.hh"
+#include "Em8DetectorConstruction.hh"
+
+#include "G4VPhysicalVolume.hh"
+#include "G4Step.hh"
+#include "G4VTouchable.hh"
+#include "G4TouchableHistory.hh"
+#include "G4SDManager.hh"
+  
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8CalorimeterSD::Em8CalorimeterSD(G4String name,
+                                   Em8DetectorConstruction* det)
+:G4VSensitiveDetector(name),Detector(det)
+{
+  collectionName.insert("CalCollection");
+  HitID = new G4int[500];
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8CalorimeterSD::~Em8CalorimeterSD()
+{
+  delete [] HitID;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8CalorimeterSD::Initialize(G4HCofThisEvent*HCE)
+{
+  CalCollection = new Em8CalorHitsCollection
+                      (SensitiveDetectorName,collectionName[0]); 
+  for (G4int j=0;j<1; j++) {HitID[j] = -1;};
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4bool Em8CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
+{
+  G4double edep = aStep->GetTotalEnergyDeposit();
+  
+  G4double stepl = 0.;
+  if (aStep->GetTrack()->GetDefinition()->GetPDGCharge() != 0.)
+      stepl = aStep->GetStepLength();
+      
+  if ((edep==0.)&&(stepl==0.)) return false;      
+
+  G4TouchableHistory* theTouchable
+    = (G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable());
+    
+  G4VPhysicalVolume* physVol = theTouchable->GetVolume(); 
+  //theTouchable->MoveUpHistory();
+  G4int Em8Number = 0 ;
+
+  if (HitID[Em8Number]==-1)
+    { 
+      Em8CalorHit* calHit = new Em8CalorHit();
+      if (physVol == Detector->GetAbsorber()) calHit->AddAbs(edep,stepl);
+      HitID[Em8Number] = CalCollection->insert(calHit) - 1;
+      if (verboseLevel>0)
+        G4cout << " New Calorimeter Hit on Em8: " << Em8Number << endl;
+    }
+  else
+    { 
+      if (physVol == Detector->GetAbsorber())
+         (*CalCollection)[HitID[Em8Number]]->AddAbs(edep,stepl);
+      if (verboseLevel>0)
+        G4cout << " Energy added to Em8: " << Em8Number << endl; 
+    }
+    
+  return true;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8CalorimeterSD::EndOfEvent(G4HCofThisEvent* HCE)
+{
+  static G4int HCID = -1;
+  if(HCID<0)
+  { HCID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]); }
+  HCE->AddHitsCollection(HCID,CalCollection);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8CalorimeterSD::clear()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+void Em8CalorimeterSD::PrintAll()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
new file mode 100644
index 0000000000..0c508c9fc0
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
@@ -0,0 +1,616 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8DetectorConstruction.cc,v 1.1 2000/01/07 14:50:44 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8DetectorConstruction.hh"
+#include "Em8DetectorMessenger.hh"
+
+#include "Em8CalorimeterSD.hh"
+
+#include "G4Material.hh"
+#include "G4Tubs.hh"
+#include "G4LogicalVolume.hh"
+#include "G4PVPlacement.hh"
+#include "G4UniformMagField.hh"
+#include "G4FieldManager.hh"
+#include "G4TransportationManager.hh"
+#include "G4SDManager.hh"
+#include "G4RunManager.hh"
+
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8DetectorConstruction::Em8DetectorConstruction()
+:solidWorld(NULL),logicWorld(NULL),physiWorld(NULL),
+ solidAbsorber(NULL),logicAbsorber(NULL),physiAbsorber(NULL),
+ AbsorberMaterial(NULL),WorldMaterial(NULL),fRadiatorMat(NULL),
+ magField(NULL),calorimeterSD(NULL),worldchanged(false)
+{
+  // default parameter values of the calorimeter
+  WorldSizeZ = 8.*cm;
+  WorldSizeR = 2.*cm;
+
+  AbsorberThickness = 10.0*mm;
+  AbsorberRadius   = 1.*cm;
+  zAbsorber = 2.*cm ;
+
+  fRadThickness = 20*micrometer ;
+  fGasGap       = 500*micrometer  ; 
+  fFoilNumber   = 200 ;
+
+  fDetThickness = 20.0*mm ;
+  fDetLength    = 200.0*cm  ;
+  fDetGap       = 1.0*mm ;
+  fStartR       = 40*cm  ;
+  fStartZ       = 2.0*cm  ;
+  fModuleNumber = 1      ;  
+
+  // create commands for interactive definition of the calorimeter  
+
+  detectorMessenger = new Em8DetectorMessenger(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+//
+
+Em8DetectorConstruction::~Em8DetectorConstruction()
+{ 
+  delete detectorMessenger;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+//
+
+G4VPhysicalVolume* Em8DetectorConstruction::Construct()
+{
+  DefineMaterials();
+  return ConstructCalorimeter();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::DefineMaterials()
+{ 
+ //This function illustrates the possible ways to define materials
+ 
+G4String name, symbol ;             //a=mass of a mole;
+G4double a, z, density ;            //z=mean number of protons;  
+G4int iz, n, nel ;                       //iz=number of protons  in an isotope; 
+                                   // n=number of nucleons in an isotope;
+
+G4int ncomponents, natoms;
+G4double abundance, fractionmass;
+G4double temperature, pressure;
+
+//
+// define Elements
+//
+
+  a = 1.01*g/mole;
+  G4Element* elH  = new G4Element(name="Hydrogen",symbol="H" , z= 1., a);
+
+  a = 6.01*g/mole;
+  G4Element* elC = new G4Element(name="Carbon", symbol="C", z=6., a);
+
+  a = 14.01*g/mole;
+  G4Element* elN  = new G4Element(name="Nitrogen",symbol="N" , z= 7., a);
+
+  a = 16.00*g/mole;
+  G4Element* elO  = new G4Element(name="Oxygen"  ,symbol="O" , z= 8., a);
+
+  a = 39.948*g/mole;
+  G4Element* elAr = new G4Element(name="Argon", symbol="Ar", z=18., a);
+
+  a = 131.29*g/mole;
+  G4Element* elXe = new G4Element(name="Xenon", symbol="Xe", z=54., a);
+  
+  a = 19.00*g/mole;
+  G4Element* elF  = new G4Element(name="Fluorine", symbol="F", z=9., a);
+
+
+//
+// define simple materials
+//
+
+     /* ******************************************************************
+
+density = 1.848*g/cm3;
+a = 9.01*g/mole;
+G4Material* Be = new G4Material(name="Beryllium", z=4., a, density);
+
+density = 2.700*g/cm3;
+a = 26.98*g/mole;
+G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
+
+density = 1.390*g/cm3;
+a = 39.95*g/mole;
+G4Material* lAr = new G4Material(name="liquidArgon", z=18., a, density);
+
+density = 7.870*g/cm3;
+a = 55.85*g/mole;
+G4Material* Fe = new G4Material(name="Iron"   , z=26., a, density);
+
+density = 8.960*g/cm3;
+a = 63.55*g/mole;
+G4Material* Cu = new G4Material(name="Copper"   , z=29., a, density);
+
+density = 19.32*g/cm3;
+a =196.97*g/mole;
+G4Material* Au = new G4Material(name="Gold"   , z=79., a, density);
+
+density = 11.35*g/cm3;
+a = 207.19*g/mole;
+G4Material* Pb = new G4Material(name="Lead"     , z=82., a, density);
+
+//
+// define a material from elements.   case 1: chemical molecule
+//
+
+density = 1.000*g/cm3;
+G4Material* H2O = new G4Material(name="Water", density, ncomponents=2);
+H2O->AddElement(elH, natoms=2);
+H2O->AddElement(elO, natoms=1);
+
+  // Polypropelene
+
+  G4Material* CH2 = new G4Material ("Polypropelene" , 0.91*g/cm3, 2);
+  C2H2->AddElement(elH,2);
+  C2H2->AddElement(elC,1);
+
+  // Kapton (polyimide)
+
+  density = 1.39*g/cm3;
+  G4Material* Kapton = new G4Material(name="Kapton", density, nel=3);
+  Kapton->AddElement(elO,2);
+  Kapton->AddElement(elC,5);
+  Kapton->AddElement(elH,4);
+
+  // Silicon as detector material
+
+  density = 2.330*g/cm3;
+  a = 28.09*g/mole;
+  G4Material* Si = new G4Material(name="Silicon", z=14., a, density);
+
+  // Carbon dioxide
+
+  density = 1.977*mg/cm3;
+  G4Material* CO2 = new G4Material(name="CO2", density, nel=2,
+				       kStateGas,273.15*kelvin,1.*atmosphere);
+  CO2->AddElement(elC,1);
+  CO2->AddElement(elO,2);
+
+  G4double TRT_Xe_density = 5.485*mg/cm3;
+  G4Material* TRT_Xe = new G4Material(name="TRT_Xe", TRT_Xe_density, nel=1,
+				      kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_Xe->AddElement(elXe,1);
+
+  G4double TRT_CO2_density = 1.842*mg/cm3;
+  G4Material* TRT_CO2 = new G4Material(name="TRT_CO2", TRT_CO2_density, nel=2,
+				       kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_CO2->AddElement(elC,1);
+  TRT_CO2->AddElement(elO,2);
+
+  G4double TRT_CF4_density = 3.9*mg/cm3;
+  G4Material* TRT_CF4 = new G4Material(name="TRT_CF4", TRT_CF4_density, nel=2,
+                                       kStateGas,293.15*kelvin,1.*atmosphere);
+  TRT_CF4->AddElement(elC,1);
+  TRT_CF4->AddElement(elF,4);
+
+  // ATLAS TRT straw tube gas mixture (20 C, 1 atm)
+
+  G4double XeCO2CF4_density = 4.76*mg/cm3;
+  G4Material* XeCO2CF4 = new G4Material(name="XeCO2CF4", XeCO2CF4_density,
+					ncomponents=3,
+					kStateGas,293.15*kelvin,1.*atmosphere);
+  XeCO2CF4->AddMaterial(TRT_Xe,0.807);
+  XeCO2CF4->AddMaterial(TRT_CO2,0.039);
+  XeCO2CF4->AddMaterial(TRT_CF4,0.154);
+
+  // TRT_CH2
+      
+  density = 0.935*g/cm3;
+  G4Material* TRT_CH2 = new G4Material(name="TRT_CH2",density, nel=2);
+  TRT_CH2->AddElement(elC,1);
+  TRT_CH2->AddElement(elH,2);
+
+  // Radiator
+
+  density = 0.059*g/cm3;
+  G4Material* Radiator = new G4Material(name="Radiator",density, nel=2);
+  Radiator->AddElement(elC,1);
+  Radiator->AddElement(elH,2);
+
+  // Carbon Fiber
+
+  density = 0.145*g/cm3;
+  G4Material* CarbonFiber = new G4Material(name="CarbonFiber",density, nel=1);
+  CarbonFiber->AddElement(elC,1);
+
+  density = 1.290*mg/cm3;  // old air from elements
+  G4Material* air = new G4Material(name="air"  , density, ncomponents=2);
+  Air->AddElement(elN, fractionmass=0.7);
+  Air->AddElement(elO, fractionmass=0.3);
+
+
+  density = 1.25053*mg/cm3 ;       // STP
+  a = 14.01*g/mole ;       // get atomic weight !!!
+  //  a = 28.016*g/mole;
+  G4Material* N2  = new G4Material(name="Nitrogen", z= 7.,a,density) ;
+
+  density = 1.25053*mg/cm3 ;       // STP
+  G4Material* anotherN2 = new G4Material(name="anotherN2", density,ncomponents=2);
+  anotherN2->AddElement(elN, 1);
+  anotherN2->AddElement(elN, 1);
+
+************************ */
+
+  // Dry air (average composition)
+
+  density = 1.7836*mg/cm3 ;       // STP
+  G4Material* Argon = new G4Material(name="Argon"  , density, ncomponents=1);
+  Argon->AddElement(elAr, 1);
+
+  /* *********************
+
+  density = 1.25053*mg/cm3 ;       // STP
+  G4Material* Nitrogen = new G4Material(name="N2"  , density, ncomponents=1);
+  Nitrogen->AddElement(elN, 2);
+
+  density = 1.4289*mg/cm3 ;       // STP
+  G4Material* Oxygen = new G4Material(name="O2"  , density, ncomponents=1);
+  Oxygen->AddElement(elO, 2);
+
+
+  density = 1.2928*mg/cm3 ;       // STP
+  G4Material* Air = new G4Material(name="Air"  , density, ncomponents=3);
+  Air->AddMaterial( Nitrogen, fractionmass = 0.7557 ) ;
+  Air->AddMaterial( Oxygen,   fractionmass = 0.2315 ) ;
+  Air->AddMaterial( Argon,    fractionmass = 0.0128 ) ;
+
+  *********************************** */
+
+  // Xenon as detector gas, STP
+
+  density = 5.858*mg/cm3 ;
+  a = 131.29*g/mole ;
+  G4Material* Xe  = new G4Material(name="Xenon",z=54., a, density );
+
+  /* **************
+
+  density = 1.977*mg/cm3;
+  G4Material* CarbonDioxide = new G4Material(name="CO2", density, nel=2);
+  CarbonDioxide->AddElement(elC,1);
+  CarbonDioxide->AddElement(elO,2);
+
+  // 80% Ar + 20% CO2, STP
+
+  density = 1.8223*mg/cm3 ;      
+  G4Material* Ar_80CO2_20 = new G4Material(name="ArCO2"  , density, ncomponents=2);
+  Ar_80CO2_20->AddMaterial( Argon,           fractionmass = 0.783 ) ;
+  Ar_80CO2_20->AddMaterial( CarbonDioxide,   fractionmass = 0.217 ) ;
+
+  // 80% Xe + 20% CO2, STP
+
+  density = 5.0818*mg/cm3 ;      
+  G4Material* Xe_80CO2_20 = new G4Material(name="XeCO2"  , density, ncomponents=2);
+  Xe_80CO2_20->AddMaterial( Xe,              fractionmass = 0.922 ) ;
+  Xe_80CO2_20->AddMaterial( CarbonDioxide,   fractionmass = 0.078 ) ;
+
+  *********** */
+
+  G4cout << *(G4Material::GetMaterialTable()) << endl;
+
+  //default materials of the calorimeter
+
+  //  fRadiatorMat = CH2 ;
+
+  AbsorberMaterial = Xe ; // Xe_80CO2_20 ; // Argon ;    // Ar_80CO2_20 ;
+  WorldMaterial  = Argon ;
+}
+
+/////////////////////////////////////////////////////////////////////////
+//
+//
+  
+G4VPhysicalVolume* Em8DetectorConstruction::ConstructCalorimeter()
+{
+  G4int i, j ; 
+  G4double zModule, zRadiator, rModule, rRadiator ; 
+
+  // complete the Calor parameters definition and Print 
+
+  ComputeCalorParameters();
+  PrintCalorParameters();
+      
+  // World
+  
+  if(solidWorld) delete solidWorld ;
+  if(logicWorld) delete logicWorld ;
+  if(physiWorld) delete physiWorld ;
+
+  solidWorld = new G4Tubs("World",				//its name
+                   0.,WorldSizeR,WorldSizeZ/2.,0.,twopi)       ;//its size
+                         
+  logicWorld = new G4LogicalVolume(solidWorld,		//its solid
+                                   WorldMaterial,	//its material
+                                   "World");		//its name
+                                   
+  physiWorld = new G4PVPlacement(0,			//no rotation
+  				 G4ThreeVector(),	//at (0,0,0)
+                                 "World",		//its name
+                                 logicWorld,		//its logical volume
+                                 NULL,			//its mother  volume
+                                 false,			//no boolean operation
+                                 0);			//copy number
+
+  /* *******************************************************************
+
+    fSolidRadSlice = new G4Tubs("RadSlice",0.0,  //  fStartR,fWorldRadius
+                                AbsorberRadius,0.5*fRadThickness,0.0,360*deg);
+
+    fLogicRadSlice = new G4LogicalVolume(fSolidRadSlice,fRadiatorMat,
+                                          "RadSlice",0,0,0);
+
+    fPhysicRadSlice = new G4PVPlacement(0,
+                       G4ThreeVector(0.,0.,fStartZ+1.2*fDetThickness),
+                                         "RadSlice",fLogicRadSlice,
+                                          physiWorld,false,0);
+    
+  for(i=1;i<=fModuleNumber;i++)
+  {
+    //   rModule = fStartR + fDetThickness + fDetGap + 
+    //           (i-1)*(fFoilNumber*(fRadThickness + fGasGap) + 
+    //           fDetThickness + fDetGap) ;
+
+    zModule = fStartZ + fDetThickness + fDetGap + 
+                 (i-1)*(fFoilNumber*(fRadThickness + fGasGap) + 
+                 fDetThickness + fDetGap) ;
+
+
+    for(j=1;j<=fFoilNumber;j++)
+    {  
+      //   rRadiator = rModule + j*(fRadThickness + fGasGap) ;
+
+      zRadiator = zModule + j*(fRadThickness + fGasGap) ;
+           
+      // RadRing
+
+      
+      // fSolidRadRing = new G4Tubs("RadRing",rRadiator,
+      //        rRadiator + fRadThickness,
+      //     fDetLength,0.0,360*deg     ) ;
+
+      //  fLogicRadRing = new G4LogicalVolume(fSolidRadRing,fRadiatorMat,
+      //                         "radRing",0,0,0);
+      
+      //  fPhysicRadRing = new G4PVPlacement(0,G4ThreeVector(),
+      //       "RadRing",fLogicRadRing,
+      //               physiWorld,false,j)  ; 
+                                                            
+      // Slice
+      
+      fPhysicRadSlice = new G4PVPlacement(0,G4ThreeVector(0.,0.,zRadiator),
+                                         "RadSlice",fLogicRadSlice,
+                                          physiWorld,false,j);
+     }                                 
+    //   fPhysicDetSlice = new G4PVPlacement(0,
+    //          G4ThreeVector(0.,0.,zRadiator+
+    //                        fDetGap +0.5*fDetThickness),"DetSlice",
+    //                        fLogicDetSlice,physiWorld,false,i); 
+  }                                            
+
+  ****************************************** */
+                               
+  // Absorber
+
+  if (AbsorberThickness > 0.) 
+  { 
+      if(solidAbsorber) delete solidAbsorber ;
+      if(logicAbsorber) delete logicAbsorber ;
+      if(physiAbsorber) delete physiAbsorber ;
+
+      solidAbsorber = new G4Tubs("Absorber",		//its name
+                          0.,AbsorberRadius,AbsorberThickness/2.,0.,twopi); 
+                          
+      logicAbsorber = new G4LogicalVolume(solidAbsorber,    // its solid
+      			                  AbsorberMaterial, // its material
+      			                  "Absorber");      // its name
+      			                  
+      physiAbsorber = new G4PVPlacement(0,		   // no rotation
+      		    G4ThreeVector(0.,0.,zAbsorber),        // its position
+                                        "Absorber",        // its name
+                                        logicAbsorber,     // its logical volume
+                                        physiWorld,        // its mother
+                                        false,             // no boulean operat
+                                        0);                // copy number
+                                        
+  }
+                                 
+  // Sensitive Detectors: Absorber 
+  
+  G4SDManager* SDman = G4SDManager::GetSDMpointer();
+
+  if(!calorimeterSD)
+  {
+    calorimeterSD = new Em8CalorimeterSD("CalorSD",this);
+    SDman->AddNewDetector( calorimeterSD );
+  }
+  if (logicAbsorber)  logicAbsorber->SetSensitiveDetector(calorimeterSD);
+
+  //always return the physical World
+  
+  return physiWorld;
+}
+
+////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::PrintCalorParameters()
+{
+  G4cout << "\n The  WORLD   is made of " 
+       << WorldSizeZ/mm << "mm of " << WorldMaterial->GetName() ;
+  G4cout << ", the transverse size (R) of the world is " << WorldSizeR/mm << " mm. " << endl;
+  G4cout << " The ABSORBER is made of " 
+       << AbsorberThickness/mm << "mm of " << AbsorberMaterial->GetName() ;
+  G4cout << ", the transverse size (R) is " << AbsorberRadius/mm << " mm. " << endl;
+  G4cout << " Z position of the (middle of the) absorber " << zAbsorber/mm << "  mm." << endl;
+  G4cout << endl;
+}
+
+///////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetAbsorberMaterial(G4String materialChoice)
+{
+  // get the pointer to the material table
+  const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+
+  // search the material by its name   
+  G4Material* pttoMaterial;
+  for (G4int J=0 ; J<theMaterialTable->length() ; J++)
+   { pttoMaterial = (*theMaterialTable)(J);     
+     if(pttoMaterial->GetName() == materialChoice)
+        {AbsorberMaterial = pttoMaterial;
+         logicAbsorber->SetMaterial(pttoMaterial); 
+        // PrintCalorParameters();
+        }             
+   }
+}
+
+////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetWorldMaterial(G4String materialChoice)
+{
+  // get the pointer to the material table
+  const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+
+  // search the material by its name   
+  G4Material* pttoMaterial;
+  for (G4int J=0 ; J<theMaterialTable->length() ; J++)
+   { pttoMaterial = (*theMaterialTable)(J);     
+     if(pttoMaterial->GetName() == materialChoice)
+        {WorldMaterial = pttoMaterial;
+         logicWorld->SetMaterial(pttoMaterial); 
+       //  PrintCalorParameters();
+        }             
+   }
+}
+
+///////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetAbsorberThickness(G4double val)
+{
+  // change Absorber thickness and recompute the calorimeter parameters
+  AbsorberThickness = val;
+  ComputeCalorParameters();
+}  
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetAbsorberRadius(G4double val)
+{
+  // change the transverse size and recompute the calorimeter parameters
+  AbsorberRadius = val;
+  ComputeCalorParameters();
+}  
+
+////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetWorldSizeZ(G4double val)
+{
+  worldchanged=true;
+  WorldSizeZ = val;
+  ComputeCalorParameters();
+}  
+
+///////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetWorldSizeR(G4double val)
+{
+  worldchanged=true;
+  WorldSizeR = val;
+  ComputeCalorParameters();
+}  
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetAbsorberZpos(G4double val)
+{
+  zAbsorber  = val;
+  ComputeCalorParameters();
+}  
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8DetectorConstruction::SetMagField(G4double fieldValue)
+{
+  //apply a global uniform magnetic field along X axis
+
+  /* *********************************************************
+
+  G4FieldManager* fieldMgr 
+   = G4TransportationManager::GetTransportationManager()->GetFieldManager();
+    
+  if(magField) delete magField;		//delete the existing magn field
+  
+  if(fieldValue!=0.)			// create a new one if non nul
+  { 
+    magField = new G4UniformMagField(G4ThreeVector(fieldValue,0.,0.));        
+    fieldMgr->SetDetectorField(magField);
+    fieldMgr->CreateChordFinder(magField);
+  } 
+  else 
+  {
+    magField = NULL;
+    fieldMgr->SetDetectorField(magField);
+  }
+
+  *************************************************************** */
+
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//
+  
+void Em8DetectorConstruction::UpdateGeometry()
+{
+  G4RunManager::GetRunManager()->DefineWorldVolume(ConstructCalorimeter());
+}
+
+//
+//
+////////////////////////////////////////////////////////////////////////////
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
new file mode 100644
index 0000000000..fee8b5327f
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
@@ -0,0 +1,143 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8DetectorMessenger.cc,v 1.1 2000/01/07 14:50:44 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8DetectorMessenger.hh"
+
+#include "Em8DetectorConstruction.hh"
+#include "G4UIdirectory.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithoutParameter.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8DetectorMessenger::Em8DetectorMessenger(Em8DetectorConstruction * Em8Det)
+:Em8Detector(Em8Det)
+{ 
+  Em8detDir = new G4UIdirectory("/calor/");
+  Em8detDir->SetGuidance("Em8 detector control.");
+      
+  AbsMaterCmd = new G4UIcmdWithAString("/calor/setAbsMat",this);
+  AbsMaterCmd->SetGuidance("Select Material of the Absorber.");
+  AbsMaterCmd->SetParameterName("choice",true);
+  AbsMaterCmd->SetDefaultValue("Lead");
+  AbsMaterCmd->AvailableForStates(Idle);
+  
+  WorldMaterCmd = new G4UIcmdWithAString("/calor/setWorldMat",this);
+  WorldMaterCmd->SetGuidance("Select Material of the World.");
+  WorldMaterCmd->SetParameterName("wchoice",true);
+  WorldMaterCmd->SetDefaultValue("Air");
+  WorldMaterCmd->AvailableForStates(Idle);
+  
+  AbsThickCmd = new G4UIcmdWithADoubleAndUnit("/calor/setAbsThick",this);
+  AbsThickCmd->SetGuidance("Set Thickness of the Absorber");
+  AbsThickCmd->SetParameterName("SizeZ",false,false);
+  AbsThickCmd->SetDefaultUnit("mm");
+  AbsThickCmd->SetRange("SizeZ>0.");
+  AbsThickCmd->AvailableForStates(Idle);
+  
+  AbsRadCmd = new G4UIcmdWithADoubleAndUnit("/calor/setAbsRad",this);
+  AbsRadCmd->SetGuidance("Set radius of the Absorber");
+  AbsRadCmd->SetParameterName("SizeR",false,false);
+  AbsRadCmd->SetDefaultUnit("mm");
+  AbsRadCmd->SetRange("SizeR>0.");
+  AbsRadCmd->AvailableForStates(Idle);
+  
+  AbsZposCmd = new G4UIcmdWithADoubleAndUnit("/calor/setAbsZpos",this);
+  AbsZposCmd->SetGuidance("Set Z pos. of the Absorber");
+  AbsZposCmd->SetParameterName("Zpos",false,false);
+  AbsZposCmd->SetDefaultUnit("mm");
+  AbsZposCmd->AvailableForStates(Idle);
+  
+  WorldZCmd = new G4UIcmdWithADoubleAndUnit("/calor/setWorldZ",this);
+  WorldZCmd->SetGuidance("Set Z size of the World");
+  WorldZCmd->SetParameterName("WSizeZ",false,false);
+  WorldZCmd->SetDefaultUnit("mm");
+  WorldZCmd->SetRange("WSizeZ>0.");
+  WorldZCmd->AvailableForStates(Idle);
+  
+  WorldRCmd = new G4UIcmdWithADoubleAndUnit("/calor/setWorldR",this);
+  WorldRCmd->SetGuidance("Set R size of the World");
+  WorldRCmd->SetParameterName("WSizeR",false,false);
+  WorldRCmd->SetDefaultUnit("mm");
+  WorldRCmd->SetRange("WSizeR>0.");
+  WorldRCmd->AvailableForStates(Idle);
+  
+  UpdateCmd = new G4UIcmdWithoutParameter("/calor/update",this);
+  UpdateCmd->SetGuidance("Update calorimeter geometry.");
+  UpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" ");
+  UpdateCmd->SetGuidance("if you changed geometrical value(s).");
+  UpdateCmd->AvailableForStates(Idle);
+      
+  MagFieldCmd = new G4UIcmdWithADoubleAndUnit("/calor/setField",this);  
+  MagFieldCmd->SetGuidance("Define magnetic field.");
+  MagFieldCmd->SetGuidance("Magnetic field will be in Z direction.");
+  MagFieldCmd->SetParameterName("Bz",false,false);
+  MagFieldCmd->SetDefaultUnit("tesla");
+  MagFieldCmd->AvailableForStates(Idle);  
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8DetectorMessenger::~Em8DetectorMessenger()
+{
+  delete AbsMaterCmd; 
+  delete AbsThickCmd; 
+  delete AbsRadCmd;  
+  delete AbsZposCmd; 
+  delete WorldMaterCmd;
+  delete WorldZCmd;
+  delete WorldRCmd;
+  delete UpdateCmd;
+  delete MagFieldCmd;
+  delete Em8detDir;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
+{ 
+  if( command == AbsMaterCmd )
+   { Em8Detector->SetAbsorberMaterial(newValue);}
+   
+  if( command == WorldMaterCmd )
+   { Em8Detector->SetWorldMaterial(newValue);}
+   
+  if( command == AbsThickCmd )
+   { Em8Detector->SetAbsorberThickness(AbsThickCmd->GetNewDoubleValue(newValue));}
+   
+  if( command == AbsRadCmd )
+   { Em8Detector->SetAbsorberRadius(AbsRadCmd->GetNewDoubleValue(newValue));}
+   
+  if( command == AbsZposCmd )
+   { Em8Detector->SetAbsorberZpos(AbsZposCmd->GetNewDoubleValue(newValue));}
+   
+  if( command == WorldZCmd )
+   { Em8Detector->SetWorldSizeZ(WorldZCmd->GetNewDoubleValue(newValue));}
+   
+  if( command == WorldRCmd )
+   { Em8Detector->SetWorldSizeR(WorldRCmd->GetNewDoubleValue(newValue));}
+   
+  if( command == UpdateCmd )
+   { Em8Detector->UpdateGeometry(); }
+
+  if( command == MagFieldCmd )
+   { Em8Detector->SetMagField(MagFieldCmd->GetNewDoubleValue(newValue));}
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
new file mode 100644
index 0000000000..132c8dd6d4
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
@@ -0,0 +1,233 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8EventAction.cc,v 1.1 2000/01/07 14:50:45 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8EventAction.hh"
+
+#include "Em8RunAction.hh"
+
+#include "Em8CalorHit.hh"
+#include "Em8EventActionMessenger.hh"
+
+#include "g4rw/tvordvec.h"
+
+#include "G4Event.hh"
+#include "G4EventManager.hh"
+#include "G4HCofThisEvent.hh"
+#include "G4VHitsCollection.hh"
+#include "G4SDManager.hh"
+#include "G4UImanager.hh"
+#include "G4TrajectoryContainer.hh"
+#include "G4Trajectory.hh"
+#include "G4VVisManager.hh"
+#include "G4ios.hh"
+#include "G4UnitsTable.hh"
+#include "Randomize.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8EventAction::Em8EventAction(Em8RunAction* Em8RA)
+:calorimeterCollID(-1),eventMessenger(NULL),
+ verboselevel(0),runaction(Em8RA),drawFlag("all"),printModulo(10000)
+{
+  eventMessenger = new Em8EventActionMessenger(this);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8EventAction::~Em8EventAction()
+{
+  delete eventMessenger;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::BeginOfEventAction(const G4Event* evt)
+{
+ G4int evtNb = evt->GetEventID();
+ if (evtNb%printModulo == 0) 
+    G4cout << "\n---> Begin of Event: " << evtNb << endl;
+     
+  if(verboselevel>1)
+    G4cout << "<<< Event  " << evtNb << " started." << endl;
+    
+  if (calorimeterCollID==-1)
+    {
+     G4SDManager * SDman = G4SDManager::GetSDMpointer();
+     calorimeterCollID = SDman->GetCollectionID("CalCollection");
+    } 
+
+  nstep = 0. ;
+  nstepCharged = 0. ;
+  nstepNeutral = 0. ;
+  Nch = 0. ;
+  Nne = 0. ;
+  NE=0.;
+  NP=0.;
+  Transmitted=0.;
+  Reflected  =0.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::EndOfEventAction(const G4Event* evt)
+{
+  G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
+  Em8CalorHitsCollection* CHC = NULL;
+  if (HCE)
+      CHC = (Em8CalorHitsCollection*)(HCE->GetHC(calorimeterCollID));
+
+  if (CHC)
+   {
+    int n_hit = CHC->entries();
+   // if(verboselevel==2)
+   // G4cout << "     " << n_hit
+   //      << " hits are stored in Em8CalorHitsCollection." << endl;
+
+    G4double totEAbs=0, totLAbs=0;
+    for (int i=0;i<n_hit;i++)
+      { totEAbs += (*CHC)[i]->GetEdepAbs(); 
+        totLAbs += (*CHC)[i]->GetTrakAbs();
+      }
+  if(verboselevel==2)
+    G4cout
+       << "   Absorber: total energy: " << setw(7) << 
+                             G4BestUnit(totEAbs,"Energy")
+       << "       total track length: " << setw(7) <<
+                             G4BestUnit(totLAbs,"Length")
+       << endl;           
+
+   // count event, add deposits to the sum ...
+    runaction->CountEvent() ;
+    runaction->AddTrackLength(totLAbs) ;
+    runaction->AddnStepsCharged(nstepCharged) ;
+    runaction->AddnStepsNeutral(nstepNeutral) ;
+    if(verboselevel==2)
+      G4cout << " Ncharged=" << Nch << "  ,   Nneutral=" << Nne << endl;
+    runaction->CountParticles(Nch,Nne);
+    runaction->AddEP(NE,NP);
+    runaction->AddTrRef(Transmitted,Reflected) ;
+    runaction->AddEdeps(totEAbs) ;
+    runaction->FillEn(totEAbs) ;
+
+    nstep=nstepCharged+nstepNeutral ;
+    runaction->FillNbOfSteps(nstep);
+  }
+  
+  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
+
+  if(pVVisManager)
+  {
+   G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
+   G4int n_trajectories = 0;
+   if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();  
+   for(G4int i=0; i<n_trajectories; i++) 
+      { G4Trajectory* trj = (G4Trajectory *)((*(evt->GetTrajectoryContainer()))[i]);
+        if (drawFlag == "all") trj->DrawTrajectory(50);
+        else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
+                               trj->DrawTrajectory(50); 
+      }
+  }  
+
+  if(verboselevel>0)
+    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << endl;
+  
+  
+  //save rndm status
+  if (runaction->GetRndmFreq() == 2)
+    { 
+     HepRandom::saveEngineStatus("endOfEvent.rndm");   
+     G4int evtNb = evt->GetEventID();
+     if (evtNb%printModulo == 0)
+       { 
+        G4cout << "\n---> End of Event: " << evtNb << endl;
+        HepRandom::showEngineStatus();
+       }
+    }     
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4int Em8EventAction::GetEventno()
+{
+  G4int evno = fpEventManager->GetConstCurrentEvent()->GetEventID() ;
+  return evno ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::setEventVerbose(G4int level)
+{
+  verboselevel = level ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::CountStepsCharged()
+{
+  nstepCharged += 1. ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::CountStepsNeutral()
+{
+  nstepNeutral += 1. ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::AddCharged() 
+{
+  Nch += 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::AddNeutral() 
+{
+  Nne += 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::AddE() 
+{
+  NE += 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::AddP() 
+{
+  NP += 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::SetTr()
+{
+  Transmitted = 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventAction::SetRef()
+{
+  Reflected   = 1.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+  
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
new file mode 100644
index 0000000000..7cb3b3f3ff
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
@@ -0,0 +1,72 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8EventActionMessenger.cc,v 1.1 2000/01/07 14:50:45 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8EventActionMessenger.hh"
+
+#include "Em8EventAction.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "globals.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8EventActionMessenger::Em8EventActionMessenger(Em8EventAction* EvAct)
+:eventAction(EvAct)
+{ 
+  setVerboseCmd = new G4UIcmdWithAnInteger("/event/setverbose",this);
+  setVerboseCmd->SetGuidance("Set verbose level ." );
+  setVerboseCmd->SetParameterName("level",true);
+  setVerboseCmd->SetDefaultValue(0);
+  
+  DrawCmd = new G4UIcmdWithAString("/event/drawTracks",this);
+  DrawCmd->SetGuidance("Draw the tracks in the event");
+  DrawCmd->SetGuidance("  Choice : none,charged, all");
+  DrawCmd->SetParameterName("choice",true);
+  DrawCmd->SetDefaultValue("all");
+  DrawCmd->SetCandidates("none charged all");
+  DrawCmd->AvailableForStates(Idle);
+  
+  PrintCmd = new G4UIcmdWithAnInteger("/event/printModulo",this);
+  PrintCmd->SetGuidance("Print events modulo n");
+  PrintCmd->SetParameterName("EventNb",false);
+  PrintCmd->SetRange("EventNb>0");
+  PrintCmd->AvailableForStates(Idle);     
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8EventActionMessenger::~Em8EventActionMessenger()
+{
+  delete setVerboseCmd;
+  delete DrawCmd;
+  delete PrintCmd;    
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8EventActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
+{ 
+  if(command == setVerboseCmd)
+    {eventAction->setEventVerbose(setVerboseCmd->GetNewIntValue(newValue));}
+    
+  if(command == DrawCmd)
+    {eventAction->SetDrawFlag(newValue);}
+    
+  if(command == PrintCmd)
+    {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));}               
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
new file mode 100644
index 0000000000..c066c7687c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
@@ -0,0 +1,446 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PhysicsList.cc,v 1.1 2000/01/07 14:50:45 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+// 
+
+   
+#include "Em8PhysicsList.hh"
+#include "Em8DetectorConstruction.hh"
+#include "Em8PhysicsListMessenger.hh"
+
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleWithCuts.hh"
+#include "G4ProcessManager.hh"
+#include "G4ProcessVector.hh"
+#include "G4ParticleTypes.hh"
+#include "G4ParticleTable.hh"
+#include "G4Material.hh"
+#include "G4EnergyLossTables.hh"
+#include "G4UnitsTable.hh"
+#include "G4Timer.hh"
+#include "G4ios.hh"
+#include <iomanip.h>                
+
+/////////////////////////////////////////////////////////////
+//
+//
+
+Em8PhysicsList::Em8PhysicsList(Em8DetectorConstruction* p)
+:  G4VUserPhysicsList(),
+ thePhotoElectricEffect(NULL),theComptonScattering(NULL),
+ theGammaConversion(NULL),
+ theeminusMultipleScattering(NULL),theeminusIonisation(NULL),
+ theeminusBremsstrahlung(NULL),
+ theeplusMultipleScattering(NULL),theeplusIonisation(NULL),
+ theeplusBremsstrahlung(NULL),
+ theeplusAnnihilation(NULL),
+ theeminusStepCut(NULL),theeplusStepCut(NULL),
+ MaxChargedStep(DBL_MAX)
+{
+  pDet = p;
+
+  defaultCutValue = 1.000*mm ;
+
+  cutForGamma = defaultCutValue ;
+  cutForElectron = defaultCutValue ;
+  cutForProton = defaultCutValue ;
+
+  SetVerboseLevel(1);
+  physicsListMessenger = new Em8PhysicsListMessenger(this);
+}
+
+/////////////////////////////////////////////////////////////////////////
+//
+//
+
+Em8PhysicsList::~Em8PhysicsList()
+{
+  delete physicsListMessenger; 
+}
+
+///////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8PhysicsList::ConstructParticle()
+{
+  // In this method, static member functions should be called
+  // for all particles which you want to use.
+  // This ensures that objects of these particle types will be
+  // created in the program. 
+
+  ConstructBosons();
+  ConstructLeptons();
+  ConstructMesons();
+  ConstructBarions();
+}
+
+////////////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8PhysicsList::ConstructBosons()
+{
+  // gamma
+  G4Gamma::GammaDefinition();
+}
+
+void Em8PhysicsList::ConstructLeptons()
+{
+  // leptons
+
+  G4Electron::ElectronDefinition();
+  G4Positron::PositronDefinition();
+  G4MuonPlus::MuonPlusDefinition();
+  G4MuonMinus::MuonMinusDefinition();
+
+  G4NeutrinoE::NeutrinoEDefinition();
+  G4AntiNeutrinoE::AntiNeutrinoEDefinition();
+  G4NeutrinoMu::NeutrinoMuDefinition();
+  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
+}
+
+void Em8PhysicsList::ConstructMesons()
+{
+ //  mesons
+
+  G4PionPlus::PionPlusDefinition();
+  G4PionMinus::PionMinusDefinition();
+  G4PionZero::PionZeroDefinition();
+  G4KaonPlus::KaonPlusDefinition();
+  G4KaonMinus::KaonMinusDefinition();
+}
+
+
+void Em8PhysicsList::ConstructBarions()
+{
+//  barions
+
+  G4Proton::ProtonDefinition();
+  G4AntiProton::AntiProtonDefinition();
+}
+
+
+///////////////////////////////////////////////////////////////////////
+//
+//
+
+void Em8PhysicsList::ConstructProcess()
+{
+  AddTransportation();
+  ConstructEM();
+  ConstructGeneral();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//
+
+#include "G4ComptonScattering.hh"
+#include "G4GammaConversion.hh"
+#include "G4PhotoElectricEffect.hh"
+
+#include "G4MultipleScattering.hh"
+
+#include "G4eIonisation.hh"
+#include "G4eBremsstrahlung.hh"
+#include "G4eplusAnnihilation.hh"
+
+#include "G4MuIonisation.hh"
+#include "G4MuBremsstrahlung.hh"
+#include "G4MuPairProduction.hh"
+
+#include "G4hIonisation.hh"
+#include "G4PAIonisation.hh"
+#include "G4ForwardXrayTR.hh"
+
+#include "Em8StepCut.hh"
+
+#include "G4IonisationByLogicalVolume.hh"
+
+void Em8PhysicsList::ConstructEM()
+{
+  theParticleIterator->reset();
+  while( (*theParticleIterator)() )
+  {
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    G4ProcessManager* pmanager = particle->GetProcessManager();
+    G4String particleName = particle->GetParticleName();
+     
+    if (particleName == "gamma") 
+    {
+      // Construct processes for gamma
+
+      thePhotoElectricEffect = new G4PhotoElectricEffect();      
+      theComptonScattering = new G4ComptonScattering();
+      theGammaConversion = new G4GammaConversion();
+      
+      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
+      pmanager->AddDiscreteProcess(theComptonScattering);
+
+      pmanager->AddDiscreteProcess(theGammaConversion);
+      
+    } 
+    else if (particleName == "e-") 
+    {
+      // Construct processes for electron 
+
+      // theeminusMultipleScattering = new G4MultipleScattering();
+      //   theeminusIonisation = new G4eIonisation();
+      theeminusBremsstrahlung = new G4eBremsstrahlung();
+
+     //   fPAIonisation = new G4PAIonisation("Xenon") ;
+     // fForwardXrayTR = new G4ForwardXrayTR("Air","Polypropelene","XrayTR") ;
+
+      theeminusStepCut = new Em8StepCut();
+
+      //  pmanager->AddProcess(theeminusMultipleScattering,-1,1,1);
+
+      //   pmanager->AddProcess(theeminusIonisation,-1,2,2);
+
+       pmanager->AddProcess(new G4IonisationByLogicalVolume(particleName,
+                                     pDet->GetLogicalAbsorber(),
+                                    "IonisationByLogVol"),-1,2,2);
+
+       pmanager->AddProcess(theeminusBremsstrahlung,-1,-1,3); 
+
+       //   pmanager->AddProcess(fPAIonisation,-1,2,2);
+ 
+       //  pmanager->AddProcess(fForwardXrayTR,-1,-1,2);
+     
+      pmanager->AddProcess(theeminusStepCut,-1,-1,4);
+      theeminusStepCut->SetMaxStep(MaxChargedStep) ;
+
+    } 
+    else if (particleName == "e+") 
+    {
+      // Construct processes for positron 
+
+      //   theeplusMultipleScattering = new G4MultipleScattering();
+      theeplusIonisation = new G4eIonisation();
+      theeplusBremsstrahlung = new G4eBremsstrahlung();
+      // theeplusAnnihilation = new G4eplusAnnihilation();
+
+      //  fPAIonisation = new G4PAIonisation("Xenon") ;
+      // fForwardXrayTR = new G4ForwardXrayTR("Air","Polypropelene","XrayTR") ;
+
+      theeplusStepCut = new Em8StepCut();
+      
+      //  pmanager->AddProcess(theeplusMultipleScattering,-1,1,1);
+      pmanager->AddProcess(theeplusIonisation,-1,2,2);
+      pmanager->AddProcess(theeplusBremsstrahlung,-1,-1,3);
+      //  pmanager->AddProcess(theeplusAnnihilation,0,-1,4); 
+     
+      //  pmanager->AddProcess(fPAIonisation,-1,2,2);
+
+
+      // pmanager->AddProcess(fForwardXrayTR,-1,-1,2);
+
+      pmanager->AddProcess(theeplusStepCut,-1,-1,5);
+      theeplusStepCut->SetMaxStep(MaxChargedStep) ;
+  
+    } 
+    else if( particleName == "mu+" || 
+               particleName == "mu-"    ) 
+    {
+     // Construct processes for muon+ 
+
+      //   Em8StepCut* muonStepCut = new Em8StepCut();
+
+      // G4MuIonisation* themuIonisation = new G4MuIonisation() ;
+     //  pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
+     //  pmanager->AddProcess(themuIonisation,-1,2,2);
+     //  pmanager->AddProcess(new G4MuBremsstrahlung(),-1,-1,3);
+     //  pmanager->AddProcess(new G4MuPairProduction(),-1,-1,4); 
+      
+      //  pmanager->AddProcess(new G4PAIonisation("Xenon"),-1,2,2) ;
+      // pmanager->AddProcess( muonStepCut,-1,-1,3);
+      //  muonStepCut->SetMaxStep(MaxChargedStep) ;
+
+    } 
+    else if (
+                particleName == "proton"  
+               || particleName == "antiproton"  
+               || particleName == "pi+"  
+               || particleName == "pi-"  
+               || particleName == "kaon+"  
+               || particleName == "kaon-"  
+              )
+    {
+      //  Em8StepCut* thehadronStepCut = new Em8StepCut();
+
+      //  G4hIonisation* thehIonisation = new G4hIonisation() ; 
+      //   G4MultipleScattering* thehMultipleScattering =
+      //                  new G4MultipleScattering() ;
+
+      //  pmanager->AddProcess(thehMultipleScattering,-1,1,1);
+      //  pmanager->AddProcess(thehIonisation,-1,2,2);
+
+      //  pmanager->AddProcess(new G4PAIonisation("Xenon"),-1,2,2) ;
+      // pmanager->AddProcess(new G4PAIonisation("Argon"),-1,2,2) ;
+      
+      //  pmanager->AddProcess( thehadronStepCut,-1,-1,3);
+      //  thehadronStepCut->SetMaxStep(MaxChargedStep) ;
+      // thehadronStepCut->SetMaxStep(10*mm) ;
+     
+    }
+  }
+}
+
+
+#include "G4Decay.hh"
+
+void Em8PhysicsList::ConstructGeneral()
+{
+  // Add Decay Process
+
+   G4Decay* theDecayProcess = new G4Decay();
+  theParticleIterator->reset();
+
+  while( (*theParticleIterator)() )
+  {
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    G4ProcessManager* pmanager = particle->GetProcessManager();
+
+    if (theDecayProcess->IsApplicable(*particle)) 
+    { 
+      pmanager ->AddProcess(theDecayProcess);
+
+      // set ordering for PostStepDoIt and AtRestDoIt
+
+      pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep);
+      pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest);
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetCuts()
+{
+  G4Timer theTimer ;
+  theTimer.Start() ;
+  if (verboseLevel >0)
+  {
+    G4cout << "Em8PhysicsList::SetCuts:";
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;
+  }  
+  // set cut values for gamma at first and for e- second and next for e+,
+  // because some processes for e+/e- need cut values for gamma
+ 
+   SetCutValue(cutForGamma,"gamma");
+
+   SetCutValue(cutForElectron,"e-");
+   SetCutValue(cutForElectron,"e+");
+
+   SetCutValue(defaultCutValue,"mu-");
+   SetCutValue(defaultCutValue,"mu+");
+
+  // set cut values for proton and anti_proton before all other hadrons
+  // because some processes for hadrons need cut values for proton/anti_proton 
+
+  SetCutValue(defaultCutValue, "proton");
+  SetCutValue(defaultCutValue, "anti_proton");
+
+  SetCutValueForOthers(defaultCutValue);
+              
+  if (verboseLevel>1)     DumpCutValuesTable();
+
+  theTimer.Stop();
+  G4cout.precision(6);
+  G4cout << endl ;
+  G4cout << "total time(SetCuts)=" << theTimer.GetUserElapsed() << " s " <<endl;
+
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetGammaCut(G4double val)
+{
+  ResetCuts();
+  cutForGamma = val;
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetElectronCut(G4double val)
+{
+  ResetCuts();
+  cutForElectron = val;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetProtonCut(G4double val)
+{
+  ResetCuts();
+  cutForProton = val;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetCutsByEnergy(G4double val)
+{
+  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
+  G4Material* currMat = pDet->GetAbsorberMaterial();
+
+  // set cut values for gamma at first and for e- second and next for e+,
+  // because some processes for e+/e- need cut values for gamma
+
+  G4ParticleDefinition* part;
+  G4double cut;
+
+  part = theParticleTable->FindParticle("e-");
+  cut = G4EnergyLossTables::GetRange(part,val,currMat);
+  SetCutValue(cut, "e-");
+
+  part = theParticleTable->FindParticle("e+");
+  cut = G4EnergyLossTables::GetRange(part,val,currMat);
+  SetCutValue(cut, "e+");
+
+  // set cut values for proton and anti_proton before all other hadrons
+  // because some processes for hadrons need cut values for proton/anti_proton
+
+  part = theParticleTable->FindParticle("proton");
+  cut = G4EnergyLossTables::GetRange(part,val,currMat);
+  SetCutValue(cut, "proton");
+
+  part = theParticleTable->FindParticle("anti_proton");
+  cut = G4EnergyLossTables::GetRange(part,val,currMat);
+  SetCutValue(cut, "anti_proton");
+
+  SetCutValueForOthers(cut);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::GetRange(G4double val)
+{
+  G4ParticleTable* theParticleTable =  G4ParticleTable::GetParticleTable();
+  G4Material* currMat = pDet->GetAbsorberMaterial();
+
+  G4ParticleDefinition* part;
+  G4double cut;
+  part = theParticleTable->FindParticle("e-");
+  cut = G4EnergyLossTables::GetRange(part,val,currMat);
+  G4cout << "material : " << currMat->GetName() << endl;
+  G4cout << "particle : " << part->GetParticleName() << endl;
+  G4cout << "energy   : " << val / keV << " (keV)" << endl;
+  G4cout << "range    : " << cut / mm << " (mm)" << endl;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+void Em8PhysicsList::SetMaxStep(G4double step)
+{
+  MaxChargedStep = step ;
+  G4cout << " MaxChargedStep=" << MaxChargedStep << endl;
+  G4cout << endl;
+}
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
new file mode 100644
index 0000000000..0ec723ed6f
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
@@ -0,0 +1,104 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PhysicsListMessenger.cc,v 1.1 2000/01/07 14:50:46 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8PhysicsListMessenger.hh"
+
+#include "Em8PhysicsList.hh"
+#include "G4UIcmdWithoutParameter.hh"
+#include "G4UIcmdWithADouble.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PhysicsListMessenger::Em8PhysicsListMessenger(Em8PhysicsList * List)
+:Em8List(List)
+{
+  cutGCmd = new G4UIcmdWithADoubleAndUnit("/calor/cutG",this);
+  cutGCmd->SetGuidance("Set cut values by RANGE for Gamma.");
+  cutGCmd->SetParameterName("range",true);
+  cutGCmd->SetDefaultValue(1.);
+  cutGCmd->SetDefaultUnit("mm");
+  cutGCmd->AvailableForStates(Idle);
+
+  cutECmd = new G4UIcmdWithADoubleAndUnit("/calor/cutE",this);
+  cutECmd->SetGuidance("Set cut values by RANGE for e- e+.");
+  cutECmd->SetParameterName("range",true);
+  cutECmd->SetDefaultValue(1.);
+  cutECmd->SetDefaultUnit("mm");
+  cutECmd->AvailableForStates(Idle);
+
+  cutPCmd = new G4UIcmdWithADoubleAndUnit("/calor/cutP",this);
+  cutPCmd->SetGuidance("Set cut values by RANGE for proton and others.");
+  cutPCmd->SetParameterName("range",true);
+  cutPCmd->SetDefaultValue(1.);
+  cutPCmd->SetDefaultUnit("mm");
+  cutPCmd->AvailableForStates(Idle);
+
+  eCmd = new G4UIcmdWithADoubleAndUnit("/calor/cutEnergy",this);
+  eCmd->SetGuidance("Set cut values by ENERGY for charged particles.");
+  eCmd->SetParameterName("energy",true);
+  eCmd->SetDefaultValue(10.);
+  eCmd->SetDefaultUnit("keV");
+  eCmd->AvailableForStates(Idle);
+
+  rCmd = new G4UIcmdWithADoubleAndUnit("/calor/range",this);
+  rCmd->SetGuidance("Display the RANGE of Electron for the current material.");
+  rCmd->SetParameterName("energy",true);
+  rCmd->SetDefaultValue(10.);
+  rCmd->SetDefaultUnit("keV");
+  rCmd->AvailableForStates(Idle);
+
+  setMaxStepCmd = new G4UIcmdWithADoubleAndUnit("/step/setMaxStep",this);
+  setMaxStepCmd->SetGuidance("Set max. step length in the detector");
+  setMaxStepCmd->SetParameterName("mxStep",true);
+  setMaxStepCmd->SetDefaultUnit("mm");
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PhysicsListMessenger::~Em8PhysicsListMessenger()
+{
+
+  delete setMaxStepCmd;
+
+  delete cutGCmd;
+  delete cutECmd;
+  delete cutPCmd;
+  delete rCmd;
+  delete eCmd;
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+  
+void Em8PhysicsListMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
+{
+  if(command == cutGCmd)
+    { Em8List->SetGammaCut(cutGCmd->GetNewDoubleValue(newValue));}
+  if(command == cutECmd)
+    { Em8List->SetElectronCut(eCmd->GetNewDoubleValue(newValue));}
+  if(command == cutPCmd)
+    { Em8List->SetProtonCut(eCmd->GetNewDoubleValue(newValue));}
+  if(command == eCmd)
+    { Em8List->SetCutsByEnergy(cutECmd->GetNewDoubleValue(newValue));}
+  if(command == rCmd)
+    { Em8List->GetRange(rCmd->GetNewDoubleValue(newValue));}
+  if(command == setMaxStepCmd)
+    { Em8List->SetMaxStep(setMaxStepCmd->GetNewDoubleValue(newValue));}
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
new file mode 100644
index 0000000000..552075cb3c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
@@ -0,0 +1,136 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PrimaryGeneratorAction.cc,v 1.1 2000/01/07 14:50:46 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8PrimaryGeneratorAction.hh"
+
+#include "Em8DetectorConstruction.hh"
+#include "Em8PrimaryGeneratorMessenger.hh"
+
+#include "G4Event.hh"
+#include "G4ParticleGun.hh"
+#include "G4ParticleTable.hh"
+#include "G4ParticleDefinition.hh"
+#include "Randomize.hh"
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+ 
+ G4String Em8PrimaryGeneratorAction::thePrimaryParticleName="proton" ; 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PrimaryGeneratorAction::Em8PrimaryGeneratorAction(
+                                            Em8DetectorConstruction* Em8DC)
+:Em8Detector(Em8DC),rndmFlag("off"),xvertex(0.),yvertex(0.),zvertex(0.),
+ vertexdefined(false)
+{
+  G4int n_particle = 1;
+  particleGun  = new G4ParticleGun(n_particle);
+  
+  //create a messenger for this class
+  gunMessenger = new Em8PrimaryGeneratorMessenger(this);
+
+  // default particle kinematic
+
+  G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
+  G4String particleName;
+  G4ParticleDefinition* particle
+                    = particleTable->FindParticle(particleName="proton");
+  particleGun->SetParticleDefinition(particle);
+  
+  thePrimaryParticleName = particle->GetParticleName() ;
+
+  particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,1.));
+  particleGun->SetParticleEnergy(100.*GeV);
+
+  zvertex = 0.0 ; //  -0.5*(Em8Detector->GetAbsorberThickness());
+  particleGun->SetParticlePosition(G4ThreeVector(xvertex,yvertex,zvertex));
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PrimaryGeneratorAction::~Em8PrimaryGeneratorAction()
+{
+  delete particleGun;
+  delete gunMessenger;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
+{
+  //this function is called at the begining of event
+  // 
+  thePrimaryParticleName = particleGun->GetParticleDefinition()->
+                                                GetParticleName() ;
+  G4double x0,y0,z0 ;
+  if(vertexdefined)
+  {
+    x0 = xvertex ;
+    y0 = yvertex ;
+    z0 = zvertex ;
+  }
+  else
+  {
+    x0 = 0. ;
+    y0 = 0. ;
+    z0 = 0. ; // -0.5*(Em8Detector->GetWorldSizeZ()) ;
+  }
+  G4double r0,phi0 ;
+  /* ****************************************************
+  if (rndmFlag == "on")
+  {
+      r0 = (Em8Detector->GetAbsorberRadius())*sqrt(G4UniformRand());
+      phi0 = twopi*G4UniformRand();
+      x0 = r0*cos(phi0);
+      y0 = r0*sin(phi0);
+  } 
+  ********************************************* */
+  particleGun->SetParticlePosition(G4ThreeVector(x0,y0,z0));
+  particleGun->GeneratePrimaryVertex(anEvent);
+}
+
+///////////////////////////////////////////////////////////////////////
+//
+//
+
+G4String Em8PrimaryGeneratorAction::GetPrimaryName()
+{
+   return thePrimaryParticleName ;
+}
+
+void Em8PrimaryGeneratorAction::Setzvertex(G4double z)
+{
+  vertexdefined = true ;
+  zvertex = z ;
+  G4cout << " Z coordinate of the primary vertex = " << zvertex/mm <<
+            " mm." << endl;
+}
+void Em8PrimaryGeneratorAction::Setxvertex(G4double x)
+{
+  vertexdefined = true ;
+  xvertex = x ;
+  G4cout << " X coordinate of the primary vertex = " << xvertex/mm <<
+            " mm." << endl;
+}
+
+void Em8PrimaryGeneratorAction::Setyvertex(G4double y)
+{
+  vertexdefined = true ;
+  yvertex = y ;
+  G4cout << " Y coordinate of the primary vertex = " << yvertex/mm <<
+            " mm." << endl;
+}
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
new file mode 100644
index 0000000000..a55f870998
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
@@ -0,0 +1,77 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8PrimaryGeneratorMessenger.cc,v 1.1 2000/01/07 14:50:46 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8PrimaryGeneratorMessenger.hh"
+
+#include "Em8PrimaryGeneratorAction.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PrimaryGeneratorMessenger::Em8PrimaryGeneratorMessenger(Em8PrimaryGeneratorAction* Em8Gun)
+:Em8Action(Em8Gun)
+{ 
+  RndmCmd = new G4UIcmdWithAString("/gun/random",this);
+  RndmCmd->SetGuidance("Shoot randomly the incident particle.");
+  RndmCmd->SetGuidance("  Choice : on, off(default)");
+  RndmCmd->SetParameterName("choice",true);
+  RndmCmd->SetDefaultValue("off");
+  RndmCmd->SetCandidates("on off");
+  RndmCmd->AvailableForStates(PreInit,Idle);
+ 
+  setxvertexCmd = new G4UIcmdWithADoubleAndUnit("/gun/xvertex",this);
+  setxvertexCmd->SetGuidance(" Set x coord. of the primary vertex.");
+  setxvertexCmd->SetParameterName("xv",true);
+  setxvertexCmd->SetDefaultValue(0.0*mm) ; 
+  
+  setyvertexCmd = new G4UIcmdWithADoubleAndUnit("/gun/yvertex",this);
+  setyvertexCmd->SetGuidance(" Set y coord. of the primary vertex.");
+  setyvertexCmd->SetParameterName("yv",true);
+  setyvertexCmd->SetDefaultValue(0.0*mm) ; 
+  
+  setzvertexCmd = new G4UIcmdWithADoubleAndUnit("/gun/zvertex",this);
+  setzvertexCmd->SetGuidance(" Set z coord. of the primary vertex.");
+  setzvertexCmd->SetParameterName("zv",true);
+  setzvertexCmd->SetDefaultValue(0.0*mm) ; 
+  
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8PrimaryGeneratorMessenger::~Em8PrimaryGeneratorMessenger()
+{
+  delete RndmCmd;
+  delete setxvertexCmd;
+  delete setyvertexCmd;
+  delete setzvertexCmd;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8PrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
+{ 
+  if( command == RndmCmd )
+   { Em8Action->SetRndmFlag(newValue);}
+  if( command == setxvertexCmd)
+   { Em8Action->Setxvertex(setxvertexCmd->GetNewDoubleValue(newValue));}
+  if( command == setyvertexCmd)
+   { Em8Action->Setyvertex(setyvertexCmd->GetNewDoubleValue(newValue));}
+  if( command == setzvertexCmd)
+   { Em8Action->Setzvertex(setzvertexCmd->GetNewDoubleValue(newValue));}
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
new file mode 100644
index 0000000000..e7f779aaae
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
@@ -0,0 +1,1284 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8RunAction.cc,v 1.1 2000/01/07 14:50:46 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+
+#include "Em8RunAction.hh"
+#include "Em8RunMessenger.hh"
+
+#include "G4Run.hh"
+#include "G4UImanager.hh"
+#include "G4VVisManager.hh"
+#include "G4ios.hh"
+#include <iomanip.h>
+
+#include "Randomize.hh"
+#include "CLHEP/Hist/HBookFile.h"
+#include <assert.h>
+
+//////////////////////////////////////////////////////////////////////////////
+
+Em8RunAction::Em8RunAction()
+  :histName("histfile"),nbinStep(0),nbinEn(0),nbinTt(0),nbinTb(0),
+   nbinTsec(0),nbinTh(0),nbinThback(0),nbinR(0),nbinGamma(0),
+   nbinvertexz(0),histo1(0),histo2(0),histo3(0),histo4(0),histo5(0),
+   histo6(0),histo7(0),histo8(0),histo9(0),histo10(0)
+{
+  runMessenger = new Em8RunMessenger(this);
+  saveRndm = 1;  
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+Em8RunAction::~Em8RunAction()
+{
+  delete runMessenger;
+  if(histo1) delete histo1 ;
+  if(histo2) delete histo2 ;
+  if(histo3) delete histo3 ;
+  if(histo4) delete histo4 ;
+  if(histo5) delete histo5 ;
+  if(histo6) delete histo6 ;
+  if(histo7) delete histo7 ;
+  if(histo8) delete histo8 ;
+  if(histo9) delete histo9 ;
+  if(histo10) delete histo10 ;
+  delete hbookManager;
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::bookHisto()
+{
+  // init hbook
+
+  hbookManager = new HBookFile(histName, 68);
+  assert (hbookManager != 0);
+
+  // book histograms
+
+  if(nbinStep>0)
+  {
+    histo1 = hbookManager->histogram("number of steps/event"
+                                   ,nbinStep,Steplow,Stephigh) ;
+    assert (histo1 != 0);
+  }
+  if(nbinEn>0)
+  {
+    histo2 = hbookManager->histogram("Energy Loss (keV)"
+                                     ,nbinEn,Enlow/keV,Enhigh/keV) ;
+    assert (histo2 != 0);
+  }
+  if(nbinTh>0)
+  {
+    histo3 = hbookManager->histogram("angle distribution at exit(deg)"
+                                     ,nbinTh,Thlow/deg,Thhigh/deg) ;
+    assert (histo3 != 0);
+  }
+  if(nbinR>0)
+  {
+    histo4 = hbookManager->histogram("lateral distribution at exit(mm)"
+                                     ,nbinR ,Rlow,Rhigh)  ;
+    assert (histo4 != 0);
+  }
+  if(nbinTt>0)
+  {
+    histo5 = hbookManager->histogram("kinetic energy of the primary at exit(MeV)"
+                                     ,nbinTt,Ttlow,Tthigh)  ;
+    assert (histo5 != 0);
+  }
+  if(nbinThback>0)
+  {
+    histo6 = hbookManager->histogram("angle distribution of backscattered primaries(deg)"
+                                     ,nbinThback,Thlowback/deg,Thhighback/deg) ;
+    assert (histo6 != 0);
+  }
+  if(nbinTb>0)
+  {
+    histo7 = hbookManager->histogram("kinetic energy of the backscattered primaries (MeV)"
+                                     ,nbinTb,Tblow,Tbhigh)  ;
+    assert (histo7 != 0);
+  }
+  if(nbinTsec>0)
+  {
+    histo8 = hbookManager->histogram("kinetic energy of the charged secondaries (MeV)"
+                                     ,nbinTsec,Tseclow,Tsechigh)  ;
+    assert (histo8 != 0);
+  }
+  if(nbinvertexz>0)
+  {
+    histo9 = hbookManager->histogram("z of secondary charged vertices(mm)"
+                                     ,nbinvertexz ,zlow,zhigh)  ;
+    assert (histo9 != 0);
+  }
+  if(nbinGamma>0)
+  {
+    histo10= hbookManager->histogram("kinetic energy of gammas escaping the absorber (MeV)"
+                                //     ,nbinGamma,ElowGamma,EhighGamma)  ;
+                                ,nbinGamma,log10(ElowGamma),log10(EhighGamma))  ;
+    assert (histo10 != 0);
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::BeginOfRunAction(const G4Run* aRun)
+{  
+  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  
+  // save Rndm status
+  if (saveRndm > 0)
+  { 
+      HepRandom::showEngineStatus();
+      HepRandom::saveEngineStatus("beginOfRun.rndm");
+  }  
+  G4UImanager* UI = G4UImanager::GetUIpointer();
+   
+  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
+
+  if(pVVisManager)    UI->ApplyCommand("/vis/scene/notifyHandlers");
+
+      
+  EnergySumAbs = 0. ;
+  EnergySquareSumAbs = 0.;
+  tlSumAbs = 0. ;
+  tlsquareSumAbs = 0. ;
+  nStepSumCharged = 0. ;
+  nStepSum2Charged= 0. ;
+  nStepSumNeutral = 0. ;
+  nStepSum2Neutral= 0. ;
+  TotNbofEvents = 0. ;
+  SumCharged=0.;
+  SumNeutral=0.;
+  Sum2Charged=0.;
+  Sum2Neutral=0.;
+  Selectron=0.;
+  Spositron=0.;
+
+  Transmitted=0.;
+  Reflected  =0.;
+
+//  plot definitions 
+   
+  if(nbinStep>0)
+  {
+    dStep=(Stephigh-Steplow)/nbinStep;
+    entryStep=0.;
+    underStep=0.;
+    overStep=0.;
+    for(G4int ist=0; ist<nbinStep; ist++)
+    {
+      distStep[ist]=0.;
+    }
+  }      
+  if(nbinEn>0)
+  {
+    dEn = (Enhigh-Enlow)/nbinEn ;
+    entryEn=0.;
+    underEn=0.;
+    overEn=0.;
+
+    for (G4int ien=0; ien<nbinEn; ien++)   distEn[ien]=0.;
+  }
+  if(nbinTt>0)
+  {
+    dTt = (Tthigh-Ttlow)/nbinTt ;
+    entryTt=0.;
+    underTt=0.;
+    overTt=0.;
+
+    for (G4int itt=0; itt<nbinTt; itt++)  distTt[itt]=0.;
+
+    Ttmean=0.;
+    Tt2mean=0.;
+  }
+  if(nbinTb>0)
+  {
+    dTb = (Tbhigh-Tblow)/nbinTb ;
+    entryTb=0.;
+    underTb=0.;
+    overTb=0.;
+    for (G4int itt=0; itt<nbinTb; itt++)
+    {
+      distTb[itt]=0.;
+    }
+    Tbmean=0.;
+    Tb2mean=0.;
+  }
+  if(nbinTsec>0)
+  {
+    dTsec = (Tsechigh-Tseclow)/nbinTsec ;
+    entryTsec=0.;
+    underTsec=0.;
+    overTsec=0.;
+    for (G4int its=0; its<nbinTsec; its++)
+    {
+      distTsec[its]=0.;
+    }
+  }
+  if(nbinTh>0)
+  {
+    dTh = (Thhigh-Thlow)/nbinTh ;
+    entryTh=0.;
+    underTh=0.;
+    overTh=0.;
+    for (G4int ith=0; ith<nbinTh; ith++)
+    {
+      distTh[ith]=0.;
+    }
+  }
+
+  if(nbinThback>0)
+  {
+    dThback = (Thhighback-Thlowback)/nbinThback ;
+    entryThback=0.;
+    underThback=0.;
+    overThback=0.;
+    for (G4int ithback=0; ithback<nbinThback; ithback++)
+    {
+      distThback[ithback]=0.;
+    }
+  }
+
+
+  if(nbinR >0)
+  {
+    dR  = (Rhigh-Rlow)/nbinR  ;
+    entryR =0.;
+    underR =0.;
+    overR =0.;
+    for (G4int ir =0; ir <nbinR ; ir++)
+    {
+      distR[ir]=0.;
+    }
+    Rmean=0.;
+    R2mean=0.;
+  }
+
+  if(nbinGamma>0)
+  {
+    dEGamma = log(EhighGamma/ElowGamma)/nbinGamma ;
+    entryGamma = 0.;
+    underGamma=0.;
+    overGamma=0.;
+    for (G4int ig=0; ig<nbinGamma; ig++)
+    {
+      distGamma[ig]=0.;
+    }
+  } 
+  if(nbinvertexz>0)
+  {
+    dz=(zhigh-zlow)/nbinvertexz;
+    entryvertexz=0.;
+    undervertexz=0.;
+    oververtexz=0.;
+    for(G4int iz=0; iz<nbinvertexz; iz++)
+    {
+      distvertexz[iz]=0.;
+    }
+  }
+
+  bookHisto();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::EndOfRunAction(const G4Run* aRun)
+{
+  G4double sAbs,sigAbs,sigstep,sigcharged,signeutral;
+
+  tlSumAbs /= TotNbofEvents ;
+  sAbs = tlsquareSumAbs/TotNbofEvents-tlSumAbs*tlSumAbs ;
+  if(sAbs>0.)
+    sAbs = sqrt(sAbs/TotNbofEvents) ;
+  else
+    sAbs = 0. ;
+  
+  EnergySumAbs /= TotNbofEvents ;
+  sigAbs = EnergySquareSumAbs/TotNbofEvents-EnergySumAbs*EnergySumAbs;
+  if(sigAbs>0.)
+    sigAbs = sqrt(sigAbs/TotNbofEvents);
+  else
+    sigAbs = 0.;
+
+  nStepSumCharged /= TotNbofEvents ;
+  sigstep = nStepSum2Charged/TotNbofEvents-nStepSumCharged*nStepSumCharged;
+  if(sigstep>0.)
+    sigstep = sqrt(sigstep/TotNbofEvents);
+  else
+    sigstep = 0.;
+  G4double sigch=sigstep ;
+  
+  nStepSumNeutral /= TotNbofEvents ;
+  sigstep = nStepSum2Neutral/TotNbofEvents-nStepSumNeutral*nStepSumNeutral;
+  if(sigstep>0.)
+    sigstep = sqrt(sigstep/TotNbofEvents);
+  else
+    sigstep = 0.;
+  G4double signe=sigstep ;
+  
+  SumCharged /= TotNbofEvents;
+  sigcharged = Sum2Charged/TotNbofEvents-SumCharged*SumCharged; 
+  if(sigcharged>0.)
+    sigcharged = sqrt(sigcharged/TotNbofEvents);
+  else
+    sigcharged = 0. ;
+ 
+  SumNeutral /= TotNbofEvents;
+  signeutral = Sum2Neutral/TotNbofEvents-SumNeutral*SumNeutral; 
+  if(signeutral>0.)
+    signeutral = sqrt(signeutral/TotNbofEvents);
+  else
+    signeutral = 0. ;
+ 
+  Selectron /= TotNbofEvents ;
+  Spositron /= TotNbofEvents ;
+
+  Transmitted /=TotNbofEvents ;
+  Reflected   /=TotNbofEvents ;
+ G4cout << " ================== run summary =====================" << endl;
+ G4int prec = G4cout.precision(6);
+  G4cout << " end of Run TotNbofEvents = " <<  
+           TotNbofEvents << endl ;
+  G4cout << "    mean charged track length   in absorber=" <<
+           tlSumAbs/mm      << " +- " << sAbs/mm    <<
+          "  mm  " << endl; 
+  G4cout << endl;
+  G4cout << "            mean energy deposit in absorber=" <<
+           EnergySumAbs/MeV << " +- " << sigAbs/MeV <<
+          "  MeV " << endl ;
+  G4cout << endl ;
+  G4cout << " mean number of steps in absorber (charged) =" <<
+           nStepSumCharged         << " +- " << sigch     <<
+          "      " << endl ;
+  G4cout << " mean number of steps in absorber (neutral) =" <<
+           nStepSumNeutral         << " +- " << signe     <<
+          "      " << endl ;
+  G4cout << endl ;
+  G4cout << "   mean number of charged secondaries = " <<
+           SumCharged << " +- " << sigcharged << endl;  
+  G4cout << endl ;
+  G4cout << "   mean number of neutral secondaries = " <<
+           SumNeutral << " +- " << signeutral << endl;  
+  G4cout << endl ;
+  
+  G4cout << "   mean number of e-s =" << Selectron << 
+            "  and e+s =" << Spositron << endl;
+  G4cout << endl; 
+  
+  G4cout << "(number) transmission coeff=" << Transmitted <<
+            "  reflection coeff=" << Reflected << endl;
+  G4cout << endl; 
+
+  if(nbinStep>0)
+  {G4double E , dnorm, norm ;
+   G4cout << "   step number/event distribution " << endl ;
+   G4cout << "#entries=" << entryStep << "    #underflows=" << underStep <<
+             "    #overflows=" << overStep << endl ;
+   if( entryStep>0.)
+   {
+     E = Steplow - dStep ;
+     norm = TotNbofEvents ;
+     G4cout << " bin nb   nsteplow     entries     normalized " << endl ;
+     for(G4int iss=0; iss<nbinStep; iss++)
+     {
+      E += dStep ;
+      dnorm = distStep[iss]/norm;
+      G4cout << setw(5) << iss << setw(10) << E << 
+                setw(12) << distStep[iss] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }     
+  }
+  if(nbinEn > 0)
+  {
+    ofstream fileOut("PAIdistribution.out", ios::out ) ;
+    fileOut.setf( ios::scientific, ios::floatfield );
+
+    G4double E , dnorm, norm,fmax,Emp,width ;
+    Emp=-999.999 ;
+    G4cout << " energy deposit distribution " << endl ;
+    G4cout << "#entries=" << entryEn << "    #underflows=" << underEn <<
+             "    #overflows=" << overEn << endl ;
+    if( entryEn>0.)
+    {
+      E = Enlow - dEn ;
+      norm = TotNbofEvents*dEn ;
+      G4cout << " bin nb      Elow      entries     normalized " << endl ;
+      fmax = 0. ;
+
+      for(G4int ien=0; ien<nbinEn; ien++)
+      {
+        E += dEn ;
+
+        if(distEn[ien]>fmax)
+        {
+          fmax = distEn[ien] ;
+          Emp = E ;                // most probable roughly
+        }
+        dnorm = distEn[ien]/norm;
+
+        G4cout << setw(5) << ien << setw(10) << E/keV << 
+                  setw(12) << distEn[ien] <<
+                  setw(12) << dnorm << endl ;
+
+        fileOut << E/keV << "\t"<< distEn[ien] << "\t" << dnorm << endl ;
+      }
+      G4cout << endl;
+      G4int ii ;
+      G4double E1,E2 ;
+      E1=-1.e6 ;
+      E2=+1.e6 ;
+      E = Enlow -dEn ;
+      ii = -1;
+
+      for(G4int i1=0; i1<nbinEn; i1++)
+      {
+        E += dEn ;
+        if(ii<0)
+        {
+          if(distEn[i1] >= 0.5*fmax)
+          {
+            E1=E ;
+            ii=i1 ;
+          }
+        }
+      }
+      E = Enlow -dEn ;
+
+      for(G4int i2=0; i2<nbinEn; i2++)
+      {
+        E += dEn ;
+
+        if(distEn[i2] >= 0.5*fmax)   E2=E ;
+      }
+      G4cout << " Emp = " << setw(15) << Emp/MeV << "   width="
+            << setw(15) << (E2-E1)/MeV <<   "  MeV " << endl;
+      G4cout << endl ;
+    }     
+  }
+  if(nbinTt>0)
+  {
+     G4double E , dnorm, norm ,sig;
+   G4cout << " transmitted energy distribution " << endl ;
+   G4cout << "#entries=" << entryTt << "    #underflows=" << underTt <<
+             "    #overflows=" << overTt << endl ;
+   if( entryTt>0.)
+   {
+     Ttmean /= entryTt;
+     sig=Tt2mean/entryTt-Ttmean*Ttmean ;
+     if(sig<=0.)
+       sig=0.;
+     else
+       sig=sqrt(sig/entryTt) ;
+     G4cout << " mean energy of transmitted particles=" << Ttmean/keV << 
+               " +- " << sig/keV << "  keV." << endl;
+     E = Ttlow - dTt ;
+     norm = TotNbofEvents*dTt ;
+     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     for(G4int itt=0; itt<nbinTt; itt++)
+     {
+      E += dTt ;
+      dnorm = distTt[itt]/norm;
+      G4cout << setw(5) << itt << setw(10) << E << 
+                setw(12) << distTt[itt] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }     
+  }
+  if(nbinTb>0)
+  {
+     G4double E , dnorm, norm ,sig;
+   G4cout << " backscattered energy distribution " << endl ;
+   G4cout << "#entries=" << entryTb << "    #underflows=" << underTb <<
+             "    #overflows=" << overTb << endl ;
+   if( entryTb>0.)
+   {
+     Tbmean /= entryTb;
+     sig=Tb2mean/entryTb-Tbmean*Tbmean ;
+     if(sig<=0.)
+       sig=0.;
+     else
+       sig=sqrt(sig/entryTb) ;
+     G4cout << " mean energy of backscattered particles=" << Tbmean/keV << 
+               " +- " << sig/keV << "  keV." << endl;
+     E = Tblow - dTb ;
+     norm = TotNbofEvents*dTb ;
+     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     for(G4int itt=0; itt<nbinTb; itt++)
+     {
+      E += dTb ;
+      dnorm = distTb[itt]/norm;
+      G4cout << setw(5) << itt << setw(10) << E << 
+                setw(12) << distTb[itt] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }     
+  }
+  if(nbinTsec>0)
+  {G4double E , dnorm, norm ;
+   G4cout << " energy distribution of charged secondaries " << endl ;
+   G4cout << "#entries=" << entryTsec << "    #underflows=" << underTsec <<
+             "    #overflows=" << overTsec << endl ;
+   if( entryTsec>0.)
+   {
+     E = Tseclow - dTsec ;
+     norm = TotNbofEvents*dTsec ;
+     G4cout << " bin nb      Elow      entries     normalized " << endl ;
+     for(G4int itt=0; itt<nbinTsec; itt++)
+     {
+      E += dTsec ;
+      dnorm = distTsec[itt]/norm;
+      G4cout << setw(5) << itt << setw(10) << E << 
+                setw(12) << distTsec[itt] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }     
+  }
+
+  if(nbinR >0)
+  {G4double R , dnorm, norm,sig  ;
+   G4cout << "  R  distribution " << endl ;
+   G4cout << "#entries=" << entryR  << "    #underflows=" << underR  <<
+             "    #overflows=" << overR  << endl ;
+   if( entryR >0.)
+   {
+     Rmean /= entryR;
+     sig = R2mean/entryR - Rmean*Rmean;
+     if(sig<=0.) sig=0. ;
+     else        sig = sqrt(sig/entryR) ;
+     G4cout << " mean lateral displacement at exit=" << Rmean/mm << " +- "
+            << sig/mm << "  mm." << endl ; 
+     R = Rlow - dR  ;
+     norm = TotNbofEvents*dR  ;
+     G4cout << " bin nb      Rlow      entries     normalized " << endl ;
+     for(G4int ier=0; ier<nbinR ; ier++)
+     {
+      R+= dR  ;
+      dnorm = distR[ier]/norm;
+      G4cout << setw(5) << ier << setw(10) << R  <<
+                setw(12) << distR[ier] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }
+  }
+
+  if(nbinTh>0)
+  {G4double Th,Thdeg, dnorm, norm,fac0,fnorm,pere,Thpere,Thmean,sum;
+   G4cout << "      angle   distribution " << endl ;
+   G4cout << "#entries=" << entryTh << "    #underflows=" << underTh <<
+             "    #overflows=" << overTh << endl ;
+   if( entryTh>0.)
+   {
+     Th= Thlow - dTh ;
+     norm = TotNbofEvents ;
+     if(distTh[0] == 0.)
+       fac0 = 1. ;
+     else
+       fac0 = 1./distTh[0] ;
+     pere = 1./exp(1.) ;
+
+     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
+               " entries         normalized " << endl ;
+     Thpere = 0. ;
+     sum = 0. ;
+     Thmean = 0. ;
+     for(G4int ien=0; ien<nbinTh; ien++)
+     {
+      Th+= dTh ;
+      Thdeg = Th*180./pi ;
+      sum += distTh[ien] ;
+      Thmean += distTh[ien]*(Th+0.5*dTh) ;
+      dnorm = distTh[ien]/norm;
+      fnorm = fac0*distTh[ien] ;
+      if( fnorm > pere)
+        Thpere = Th ; 
+      G4cout << setw(5) << ien << setw(10) << Thdeg << "   " <<
+                setw(10) << Th << "  " <<   
+                setw(12) << distTh[ien] << "  " <<
+                setw(12) << dnorm << "  " << setw(12) << fnorm <<endl ;
+     }
+     Thmean /= sum ;
+     G4cout << endl;
+     G4cout << " mean = " << Thmean << "  rad  or " << 180.*Thmean/pi <<
+               " deg." << endl;
+     G4cout << " theta(1/e)=" << Thpere << " - " << Thpere+dTh << " rad   "
+            << " or " << 180.*Thpere/pi << " - " << 180.*(Thpere+dTh)/pi 
+            << " deg." << endl;
+     G4cout << endl;
+   }
+  }
+
+  if(nbinThback>0)
+  {G4double Thb,Thdegb, dnormb, normb,fac0b,fnormb,pereb,Thpereb,Thmeanb,sumb;
+   G4cout << " backscattering angle   distribution " << endl ;
+   G4cout << "#entries=" << entryThback << "    #underflows=" << underThback <<
+             "    #overflows=" << overThback << endl ;
+   if( entryThback>0.)
+   {
+     Thb= Thlowback - dThback ;
+     normb = TotNbofEvents ;
+     if(distThback[0] == 0.)
+       fac0b = 1. ;
+     else
+       fac0b = 1./distThback[0] ;
+     pereb = 1./exp(1.) ;
+
+     G4cout << " bin nb  Thlowdeg      Thlowrad      " <<
+               " entries         normalized " << endl ;
+     Thpereb = 0. ;
+     sumb = 0. ;
+     Thmeanb = 0. ;
+     for(G4int ien=0; ien<nbinThback; ien++)
+     {
+      Thb+= dThback ;
+      Thdegb = Thb*180./pi ;
+      sumb += distThback[ien] ;
+      Thmeanb += distThback[ien]*(Thb+0.5*dThback) ;
+      dnormb = distThback[ien]/normb;
+      fnormb = fac0b*distThback[ien] ;
+      if( fnormb > pereb)
+        Thpereb = Thb ;
+      G4cout << setw(5) << ien << setw(10) << Thdegb << "   " <<
+                setw(10) << Thb << "  " <<
+                setw(12) << distThback[ien] << "  " <<
+                setw(12) << dnormb << "  " << setw(12) << fnormb <<endl ;
+     }
+     Thmeanb /= sumb ;
+     G4cout << endl;
+     G4cout << " mean = " << Thmeanb << "  rad  or " << 180.*Thmeanb/pi <<
+               " deg." << endl;
+     G4cout << " theta(1/e)=" << Thpereb << " - " << Thpereb+dThback << " rad   "
+            << " or " << 180.*Thpereb/pi << " - " << 180.*(Thpereb+dThback)/pi
+            << " deg." << endl;
+     G4cout << endl;
+   }
+  }
+
+  if(nbinGamma>0)
+  {G4double E , fact,dnorm, norm  ;
+   G4cout << " gamma energy distribution " << endl ;
+   G4cout << "#entries=" << entryGamma << "    #underflows=" << underGamma <<
+             "    #overflows=" << overGamma << endl ;
+   if( entryGamma>0.)
+   {
+     fact=exp(dEGamma) ;
+     E = ElowGamma/fact  ;
+     norm = TotNbofEvents*dEGamma;
+     G4cout << " bin nb         Elow      entries       normalized " << endl ;
+     for(G4int itt=0; itt<nbinGamma; itt++)
+     {
+      E *= fact ;
+      dnorm = distGamma[itt]/norm;
+      G4cout << setw(5) << itt << setw(13) << E << 
+                setw(12) << distGamma[itt] <<
+                setw(15) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }     
+  }
+
+  if(nbinvertexz >0)
+  {G4double z , dnorm, norm  ;
+   G4cout << " vertex Z  distribution " << endl ;
+   G4cout << "#entries=" << entryvertexz  << "    #underflows=" << undervertexz  <<
+             "    #overflows=" << oververtexz  << endl ;
+   if( entryvertexz >0.)
+   {
+     z =zlow - dz  ;
+     norm = TotNbofEvents*dz  ;
+     G4cout << " bin nb      zlow      entries     normalized " << endl ;
+     for(G4int iez=0; iez<nbinvertexz ; iez++)
+     {
+      z+= dz  ;
+      if(abs(z)<1.e-12) z=0.;
+      dnorm = distvertexz[iez]/norm;
+      G4cout << setw(5) << iez << setw(10) << z  <<
+                setw(12) << distvertexz[iez] <<
+                setw(12) << dnorm << endl ;
+     }
+     G4cout << endl;
+   }
+  }
+  
+ G4cout.precision(prec);
+  
+  if (G4VVisManager::GetConcreteInstance())
+  {
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
+  }
+  // Write histogram file
+
+  hbookManager->write();
+   
+  // save Rndm status
+
+  if (saveRndm == 1)
+  { 
+    HepRandom::showEngineStatus();
+    HepRandom::saveEngineStatus("endOfRun.rndm");
+  }     
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::CountEvent()
+{
+  TotNbofEvents += 1. ;
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::AddnStepsCharged(G4double ns)
+{
+  nStepSumCharged += ns;
+  nStepSum2Charged += ns*ns;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::AddnStepsNeutral(G4double ns)
+{
+  nStepSumNeutral += ns;
+  nStepSum2Neutral += ns*ns;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::AddEdeps(G4double Eabs)
+{
+  EnergySumAbs += Eabs;
+  EnergySquareSumAbs += Eabs*Eabs;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::AddTrackLength(G4double tlabs)
+{
+  tlSumAbs += tlabs;
+  tlsquareSumAbs += tlabs*tlabs ;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::AddTrRef(G4double tr,G4double ref)
+{
+  Transmitted += tr ;
+  Reflected   += ref;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillNbOfSteps(G4double ns)
+{
+  const G4double eps = 1.e-10 ;
+  G4double n,bin ;
+  G4int ibin;
+ 
+  if(histo1)
+  {
+    entryStep += 1. ;
+ 
+    if(ns<Steplow)
+      underStep += 1. ;
+    else if(ns>=Stephigh)
+      overStep  += 1. ;
+    else
+    {
+      n = ns+eps ;
+      bin = (n-Steplow)/dStep ;
+      ibin= (G4int)bin ;
+      distStep[ibin] += 1. ;
+    }
+   histo1->accumulate(ns) ;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillEn(G4double En)
+{
+  G4double bin ;
+  G4int ibin;
+
+  if(histo2)
+  {
+    entryEn += 1. ;
+ 
+    if(En < Enlow)          underEn += 1. ;
+    else if( En >= Enhigh)  overEn  += 1. ;
+    else
+    {
+      bin = (En-Enlow)/dEn ;
+      ibin= (G4int)bin ;
+      distEn[ibin] += 1. ;
+    }
+    histo2->accumulate(En/keV) ; // was /MeV
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillTt(G4double En)
+{
+  G4double bin ;
+  G4int ibin;
+
+  if(histo5)
+  {
+    entryTt += 1. ;
+    Ttmean += En ;
+    Tt2mean += En*En ;
+
+    if(En<Ttlow)
+      underTt += 1. ;
+    else if(En>=Tthigh)
+      overTt  += 1. ;
+    else
+    {
+      bin = (En-Ttlow)/dTt ;
+      ibin= (G4int)bin ;
+      distTt[ibin] += 1. ;
+    }
+  histo5->accumulate(En/MeV) ;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillTb(G4double En)
+{
+  G4double bin ;
+  G4int ibin;
+  
+  if(histo7)
+  {
+    entryTb += 1. ;
+    Tbmean += En ;
+    Tb2mean += En*En ;
+
+    if(En<Tblow)
+      underTb += 1. ;
+    else if(En>=Tbhigh)
+      overTb  += 1. ;
+    else
+    {
+      bin = (En-Tblow)/dTb ;
+      ibin= (G4int)bin ;
+      distTb[ibin] += 1. ;
+    }
+  histo7->accumulate(En/MeV) ;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillTsec(G4double En)
+{
+  G4double bin ;
+  G4int ibin;
+
+  if(histo8)
+  {
+    entryTsec += 1. ;
+
+    if(En<Tseclow)
+      underTsec += 1. ;
+    else if(En>=Tsechigh)
+      overTsec  += 1. ;
+    else
+    {
+      bin = (En-Tseclow)/dTsec ;
+      ibin= (G4int)bin ;
+      distTsec[ibin] += 1. ;
+    }
+  histo8->accumulate(En/MeV) ;
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillGammaSpectrum(G4double En)
+{
+  G4double bin ;
+  G4int ibin;
+
+  if(histo10)
+  {
+    entryGamma += 1. ;
+
+    if(En<ElowGamma)
+      underGamma += 1. ;
+    else if(En>=EhighGamma)
+      overGamma  += 1. ;
+    else
+    {
+      bin = log(En/ElowGamma)/dEGamma;
+      ibin= (G4int)bin ;
+      distGamma[ibin] += 1. ;
+    }
+  histo10->accumulate(log10(En/MeV)) ;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillTh(G4double Th)
+{
+  static const G4double cn=pi/(64800.*dTh) ;
+  static const G4double cs=pi/
+        (64800.*(cos(Thlow)-cos(Thlow+dTh)));      
+  G4double bin,Thbin ,wg;
+  G4int ibin;
+
+  if(histo3)
+  {
+    entryTh += 1. ;
+
+    wg = 0.;
+
+    if(Th<Thlow)
+      underTh += 1. ;
+    else if(Th>=Thhigh)
+      overTh  += 1. ;
+    else
+    {
+      bin = (Th-Thlow)/dTh ;
+      ibin= (G4int)bin ;
+      Thbin = Thlow+ibin*dTh ;
+      if(Th > 0.001*dTh)
+        wg=cn/sin(Th) ;
+      else
+      {  
+        G4double thdeg=Th*180./pi;
+        G4cout << "theta < 0.001*dth (from plot excluded) theta="
+               << setw(12) << setprecision(4) << thdeg << endl;
+        wg=0. ; 
+      }
+      distTh[ibin] += wg  ;
+    }
+
+  histo3->accumulate(Th/deg, wg) ;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillThBack(G4double Th)
+{
+  static const G4double cn=pi/(64800.*dThback) ;
+  static const G4double cs=pi/
+        (64800.*(cos(Thlowback)-cos(Thlowback+dThback)));      
+  G4double bin,Thbin,wg ;
+  G4int ibin;
+
+  if(histo6)
+  {
+    entryThback += 1. ;
+
+    if(Th<Thlowback)
+      underThback += 1. ;
+    else if(Th>=Thhighback)
+      overThback  += 1. ;
+    else
+    {
+      bin = (Th-Thlowback)/dThback ;
+      ibin= (G4int)bin ;
+      Thbin = Thlowback+ibin*dThback ;
+      if(Th > 0.001*dThback)
+        wg=cn/sin(Th) ;
+      else
+      {  
+        G4double thdeg=Th*180./pi;
+        G4cout << "theta < 0.001*dth (from plot excluded) theta="
+               << setw(12) << setprecision(4) << thdeg << endl;
+        wg=0. ; 
+      }
+      distThback[ibin] += wg  ;
+    }
+  histo6->accumulate(Th/deg, wg) ;
+  }
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::FillR(G4double R )
+{
+  G4double bin ;
+  G4int ibin;
+
+  if(histo4)
+  {
+    entryR  += 1. ;
+    Rmean += R ;
+    R2mean += R*R ;
+
+    if(R <Rlow)
+      underR  += 1. ;
+    else if(R >=Rhigh)
+      overR   += 1. ;
+    else
+    {
+      bin = (R -Rlow)/dR  ;
+      ibin= (G4int)bin ;
+      distR[ibin] += 1. ;
+    }
+  histo4->accumulate(R/mm) ;
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::Fillvertexz(G4double z )
+{
+  G4double bin ;
+  G4int ibin;
+  
+  if(histo9)
+  {
+    entryvertexz  += 1. ;
+
+    if(z <zlow)
+      undervertexz  += 1. ;
+    else if(z >=zhigh)
+      oververtexz   += 1. ;
+    else
+    {
+      bin = (z -zlow)/dz  ;
+      ibin = (G4int)bin ;
+      distvertexz[ibin] += 1. ;
+    }
+  histo9->accumulate(z/mm) ;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::SethistName(G4String name)
+{
+  histName = name ;
+  G4cout << " hist file = " << histName << endl;
+}
+
+void Em8RunAction::SetnbinStep(G4int nbin)
+{
+  nbinStep = nbin ;
+  if(nbinStep>0)
+  G4cout << " Nb of bins in #step plot = " << nbinStep << endl ;
+}
+void Em8RunAction::SetSteplow(G4double low)
+{
+  Steplow = low ;
+  if(nbinStep>0)
+  G4cout << " low  in the #step plot = " << Steplow << endl ;
+}
+void Em8RunAction::SetStephigh(G4double high)
+{
+  Stephigh = high ;
+  if(nbinStep>0)
+  G4cout << " high in the #step plot = " << Stephigh << endl ;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::SetnbinEn(G4int nbin)
+{
+  nbinEn = nbin ;
+
+  if(nbinEn > 0) G4cout << " Nb of bins in Edep plot = " << nbinEn << endl ;
+}
+void Em8RunAction::SetEnlow(G4double Elow)
+{
+  Enlow = Elow ;
+  if(nbinEn>0) G4cout << " Elow  in the  Edep plot = " << Enlow << endl ;
+}
+void Em8RunAction::SetEnhigh(G4double Ehigh)
+{
+  Enhigh = Ehigh ;
+
+  if(nbinEn>0) G4cout << " Ehigh in the  Edep plot = " << Enhigh << endl ;
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+void Em8RunAction::SetnbinGamma(G4int nbin)
+{
+  nbinGamma = nbin ;
+  if(nbinGamma>0)
+  G4cout << " Nb of bins in gamma spectrum plot = " << nbinGamma << endl ;
+}
+void Em8RunAction::SetElowGamma(G4double Elow)
+{
+  ElowGamma = Elow ;
+  if(nbinGamma>0)
+  G4cout << " Elow  in the gamma spectrum plot = " << ElowGamma << endl ;
+}
+void Em8RunAction::SetEhighGamma(G4double Ehigh)
+{
+  EhighGamma = Ehigh ;
+  if(nbinGamma>0)
+  G4cout << " Ehigh in the gamma spectrum plot = " << EhighGamma << endl ;
+}
+
+void Em8RunAction::SetnbinTt(G4int nbin)
+{
+  nbinTt = nbin ;
+  if(nbinTt>0)
+  G4cout << " Nb of bins in Etransmisssion plot = " << nbinTt << endl ;
+}
+void Em8RunAction::SetTtlow(G4double Elow)
+{
+  Ttlow = Elow ;
+  if(nbinTt>0)
+  G4cout << " Elow  in the  Etransmission plot = " << Ttlow << endl ;
+}
+void Em8RunAction::SetTthigh(G4double Ehigh)
+{
+  Tthigh = Ehigh ;
+  if(nbinTt>0)
+  G4cout << " Ehigh in the  Etransmission plot = " << Tthigh << endl ;
+}
+void Em8RunAction::SetnbinTb(G4int nbin)
+{
+  nbinTb = nbin ;
+  if(nbinTb>0)
+  G4cout << " Nb of bins in Ebackscattered plot = " << nbinTb << endl ;
+}
+void Em8RunAction::SetTblow(G4double Elow)
+{
+  Tblow = Elow ;
+  if(nbinTb>0)
+  G4cout << " Elow  in the  Ebackscattered plot = " << Tblow << endl ;
+}
+void Em8RunAction::SetTbhigh(G4double Ehigh)
+{
+  Tbhigh = Ehigh ;
+  if(nbinTb>0)
+  G4cout << " Ehigh in the  Ebackscattered plot = " << Tbhigh << endl ;
+}
+
+void Em8RunAction::SetnbinTsec(G4int nbin)
+{
+  nbinTsec = nbin ;
+  if(nbinTsec>0)
+  G4cout << " Nb of bins in Tsecondary  plot = " << nbinTsec << endl ;
+}
+void Em8RunAction::SetTseclow(G4double Elow)
+{
+  Tseclow = Elow ;
+  if(nbinTsec>0)
+  G4cout << " Elow  in the  Tsecondary plot = " << Tseclow << endl ;
+}
+void Em8RunAction::SetTsechigh(G4double Ehigh)
+{
+  Tsechigh = Ehigh ;
+  if(nbinTsec>0)
+  G4cout << " Ehigh in the  Tsecondary plot = " << Tsechigh << endl ;
+}
+ 
+void Em8RunAction::SetnbinR(G4int nbin)
+{
+  nbinR  = nbin ;
+  if(nbinR>0)
+  G4cout << " Nb of bins in R plot = " << nbinR << endl ;
+}
+void Em8RunAction::SetRlow(G4double rlow)
+{
+  Rlow = rlow ;
+  if(nbinR>0)
+  G4cout << " Rlow  in the  R plot = " << Rlow << endl ;
+}
+void Em8RunAction::SetRhigh(G4double rhigh)
+{
+  Rhigh = rhigh ;
+  if(nbinR>0)
+  G4cout << " Rhigh in the R plot = " << Rhigh << endl ;
+}
+
+void Em8RunAction::Setnbinzvertex(G4int nbin)
+{
+  nbinvertexz  = nbin ;
+  if(nbinvertexz>0)
+  G4cout << " Nb of bins in Z plot = " << nbinvertexz << endl ;
+}
+void Em8RunAction::Setzlow(G4double z)
+{
+  zlow = z ;
+  if(nbinvertexz>0)
+  G4cout << " zlow  in the  Z plot = " << zlow << endl ;
+}
+void Em8RunAction::Setzhigh(G4double z)
+{
+  zhigh = z ;
+  if(nbinvertexz>0)
+  G4cout << " zhigh in the Z plot = " << zhigh << endl ;
+}
+
+void Em8RunAction::SetnbinTh(G4int nbin)
+{
+  nbinTh = nbin ;
+  if(nbinTh>0)
+  G4cout << " Nb of bins in Theta plot = " << nbinTh << endl ;
+}
+void Em8RunAction::SetThlow(G4double Tlow)
+{
+  Thlow = Tlow ;
+  if(nbinTh>0)
+  G4cout << " Tlow  in the  Theta plot = " << Thlow << endl ;
+}
+void Em8RunAction::SetThhigh(G4double Thigh)
+{
+  Thhigh = Thigh ;
+  if(nbinTh>0)
+  G4cout << " Thigh in the Theta plot = " << Thhigh << endl ;
+}
+
+void Em8RunAction::SetnbinThBack(G4int nbin)
+{
+  nbinThback = nbin ;
+  if(nbinThback>0)
+  G4cout << " Nb of bins in Theta plot = " << nbinThback << endl ;
+}
+void Em8RunAction::SetThlowBack(G4double Tlow)
+{
+  Thlowback = Tlow ;
+  if(nbinThback>0)
+  G4cout << " Tlow  in the  Theta plot = " << Thlowback << endl ;
+}
+void Em8RunAction::SetThhighBack(G4double Thigh)
+{
+  Thhighback = Thigh ;
+  if(nbinThback>0)
+  G4cout << " Thigh in the Theta plot = " << Thhighback << endl ;
+}
+void Em8RunAction::CountParticles(G4double nch,G4double nne)
+{
+  SumCharged += nch ;
+  SumNeutral += nne ;
+  Sum2Charged += nch*nch ;
+  Sum2Neutral += nne*nne ;
+}
+void Em8RunAction::AddEP(G4double nele,G4double npos) 
+{
+  Selectron += nele;
+  Spositron += npos;
+}
+
+//
+//
+////////////////////////////////////////////////////////////////////////
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
new file mode 100644
index 0000000000..b970f463ee
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
@@ -0,0 +1,374 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8RunMessenger.cc,v 1.1 2000/01/07 14:50:47 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8RunMessenger.hh"
+
+#include "Em8RunAction.hh"
+#include "G4UIdirectory.hh"
+#include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithADouble.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4ios.hh"
+#include "globals.hh"
+#include "Randomize.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8RunMessenger::Em8RunMessenger(Em8RunAction* RA)
+:runAction (RA)
+{
+  plotDir = new G4UIdirectory("/plots/");
+  plotDir->SetGuidance("plot control");
+
+  sethistNameCmd = new G4UIcmdWithAString("/plots/sethistName",this);
+  sethistNameCmd->SetGuidance("set name for the histogram file"); 
+
+  setnbinStepCmd = new G4UIcmdWithAnInteger("/plots/setnbinStep",this);
+  setnbinStepCmd->SetGuidance("set nb of bins in #step plot");
+  setnbinStepCmd->SetParameterName("nbinStep",false);
+
+  setSteplowCmd = new G4UIcmdWithADouble("/plots/setSteplow",this);
+  setSteplowCmd->SetGuidance("set lower limit for #step plot ");
+  setSteplowCmd->SetParameterName("Steplow",false);
+
+  setStephighCmd = new G4UIcmdWithADouble("/plots/setStephigh",this);
+  setStephighCmd->SetGuidance("set upper limit for #step plot ");
+  setStephighCmd->SetParameterName("Stephigh",false);
+
+  setnbinEnCmd = new G4UIcmdWithAnInteger("/plots/setnbinEn",this);
+  setnbinEnCmd->SetGuidance("set nb of bins in Edep plot");
+  setnbinEnCmd->SetParameterName("nbinE",false);
+
+  setEnlowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setEnlow",this);
+  setEnlowCmd->SetGuidance("set lower limit for Edep plot ");
+  setEnlowCmd->SetParameterName("Elow",false);
+  setEnlowCmd->SetUnitCategory("Energy");
+  
+  setEnhighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setEnhigh",this);
+  setEnhighCmd->SetGuidance("set upper limit for Edep plot ");
+  setEnhighCmd->SetParameterName("Ehigh",false);
+  setEnhighCmd->SetUnitCategory("Energy");
+
+  setnbinGammaCmd = new G4UIcmdWithAnInteger("/plots/setnbinGamma",this);
+  setnbinGammaCmd->SetGuidance("set nb of bins in gamma spectrum plot");
+  setnbinGammaCmd->SetParameterName("nbinGamma",false);
+
+  setElowGammaCmd = new G4UIcmdWithADoubleAndUnit("/plots/setElowGamma",this);
+  setElowGammaCmd->SetGuidance("set lower limit for gamma spectrum plot ");
+  setElowGammaCmd->SetParameterName("ElowGamma",false);
+  setElowGammaCmd->SetUnitCategory("Energy");
+
+  setEhighGammaCmd = new G4UIcmdWithADoubleAndUnit("/plots/setEhighGamma",this);
+  setEhighGammaCmd->SetGuidance("set upper limit for gamma spectrum plot ");
+  setEhighGammaCmd->SetParameterName("EhighGamma",false);
+  setEhighGammaCmd->SetUnitCategory("Energy");
+
+  setnbinTtCmd = new G4UIcmdWithAnInteger("/plots/setnbinTt",this);
+  setnbinTtCmd->SetGuidance("set nb of bins in Etransmitted plot");
+  setnbinTtCmd->SetParameterName("nbinTt",false);
+
+  setTtlowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTtlow",this);
+  setTtlowCmd->SetGuidance("set lower limit for Etransmitted plot ");
+  setTtlowCmd->SetParameterName("Ttlow",false);
+
+  setTthighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTthigh",this);
+  setTthighCmd->SetGuidance("set upper limit for Etransmitted plot ");
+  setTthighCmd->SetParameterName("Tthigh",false);
+
+  setnbinTbCmd = new G4UIcmdWithAnInteger("/plots/setnbinTb",this);
+  setnbinTbCmd->SetGuidance("set nb of bins in Ebackscattering plot");
+  setnbinTbCmd->SetParameterName("nbinTb",false);
+
+  setTblowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTblow",this);
+  setTblowCmd->SetGuidance("set lower limit for Ebackscattered plot ");
+  setTblowCmd->SetParameterName("Tblow",false);
+
+  setTbhighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTbhigh",this);
+  setTbhighCmd->SetGuidance("set upper limit for Ebackscattered plot ");
+  setTbhighCmd->SetParameterName("Tbhigh",false);
+
+  setnbinTsecCmd = new G4UIcmdWithAnInteger("/plots/setnbinTsec",this);
+  setnbinTsecCmd->SetGuidance("set nb of bins in charged Tsecondary plot");
+  setnbinTsecCmd->SetParameterName("nbinTsec",false);
+
+  setTseclowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTseclow",this);
+  setTseclowCmd->SetGuidance("set lower limit for charged Tsecondary plot ");
+  setTseclowCmd->SetParameterName("Tseclow",false);
+
+  setTsechighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setTsechigh",this);
+  setTsechighCmd->SetGuidance("set upper limit for charged Tsecondary plot ");
+  setTsechighCmd->SetParameterName("Tsechigh",false);
+
+  setnbinRCmd = new G4UIcmdWithAnInteger("/plots/setnbinR",this);
+  setnbinRCmd->SetGuidance("set nb of bins in R plot");
+  setnbinRCmd->SetParameterName("nbinR",false);
+
+  setRlowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setRlow",this);
+  setRlowCmd->SetGuidance("set lower limit for R plot ");
+  setRlowCmd->SetParameterName("Rlow",false);
+
+  setRhighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setRhigh",this);
+  setRhighCmd->SetGuidance("set upper limit for R plot ");
+  setRhighCmd->SetParameterName("Rhigh",false);
+
+  setnbinzvertexCmd = new G4UIcmdWithAnInteger("/plots/setnbinzvertex",this);
+  setnbinzvertexCmd->SetGuidance("set nb of bins in Z vertex plot");
+  setnbinzvertexCmd->SetParameterName("nbinZ",false);
+
+  setzlowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setzlow",this);
+  setzlowCmd->SetGuidance("set lower limit for Z vertex plot ");
+  setzlowCmd->SetParameterName("zlow",false);
+
+  setzhighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setzhigh",this);
+  setzhighCmd->SetGuidance("set upper limit for Z vertex plot ");
+  setzhighCmd->SetParameterName("zhigh",false);
+
+  setnbinThCmd = new G4UIcmdWithAnInteger("/plots/setnbinTh",this);
+  setnbinThCmd->SetGuidance("set nb of bins in Theta transmitted plot");
+  setnbinThCmd->SetParameterName("nbinTh",false);
+
+  setThlowCmd = new G4UIcmdWithADoubleAndUnit("/plots/setThlow",this);
+  setThlowCmd->SetGuidance("set lower limit for Theta transmitted plot ");
+  setThlowCmd->SetParameterName("Thlow",false);
+
+  setThhighCmd = new G4UIcmdWithADoubleAndUnit("/plots/setThhigh",this);
+  setThhighCmd->SetGuidance("set upper limit for Theta transmitted plot ");
+  setThhighCmd->SetParameterName("Thhigh",false);
+
+  setnbinThbackCmd = new G4UIcmdWithAnInteger("/plots/setnbinThback",this);
+  setnbinThbackCmd->SetGuidance("set nb of bins in backscattering Theta plot");
+  setnbinThbackCmd->SetParameterName("nbinThback",false);
+
+  setThlowbackCmd = new G4UIcmdWithADoubleAndUnit("/plots/setThlowback",this);
+  setThlowbackCmd->SetGuidance("set lower limit for backscattering Theta plot ");
+  setThlowbackCmd->SetParameterName("Thlowback",false);
+
+  setThhighbackCmd = new G4UIcmdWithADoubleAndUnit("/plots/setThhighback",this);
+  setThhighbackCmd->SetGuidance("set upper limit for backscattering Theta plot ");
+  setThhighbackCmd->SetParameterName("Thhighback",false);
+    
+  RndmDir = new G4UIdirectory("/rndm/");
+  RndmDir->SetGuidance("Rndm status control.");
+  
+  RndmSaveCmd = new G4UIcmdWithAnInteger("/rndm/save",this);
+  RndmSaveCmd->SetGuidance("set frequency to save rndm status on external files.");
+  RndmSaveCmd->SetGuidance("freq = 0 not saved");
+  RndmSaveCmd->SetGuidance("freq > 0 saved on: beginOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 1 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: endOfEvent.rndm");    
+  RndmSaveCmd->SetParameterName("frequency",false);
+  RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
+  RndmSaveCmd->AvailableForStates(PreInit,Idle); 
+         
+  RndmReadCmd = new G4UIcmdWithAString("/rndm/read",this);
+  RndmReadCmd->SetGuidance("get rndm status from an external file.");
+  RndmReadCmd->SetParameterName("fileName",true);
+  RndmReadCmd->SetDefaultValue ("beginOfRun.rndm");
+  RndmReadCmd->AvailableForStates(PreInit,Idle);  
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8RunMessenger::~Em8RunMessenger()
+{
+  delete sethistNameCmd;
+
+  delete setnbinStepCmd;
+  delete setSteplowCmd;
+  delete setStephighCmd;
+
+  delete setnbinEnCmd;
+  delete setEnlowCmd;
+  delete setEnhighCmd;
+
+  delete setnbinGammaCmd;
+  delete setElowGammaCmd;
+  delete setEhighGammaCmd;
+
+  delete setnbinTtCmd;
+  delete setTtlowCmd;
+  delete setTthighCmd;
+
+  delete setnbinTbCmd;
+  delete setTblowCmd;
+  delete setTbhighCmd;
+
+  delete setnbinTsecCmd;
+  delete setTseclowCmd;
+  delete setTsechighCmd;
+
+  delete setnbinRCmd;
+  delete setRlowCmd;
+  delete setRhighCmd;
+
+  delete setnbinzvertexCmd;
+  delete setzlowCmd;
+  delete setzhighCmd;
+
+  delete setnbinThCmd;
+  delete setThlowCmd;
+  delete setThhighCmd;
+
+  delete setnbinThbackCmd;
+  delete setThlowbackCmd;
+  delete setThhighbackCmd;
+
+  delete plotDir;
+  
+  delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;  
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8RunMessenger::SetNewValue(G4UIcommand* command,G4String newValues)
+{
+  if( command == sethistNameCmd)
+    runAction
+    ->SethistName(newValues) ;
+    
+  if( command == setnbinStepCmd)
+    runAction
+    ->SetnbinStep(setnbinStepCmd->GetNewIntValue(newValues));
+
+  if( command == setSteplowCmd)
+    runAction
+    ->SetSteplow( setSteplowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setStephighCmd)
+    runAction
+    ->SetStephigh( setStephighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinEnCmd)
+    runAction
+    ->SetnbinEn(setnbinEnCmd->GetNewIntValue(newValues));
+
+  if( command == setEnlowCmd)
+    runAction
+    ->SetEnlow( setEnlowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setEnhighCmd)
+    runAction
+    ->SetEnhigh( setEnhighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinGammaCmd)
+    runAction
+    ->SetnbinGamma(setnbinGammaCmd->GetNewIntValue(newValues));
+
+  if( command == setElowGammaCmd)
+    runAction
+    ->SetElowGamma( setElowGammaCmd->GetNewDoubleValue(newValues));
+
+  if( command == setEhighGammaCmd)
+    runAction
+    ->SetEhighGamma( setEhighGammaCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinTtCmd)
+    runAction
+    ->SetnbinTt(setnbinTtCmd->GetNewIntValue(newValues));
+
+  if( command == setTtlowCmd)
+    runAction
+    ->SetTtlow( setTtlowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setTthighCmd)
+    runAction
+    ->SetTthigh( setTthighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinTbCmd)
+    runAction
+    ->SetnbinTb(setnbinTbCmd->GetNewIntValue(newValues));
+
+  if( command == setTblowCmd)
+    runAction
+    ->SetTblow( setTblowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setTbhighCmd)
+    runAction
+    ->SetTbhigh( setTbhighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinTsecCmd)
+    runAction
+    ->SetnbinTsec(setnbinTsecCmd->GetNewIntValue(newValues));
+
+  if( command == setTseclowCmd)
+    runAction
+    ->SetTseclow( setTseclowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setTsechighCmd)
+    runAction
+    ->SetTsechigh( setTsechighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinRCmd)
+    runAction
+    ->SetnbinR(setnbinRCmd->GetNewIntValue(newValues));
+
+  if( command == setRlowCmd)
+    runAction
+    ->SetRlow( setRlowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setRhighCmd)
+    runAction
+    ->SetRhigh( setRhighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinzvertexCmd)
+    runAction
+    ->Setnbinzvertex(setnbinzvertexCmd->GetNewIntValue(newValues));
+
+  if( command == setzlowCmd)
+    runAction
+    ->Setzlow( setzlowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setzhighCmd)
+    runAction
+    ->Setzhigh( setzhighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinThCmd)
+    runAction
+    ->SetnbinTh(setnbinThCmd->GetNewIntValue(newValues));
+
+  if( command == setThlowCmd)
+    runAction
+    ->SetThlow( setThlowCmd->GetNewDoubleValue(newValues));
+
+  if( command == setThhighCmd)
+    runAction
+    ->SetThhigh( setThhighCmd->GetNewDoubleValue(newValues));
+
+  if( command == setnbinThbackCmd)
+    runAction
+    ->SetnbinThBack(setnbinThbackCmd->GetNewIntValue(newValues));
+
+  if( command == setThlowbackCmd)
+    runAction
+    ->SetThlowBack( setThlowbackCmd->GetNewDoubleValue(newValues));
+
+  if( command == setThhighbackCmd)
+    runAction
+    ->SetThhighBack( setThhighbackCmd->GetNewDoubleValue(newValues));
+ 
+  if (command == RndmSaveCmd)
+      runAction->SetRndmFreq(RndmSaveCmd->GetNewIntValue(newValues));
+		 
+  if (command == RndmReadCmd)
+    { G4cout << "\n---> rndm status restored from file: " << newValues << endl;
+      HepRandom::restoreEngineStatus(newValues);
+      HepRandom::showEngineStatus();
+    }   
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+   
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
new file mode 100644
index 0000000000..e430b08576
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
@@ -0,0 +1,48 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8StepCut.cc,v 1.1 2000/01/07 14:50:47 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+// --------------------------------------------------------------
+//	GEANT 4 class implementation file 
+//
+//	For information related to this code contact:
+//	CERN, CN Division, ASD Group
+//	05 March 1999 L. Urban
+// --------------------------------------------------------------
+// --------------------------------------------------------------
+
+#include "Em8StepCut.hh"
+
+#include "G4Step.hh"
+#include "G4UserLimits.hh"
+#include "G4VParticleChange.hh"
+#include "G4EnergyLossTables.hh"
+
+Em8StepCut::Em8StepCut(const G4String& aName)
+  : G4VDiscreteProcess(aName),MaxChargedStep(DBL_MAX)
+{
+   if (verboseLevel>0) {
+     G4cout << GetProcessName() << " is created "<< endl;
+   }
+}
+
+Em8StepCut::~Em8StepCut()
+{
+}
+
+Em8StepCut::Em8StepCut(Em8StepCut& right)
+    :G4VDiscreteProcess(right)
+{}
+
+void Em8StepCut::SetMaxStep(G4double step)
+{
+  MaxChargedStep = step ;
+}
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
new file mode 100644
index 0000000000..e6d04ac214
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
@@ -0,0 +1,192 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingAction.cc,v 1.1 2000/01/07 14:50:47 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8DetectorConstruction.hh"
+#include "G4EnergyLossTables.hh"
+#include "G4SteppingManager.hh"
+#include "G4TrackVector.hh"
+#include "Em8SteppingAction.hh"
+#include "Em8PrimaryGeneratorAction.hh"
+#include "Em8EventAction.hh"
+#include "Em8RunAction.hh"
+#include "G4Event.hh"
+#include "G4EventManager.hh"
+#include "Em8SteppingMessenger.hh"
+#include "G4ios.hh"
+#include <iomanip.h>
+#include "G4UImanager.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8SteppingAction::Em8SteppingAction(Em8DetectorConstruction* DET,
+                                     Em8EventAction* EA,
+                                     Em8RunAction* RA)
+:detector (DET),eventaction (EA),runaction (RA),steppingMessenger(NULL),
+ IDold(-1) ,evnoold(-1)
+{
+  steppingMessenger = new Em8SteppingMessenger(this);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8SteppingAction::~Em8SteppingAction()
+{
+  delete steppingMessenger ;
+ }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8SteppingAction::UserSteppingAction(const G4Step* aStep)
+{ 
+
+  G4double Edep,Theta,Thetaback,Ttrans,Tback,Tsec,Egamma,xend,yend,zend,rend ;
+  G4double Tkin ;
+  G4int evno = eventaction->GetEventno() ; 
+
+  IDnow = evno+10000*(aStep->GetTrack()->GetTrackID())+
+          100000000*(aStep->GetTrack()->GetParentID()); 
+  if(IDnow != IDold)
+  {
+   IDold=IDnow ;
+   if(
+      (((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e-") &&
+       ((aStep->GetTrack()->GetTrackID() != 1) ||
+       (aStep->GetTrack()->GetParentID() != 0)) )
+       ||
+      (((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e+") &&
+       ((aStep->GetTrack()->GetTrackID() != 1) ||
+       (aStep->GetTrack()->GetParentID() != 0)) )
+     )
+        runaction->Fillvertexz(aStep->GetTrack()->GetVertexPosition().x());
+
+   if(aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()=="Absorber")
+   {
+    if(((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e-") &&
+       ((aStep->GetTrack()->GetTrackID() != 1) ||
+       (aStep->GetTrack()->GetParentID() != 0)) ) 
+    {
+        eventaction->AddCharged() ;
+        eventaction->AddE() ;
+        Tsec = aStep->GetTrack()->GetKineticEnergy() ;  // !!!!!!!!!!!!
+        Tsec += aStep->GetTotalEnergyDeposit() ;        // !!!!!!!!!!!!
+        runaction->FillTsec(Tsec) ;
+    }
+    else
+    if(((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e+") &&
+       ((aStep->GetTrack()->GetTrackID() != 1) ||
+       (aStep->GetTrack()->GetParentID() != 0)) ) 
+    {
+        eventaction->AddCharged() ;
+        eventaction->AddP() ;
+        Tsec = aStep->GetTrack()->GetKineticEnergy() ;  // !!!!!!!!!!!!
+        Tsec += aStep->GetTotalEnergyDeposit() ;        // !!!!!!!!!!!!
+        runaction->FillTsec(Tsec) ;
+    }
+    else
+    if(((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "gamma") &&
+       ((aStep->GetTrack()->GetTrackID() != 1) ||
+       (aStep->GetTrack()->GetParentID() != 0)) ) 
+    {
+        eventaction->AddNeutral() ;
+    }
+   }
+  }
+
+  if(aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()=="Absorber")
+  {
+    if(((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e-") 
+              ||
+       ((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "e+"))  
+          eventaction->CountStepsCharged() ;
+
+    if ((aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName()) == "gamma") 
+          eventaction->CountStepsNeutral() ;
+  }
+
+  if (
+      (((aStep->GetTrack()->GetTrackID() == 1) &&
+        (aStep->GetTrack()->GetParentID()== 0)) ||
+        (aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+        GetParticleName() ==
+        Em8PrimaryGeneratorAction::GetPrimaryName())) 
+        &&
+        (aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()=="Absorber")
+        &&
+        (aStep->GetTrack()->GetNextVolume()->GetName()=="World") &&
+        (aStep->GetPostStepPoint()->GetProcessDefinedStep()
+              ->GetProcessName() == "Transportation") &&
+        (aStep->GetTrack()->GetMomentumDirection().x()>0.)
+                                                        )
+     {
+       eventaction->SetTr();
+       Theta = acos(aStep->GetTrack()->GetMomentumDirection().x()) ;
+       runaction->FillTh(Theta) ;
+       Ttrans = aStep->GetTrack()->GetKineticEnergy() ;
+       runaction->FillTt(Ttrans) ;
+       yend= aStep->GetTrack()->GetPosition().y() ;
+       zend= aStep->GetTrack()->GetPosition().z() ;
+       rend = sqrt(yend*yend+zend*zend) ;
+       runaction->FillR(rend);
+     }
+       
+  if (
+      (((aStep->GetTrack()->GetTrackID() == 1) &&
+        (aStep->GetTrack()->GetParentID()== 0)) ||
+      (aStep->GetTrack()->GetDynamicParticle()->GetDefinition()->
+       GetParticleName() ==
+       Em8PrimaryGeneratorAction::GetPrimaryName())) 
+       &&
+      (aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()=="Absorber") &&
+      (aStep->GetTrack()->GetNextVolume()->GetName()=="World") &&
+      (aStep->GetPostStepPoint()->GetProcessDefinedStep()
+               ->GetProcessName() == "Transportation") &&
+      (aStep->GetTrack()->GetMomentumDirection().z()<0.)
+                                                        )
+     {
+       eventaction->SetRef();
+       Thetaback = acos(aStep->GetTrack()->GetMomentumDirection().x()) ;
+       Thetaback -= 0.5*pi ;
+       runaction->FillThBack(Thetaback) ;
+       Tback  = aStep->GetTrack()->GetKineticEnergy() ;
+       runaction->FillTb(Tback) ;
+     }
+ 
+
+  if (
+      ((aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()=="Absorber") &&
+      (aStep->GetTrack()->GetNextVolume()->GetName()=="World") &&
+      (aStep->GetPostStepPoint()->GetProcessDefinedStep()
+               ->GetProcessName() == "Transportation") &&
+      (aStep->GetTrack()->GetMomentumDirection().x()>0.) &&
+      (aStep->GetTrack()->GetDynamicParticle()->GetDefinition()
+       ->GetParticleName() == "gamma"))
+     )
+     {
+       Egamma = aStep->GetTrack()->GetKineticEnergy() ;
+       runaction->FillGammaSpectrum(Egamma) ;
+     }
+      
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
new file mode 100644
index 0000000000..0598a8c303
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
@@ -0,0 +1,44 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingMessenger.cc,v 1.1 2000/01/07 14:50:48 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "Em8SteppingMessenger.hh"
+
+#include "Em8SteppingAction.hh"
+#include "G4UIdirectory.hh"
+#include "globals.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8SteppingMessenger::Em8SteppingMessenger(Em8SteppingAction* SA)
+:steppingAction (SA)
+{
+  steppingDir = new G4UIdirectory("/stepping/");
+  steppingDir->SetGuidance("stepping control");
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8SteppingMessenger::~Em8SteppingMessenger()
+{
+  delete steppingDir;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8SteppingMessenger::SetNewValue(G4UIcommand* command,G4String newValues)
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+   
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
new file mode 100644
index 0000000000..072db204de
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8SteppingVerbose.cc,v 1.1 2000/01/07 14:50:48 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// Em8SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the Em8SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "Em8SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+Em8SteppingVerbose::Em8SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+Em8SteppingVerbose::~Em8SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void Em8SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << endl;    
+      G4cout << setw( 5) << "#Step#"     << " "
+	     << setw( 6) << "X"          << "    "
+	     << setw( 6) << "Y"          << "    "  
+	     << setw( 6) << "Z"          << "    "
+	     << setw( 9) << "KineE"      << " "
+	     << setw( 9) << "dEStep"     << " "  
+	     << setw(10) << "StepLeng"     
+	     << setw(10) << "TrakLeng" 
+	     << setw(10) << "NextVolu" 
+	     << setw(10) << "Process"   << endl;	          
+    }
+
+    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << setw(3) << tN2ndariesTot 
+	       << "(Rest="  << setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void Em8SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << setw( 5) << "Step#"      << " "
+           << setw( 6) << "X"          << "    "
+	   << setw( 6) << "Y"          << "    "  
+	   << setw( 6) << "Z"          << "    "
+	   << setw( 9) << "KineE"      << " "
+	   << setw( 9) << "dEStep"     << " "  
+	   << setw(10) << "StepLeng"  
+	   << setw(10) << "TrakLeng"
+	   << setw(10) << "NextVolu"
+	   << setw(10) << "Process"    << endl;	     
+
+    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << setw(10) << "initStep" << endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
new file mode 100644
index 0000000000..edf225882c
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
@@ -0,0 +1,141 @@
+// This code implementation is the intellectual property of
+// the RD44 GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: Em8VisManager.cc,v 1.1 2000/01/07 14:50:48 grichine Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+// 
+// John Allison 24th January 1998.
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#ifdef G4VIS_USE
+
+#include "Em8VisManager.hh"
+
+// Supported drivers...
+
+#ifdef G4VIS_USE_DAWN
+#include "G4FukuiRenderer.hh"
+#endif
+
+#ifdef G4VIS_USE_DAWNFILE
+#include "G4DAWNFILE.hh"
+#endif
+
+#ifdef G4VIS_USE_OPACS
+#include "G4Wo.hh"
+#include "G4Xo.hh"
+#endif
+
+#ifdef G4VIS_USE_OPENGLX
+#include "G4OpenGLImmediateX.hh"
+#include "G4OpenGLStoredX.hh"
+#endif
+
+#ifdef G4VIS_USE_OPENGLWIN32
+#include "G4OpenGLImmediateWin32.hh"
+#include "G4OpenGLStoredWin32.hh"
+#endif
+
+#ifdef G4VIS_USE_OPENGLXM
+#include "G4OpenGLImmediateXm.hh"
+#include "G4OpenGLStoredXm.hh"
+#endif
+
+#ifdef G4VIS_USE_OIX
+#include "G4OpenInventorX.hh"
+#endif
+
+#ifdef G4VIS_USE_OIWIN32
+#include "G4OpenInventorWin32.hh"
+#endif
+
+#ifdef G4VIS_USE_RAYX
+#include "G4RayX.hh"
+#endif
+
+#ifdef G4VIS_USE_VRML
+#include "G4VRML1.hh"
+// #include "G4VRML2.hh"
+#endif
+
+#ifdef G4VIS_USE_VRMLFILE
+#include "G4VRML1File.hh"
+//#include "G4VRML2File.hh"
+#endif
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+Em8VisManager::Em8VisManager () {}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em8VisManager::RegisterGraphicsSystems () {
+
+#ifdef G4VIS_USE_DAWN
+  RegisterGraphicsSystem (new G4FukuiRenderer);
+#endif
+
+#ifdef G4VIS_USE_DAWNFILE
+  RegisterGraphicsSystem (new G4DAWNFILE);
+#endif
+
+#ifdef G4VIS_USE_OPACS
+  RegisterGraphicsSystem (new G4Wo);
+  RegisterGraphicsSystem (new G4Xo);
+#endif
+
+#ifdef G4VIS_USE_OPENGLX
+  RegisterGraphicsSystem (new G4OpenGLImmediateX);
+  RegisterGraphicsSystem (new G4OpenGLStoredX);
+#endif
+
+#ifdef G4VIS_USE_OPENGLWIN32
+  RegisterGraphicsSystem (new G4OpenGLImmediateWin32);
+  RegisterGraphicsSystem (new G4OpenGLStoredWin32);
+#endif
+
+#ifdef G4VIS_USE_OPENGLXM
+  RegisterGraphicsSystem (new G4OpenGLImmediateXm);
+  RegisterGraphicsSystem (new G4OpenGLStoredXm);
+#endif
+
+#ifdef G4VIS_USE_OIX
+  RegisterGraphicsSystem (new G4OpenInventorX);
+#endif
+
+#ifdef G4VIS_USE_OIWIN32
+  RegisterGraphicsSystem (new G4OpenInventorWin32);
+#endif
+
+#ifdef G4VIS_USE_RAYX
+  RegisterGraphicsSystem (new G4RayX);
+#endif
+
+#ifdef G4VIS_USE_VRML
+  RegisterGraphicsSystem (new G4VRML1);
+// RegisterGraphicsSystem (new G4VRML2);
+#endif
+
+#ifdef G4VIS_USE_VRMLFILE
+  RegisterGraphicsSystem (new G4VRML1File);
+// RegisterGraphicsSystem (new G4VRML2File);
+#endif
+
+  if (fVerbose > 0) {
+    G4cout <<
+      "\nYou have successfully chosen to use the following graphics systems."
+	 << endl;
+    PrintAvailableGraphicsSystems ();
+  }
+}
+
+#endif
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.cc b/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
index c2bd30860a..b760480c39 100644
--- a/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
+++ b/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersistentEx01.cc,v 1.4.2.1 1999/12/07 20:47:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // --------------------------------------------------------------
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.out b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
index 9d40d1e785..132bc9c420 100644
--- a/examples/extended/persistency/PersistentEx01/PersistentEx01.out
+++ b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
@@ -1,5 +1,23 @@
+LD_LIBRARY_PATH = /usr/local/libexec/jdk/1.1.6/lib:/opt/SUNWspro/lib:/usr/openwin/lib:/usr/dt/lib:/usr/local/lib:/afs/cern.ch/sw/lhcxx/specific/sun/Objectivity/5.1/lib:/afs/cern.ch/sw/lhcxx/specific/@sys/HepODBMS/0.3.0.1/lib
+
+Copying G4EXAMPLE_BOOT into runtime federated database...
+Creating new runtime federated database /afs/cern.ch/sw/geant4/stt/dev/SUN-CC/debug/exampleSchema/SUN-CC/PersistentEx01 for FDID 207
+Run with active lockserver
+Schema import from PersistentEx01 to PersistentEx01
+
+Updating Name Service values...
+Now updating System Name Space (catalog) values...
+Now updating Database File locations...
+
+Federated Database Installation complete.
+OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev/SUN-CC/debug/exampleFD/SUN-CC/PersistentEx01
+
 Opening federated database OO_FD_BOOT.
-WARNING: g4example: Could not find naming root directory: Naming will be disabled.
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
 #
 #  PersistentEx01.in
 #
@@ -78,36 +96,36 @@ Transaction is committed on /Geometry/GeomContainer/
 >>> Event 0
 Event : 0
 mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 34.3698
+  Edep of the first Hit 34.3763
 mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 18.4405
+  Edep of the first Hit 18.4413
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 0 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 1
 Event : 1
 mySD/EvenCollection    Number of hits       22
-  Edep of the first Hit 99.9396
+  Edep of the first Hit 99.9458
 mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 25.443
+  Edep of the first Hit 25.4437
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 1 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 2
 Event : 2
 mySD/EvenCollection    Number of hits       22
-  Edep of the first Hit 6.23362
+  Edep of the first Hit 6.24018
 mySD/OddCollection     Number of hits       19
-  Edep of the first Hit 64.6385
+  Edep of the first Hit 64.64
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 2 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 3
 Event : 3
 mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 48.4612
+  Edep of the first Hit 48.4619
 mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 14.5902
+  Edep of the first Hit 14.5986
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 3 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
@@ -116,16 +134,16 @@ Event : 4
 mySD/EvenCollection    Number of hits       32
   Edep of the first Hit 50.5145
 mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 57.8215
+  Edep of the first Hit 57.8223
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 4 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 5
 Event : 5
 mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 139.802
+  Edep of the first Hit 139.808
 mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 109.904
+  Edep of the first Hit 109.911
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 5 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
@@ -134,7 +152,7 @@ Event : 6
 mySD/EvenCollection    Number of hits       10
   Edep of the first Hit 21.8663
 mySD/OddCollection     Number of hits       28
-  Edep of the first Hit 14.2566
+  Edep of the first Hit 14.2581
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 6 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
@@ -143,25 +161,25 @@ Event : 7
 mySD/EvenCollection    Number of hits       12
   Edep of the first Hit 2.93176
 mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 3.13845
+  Edep of the first Hit 3.1392
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 7 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 8
 Event : 8
 mySD/EvenCollection    Number of hits       18
-  Edep of the first Hit 13.787
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 13.6233
+  Edep of the first Hit 13.794
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 13.6248
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 8 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 9
 Event : 9
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 42.2712
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 21.0987
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 4.16745
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 43.0885
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 9 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
diff --git a/examples/extended/persistency/PersistentEx01/createTag/createTag.cpp b/examples/extended/persistency/PersistentEx01/createTag/createTag.cpp
index eba67e4a07..5d526183a3 100644
--- a/examples/extended/persistency/PersistentEx01/createTag/createTag.cpp
+++ b/examples/extended/persistency/PersistentEx01/createTag/createTag.cpp
@@ -30,7 +30,7 @@ public:
     // remove an existing tag collection with the name <tagName>
     HepExplorable *cd = HepExplorable::findExplorable(tagName);
     if (cd) {
-      cout << "removing old tag:" << tagName << endl;
+      cout << "removing old tag:" << tagName << G4endl;
       cd->removeDescription();
       delete cd;
     }
diff --git a/examples/extended/persistency/PersistentEx01/readDB/readDB.cpp b/examples/extended/persistency/PersistentEx01/readDB/readDB.cpp
index 8c6a53cafc..ce6ed12d85 100644
--- a/examples/extended/persistency/PersistentEx01/readDB/readDB.cpp
+++ b/examples/extended/persistency/PersistentEx01/readDB/readDB.cpp
@@ -46,8 +46,8 @@ public:
       int evt_id = pevent_iterator->GetEventID();
       int n_pvertex = pevent_iterator->GetNumberOfPrimaryVertex();
 
-      cout << endl << "Reading event #" << evt_id << ":" << endl;
-      cout << "  No. of primary vertex: " << n_pvertex << endl;
+      cout << G4endl << "Reading event #" << evt_id << ":" << G4endl;
+      cout << "  No. of primary vertex: " << n_pvertex << G4endl;
 
       // Loop for all primary vertex in this event
       for ( int i = 0; i < n_pvertex; i++ )
@@ -55,9 +55,9 @@ public:
         HepRef(G4PPrimaryVertex) pvertex = 
                              pevent_iterator->GetPrimaryVertex(i);
         cout << "    ObjectID of the primary vertex: "
-             << pvertex.sprint() << endl;
+             << pvertex.sprint() << G4endl;
         cout << "    No. of particle in the primary vertex: "
-             << pvertex->GetNumberOfParticle() << endl;
+             << pvertex->GetNumberOfParticle() << G4endl;
 
         for ( int j = 0; j < pvertex->GetNumberOfParticle() ; j++ )
         {
@@ -65,7 +65,7 @@ public:
            cout << "      PDGcode: " << particle->GetPDGcode()
                 << "      Px = " << particle->GetPx()
                 << "      Py = " << particle->GetPy()
-                << "      Pz = " << particle->GetPz() << endl;
+                << "      Pz = " << particle->GetPz() << G4endl;
         }
       }
 
@@ -73,7 +73,7 @@ public:
       const HepRef(G4PHCofThisEvent) hcte = pevent_iterator->GetHCofThisEvent();
       if( hcte != 0 )
       {
-        cout << "  ObjectID of the Hit Collections: " << hcte.sprint() << endl;
+        cout << "  ObjectID of the Hit Collections: " << hcte.sprint() << G4endl;
 
         // Capacity of the Hit Collections VArray
       //  G4int numHC = hcte->GetCapacity();
@@ -81,7 +81,7 @@ public:
         // Actual number of Hit Collections in this event
         G4int numHCact = hcte->GetNumberOfCollections();
 
-        cout << "  No. of the Hit Collections: " << numHCact << endl;
+        cout << "  No. of the Hit Collections: " << numHCact << G4endl;
         for( G4int i = 0; i<numHCact; i++)
         {
           const HepRef(G4PVHitsCollection) aHC = hcte->GetHC(i);
@@ -89,12 +89,12 @@ public:
           {
             cout << "    Hit Collection[" << i << "]:  Name: "
                  << aHC->GetName();
-            cout << "     Sensitive Detector: " << aHC->GetSDname() << endl;
+            cout << "     Sensitive Detector: " << aHC->GetSDname() << G4endl;
           }
         }
       }
       else
-      { cout << "  No Hit Collections for this event." << endl; }
+      { cout << "  No Hit Collections for this event." << G4endl; }
     }
 
     message("End of loop over events.");
diff --git a/examples/extended/persistency/PersistentEx01/readTag/readTag.cpp b/examples/extended/persistency/PersistentEx01/readTag/readTag.cpp
index 684bafb0c5..1750043def 100644
--- a/examples/extended/persistency/PersistentEx01/readTag/readTag.cpp
+++ b/examples/extended/persistency/PersistentEx01/readTag/readTag.cpp
@@ -39,8 +39,8 @@ public:
     for(events->start(); events->next() != 0; )
     {
       // use a tag attribute directly in a print statment
-      cout << "Reading event #" << event_id << ":" << endl;
-      cout << "  number of primary vertex: " << n_pvertex << endl;
+      cout << "Reading event #" << event_id << ":" << G4endl;
+      cout << "  number of primary vertex: " << n_pvertex << G4endl;
       
       //
       // [ could do some selection based on tag attributes here ... ]
@@ -57,20 +57,20 @@ public:
 
       if (getEvent(g4evt, events) )
       {
-        cout << "  ObjectID of event: " << g4evt.sprint() << endl;
+        cout << "  ObjectID of event: " << g4evt.sprint() << G4endl;
         cout << "  No. of the primary vertex (from G4PEvent): "
-             << g4evt->GetNumberOfPrimaryVertex() << endl;
+             << g4evt->GetNumberOfPrimaryVertex() << G4endl;
   
         for ( int i = 0; i < n_pvertex; i++ )
         {
           HepRef(G4PPrimaryVertex) pvertex = g4evt->GetPrimaryVertex(i);
-          cout << "    ObjectID of primary vertex: " << pvertex.sprint() << endl;
+          cout << "    ObjectID of primary vertex: " << pvertex.sprint() << G4endl;
           cout << "    No. of particle in the primary vertex: "
-               << pvertex->GetNumberOfParticle() << endl;
+               << pvertex->GetNumberOfParticle() << G4endl;
         }
       }
       else
-      { cout << "  No event object found." << endl; }
+      { cout << "  No event object found." << G4endl; }
 
     }
     
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
index 3c18c93b9c..3fa39109b9 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
@@ -22,7 +22,7 @@ PersEx01DetectorConstruction::~PersEx01DetectorConstruction()
 
 G4VPhysicalVolume* PersEx01DetectorConstruction::Construct()
 {
-    G4cout << "  -- Tracker type sensitive detector" << endl;
+    G4cout << "  -- Tracker type sensitive detector" << G4endl;
 
 //--------- Material definition ---------
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
index e32de91c5e..e542b562a2 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
@@ -32,7 +32,7 @@ void PersEx01EventAction::BeginOfEventAction(const G4Event* )
 
 void PersEx01EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
+  G4cout << ">>> Event " << evt->GetEventID() << G4endl;
 
   G4HCofThisEvent * HCE = evt->GetHCofThisEvent();
   PersEx01TrackerHitsCollection * pTHC1
@@ -40,14 +40,14 @@ void PersEx01EventAction::EndOfEventAction(const G4Event* evt)
   PersEx01TrackerHitsCollection * pTHC2
    = (PersEx01TrackerHitsCollection*)(HCE->GetHC(colID2));
 
-  G4cout << "Event : " << evt->GetEventID() << endl
+  G4cout << "Event : " << evt->GetEventID() << G4endl
          << pTHC1->GetSDname() << "/" << pTHC1->GetName() << "    "
-         << "Number of hits       " << pTHC1->entries() << endl;
+         << "Number of hits       " << pTHC1->entries() << G4endl;
   if( pTHC1->entries() > 0 )
-    G4cout << "  Edep of the first Hit " << (*pTHC1)[0]->GetEdep() << endl;
+    G4cout << "  Edep of the first Hit " << (*pTHC1)[0]->GetEdep() << G4endl;
   G4cout << pTHC2->GetSDname() << "/" << pTHC2->GetName() << "     "
-         << "Number of hits       " << pTHC2->entries() << endl;
+         << "Number of hits       " << pTHC2->entries() << G4endl;
   if( pTHC2->entries() > 0 )
-    G4cout << "  Edep of the first Hit " << (*pTHC2)[0]->GetEdep() << endl;
+    G4cout << "  Edep of the first Hit " << (*pTHC2)[0]->GetEdep() << G4endl;
 }
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
index 95aa2dfe9b..6f4112050e 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
@@ -1,4 +1,4 @@
-// $Id: PersEx01PhysicsList.cc,v 1.2 1999/11/04 12:55:02 morita Exp $
+// $Id: PersEx01PhysicsList.cc,v 1.2.6.3 1999/12/14 07:07:43 gunter Exp $
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
@@ -24,7 +24,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 
 PersEx01PhysicsList::PersEx01PhysicsList():  G4VUserPhysicsList()
@@ -185,7 +185,7 @@ void PersEx01PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "PersEx01PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
   }  
 
   //  " G4VUserPhysicsList::SetCutsWithDefault" method sets 
diff --git a/examples/extended/persistency/PersistentEx02/PersistentEx02.cc b/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
index 1276d56eaf..197c3a43cd 100644
--- a/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
+++ b/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersistentEx02.cc,v 1.2.2.1 1999/12/07 20:47:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // --------------------------------------------------------------
diff --git a/examples/extended/persistency/PersistentEx02/PersistentEx02.out b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
index 6aa0ab2a5d..0259c1fd50 100644
--- a/examples/extended/persistency/PersistentEx02/PersistentEx02.out
+++ b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
@@ -1,5 +1,23 @@
+LD_LIBRARY_PATH = /usr/local/libexec/jdk/1.1.6/lib:/opt/SUNWspro/lib:/usr/openwin/lib:/usr/dt/lib:/usr/local/lib:/afs/cern.ch/sw/lhcxx/specific/sun/Objectivity/5.1/lib:/afs/cern.ch/sw/lhcxx/specific/@sys/HepODBMS/0.3.0.1/lib
+
+Copying G4EXAMPLE_BOOT into runtime federated database...
+Creating new runtime federated database /afs/cern.ch/sw/geant4/stt/dev/SUN-CC/debug/exampleSchema/SUN-CC/PersistentEx02 for FDID 207
+Run with active lockserver
+Schema import from PersistentEx02 to PersistentEx02
+
+Updating Name Service values...
+Now updating System Name Space (catalog) values...
+Now updating Database File locations...
+
+Federated Database Installation complete.
+OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev/SUN-CC/debug/exampleFD/SUN-CC/PersistentEx02
+
 Opening federated database OO_FD_BOOT.
-WARNING: g4example: Could not find naming root directory: Naming will be disabled.
+**********************************************
+ Geant4 version $Name: geant4-01-01 $
+                                  (07-Dec-99)
+             Copyright : Geant4 Collaboration
+**********************************************
 #
 #  PersistentEx02.in
 #
@@ -79,722 +97,722 @@ Transaction started for /Events/EventContainer/ with sustained mode.
 >>> Event 0
 Event : 0
 mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 34.3698
+  Edep of the first Hit 34.3763
 mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 18.4405
+  Edep of the first Hit 18.4413
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 0 stored in /Events/EventContainer/ (sustained)
 >>> Event 1
 Event : 1
 mySD/EvenCollection    Number of hits       21
-  Edep of the first Hit 99.9396
+  Edep of the first Hit 99.9458
 mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 25.443
+  Edep of the first Hit 25.4437
  -- G4PEvent 1 stored in /Events/EventContainer/ (sustained)
 >>> Event 2
 Event : 2
 mySD/EvenCollection    Number of hits       21
-  Edep of the first Hit 6.23362
+  Edep of the first Hit 6.24018
 mySD/OddCollection     Number of hits       19
-  Edep of the first Hit 64.6385
+  Edep of the first Hit 64.64
  -- G4PEvent 2 stored in /Events/EventContainer/ (sustained)
 >>> Event 3
 Event : 3
 mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 48.4612
+  Edep of the first Hit 48.4619
 mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 14.5902
+  Edep of the first Hit 14.5986
  -- G4PEvent 3 stored in /Events/EventContainer/ (sustained)
 >>> Event 4
 Event : 4
 mySD/EvenCollection    Number of hits       31
   Edep of the first Hit 50.5145
 mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 57.8215
+  Edep of the first Hit 57.8223
  -- G4PEvent 4 stored in /Events/EventContainer/ (sustained)
 >>> Event 5
 Event : 5
 mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 139.802
+  Edep of the first Hit 139.808
 mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 109.904
+  Edep of the first Hit 109.911
  -- G4PEvent 5 stored in /Events/EventContainer/ (sustained)
 >>> Event 6
 Event : 6
 mySD/EvenCollection    Number of hits       10
   Edep of the first Hit 21.8663
 mySD/OddCollection     Number of hits       27
-  Edep of the first Hit 14.2566
+  Edep of the first Hit 14.2581
  -- G4PEvent 6 stored in /Events/EventContainer/ (sustained)
 >>> Event 7
 Event : 7
 mySD/EvenCollection    Number of hits       12
   Edep of the first Hit 2.93176
 mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 3.13845
+  Edep of the first Hit 3.1392
  -- G4PEvent 7 stored in /Events/EventContainer/ (sustained)
 >>> Event 8
 Event : 8
 mySD/EvenCollection    Number of hits       18
-  Edep of the first Hit 13.787
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 13.6233
+  Edep of the first Hit 13.794
+mySD/OddCollection     Number of hits       33
+  Edep of the first Hit 13.6248
  -- G4PEvent 8 stored in /Events/EventContainer/ (sustained)
 >>> Event 9
 Event : 9
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 42.2712
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 21.0987
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 4.16745
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 43.0885
  -- G4PEvent 9 stored in /Events/EventContainer/ (sustained)
 >>> Event 10
 Event : 10
-mySD/EvenCollection    Number of hits       24
-  Edep of the first Hit 14.0895
-mySD/OddCollection     Number of hits       24
-  Edep of the first Hit 7.74588
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 10.9691
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 2.07861
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 10 stored in /Events/EventContainer/ (sustained)
 >>> Event 11
 Event : 11
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 106.832
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 30.1659
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 46.1201
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 34.4406
  -- G4PEvent 11 stored in /Events/EventContainer/ (sustained)
 >>> Event 12
 Event : 12
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 7.46186
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 16.788
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 59.0553
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 10.701
  -- G4PEvent 12 stored in /Events/EventContainer/ (sustained)
 >>> Event 13
 Event : 13
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 16.4669
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 55.2629
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 6.28666
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 17.2852
  -- G4PEvent 13 stored in /Events/EventContainer/ (sustained)
 >>> Event 14
 Event : 14
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 21.5352
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 7.92271
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 2.65337
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 3.45365
  -- G4PEvent 14 stored in /Events/EventContainer/ (sustained)
 >>> Event 15
 Event : 15
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 17.9607
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 8.11967
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 72.2601
+mySD/OddCollection     Number of hits       31
+  Edep of the first Hit 29.4838
  -- G4PEvent 15 stored in /Events/EventContainer/ (sustained)
 >>> Event 16
 Event : 16
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 39.8096
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 13.969
+mySD/EvenCollection    Number of hits       17
+  Edep of the first Hit 11.7023
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 7.77693
  -- G4PEvent 16 stored in /Events/EventContainer/ (sustained)
 >>> Event 17
 Event : 17
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 29.4604
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 5.21882
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 41.7843
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 24.7506
  -- G4PEvent 17 stored in /Events/EventContainer/ (sustained)
 >>> Event 18
 Event : 18
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 23.4087
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 2.57686
+mySD/EvenCollection    Number of hits       32
+  Edep of the first Hit 31.8213
+mySD/OddCollection     Number of hits       11
+  Edep of the first Hit 36.5199
  -- G4PEvent 18 stored in /Events/EventContainer/ (sustained)
 >>> Event 19
 Event : 19
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 68.7516
-mySD/OddCollection     Number of hits       14
-  Edep of the first Hit 36.0667
+mySD/EvenCollection    Number of hits       16
+  Edep of the first Hit 27.5887
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 17.0291
  -- G4PEvent 19 stored in /Events/EventContainer/ (sustained)
 >>> Event 20
 Event : 20
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 41.2316
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 32.5255
+mySD/EvenCollection    Number of hits       3
+  Edep of the first Hit 26.5363
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 5.17838
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 20 stored in /Events/EventContainer/ (sustained)
 >>> Event 21
 Event : 21
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 33.6799
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 2.63774
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 40.566
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 36.1621
  -- G4PEvent 21 stored in /Events/EventContainer/ (sustained)
 >>> Event 22
 Event : 22
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 15.6979
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 82.3056
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 36.2405
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 8.50286
  -- G4PEvent 22 stored in /Events/EventContainer/ (sustained)
 >>> Event 23
 Event : 23
-mySD/EvenCollection    Number of hits       27
-  Edep of the first Hit 23.5513
-mySD/OddCollection     Number of hits       12
-  Edep of the first Hit 27.8059
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 1.91415
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 62.8982
  -- G4PEvent 23 stored in /Events/EventContainer/ (sustained)
 >>> Event 24
 Event : 24
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 43.1612
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 5.25522
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 17.6721
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 14.5465
  -- G4PEvent 24 stored in /Events/EventContainer/ (sustained)
 >>> Event 25
 Event : 25
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 52.9242
-mySD/OddCollection     Number of hits       30
-  Edep of the first Hit 14.3396
+mySD/EvenCollection    Number of hits       19
+  Edep of the first Hit 5.90905
+mySD/OddCollection     Number of hits       25
+  Edep of the first Hit 46.9022
  -- G4PEvent 25 stored in /Events/EventContainer/ (sustained)
 >>> Event 26
 Event : 26
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 18.0676
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 66.0532
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 32.8575
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 47.573
  -- G4PEvent 26 stored in /Events/EventContainer/ (sustained)
 >>> Event 27
 Event : 27
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 1.07471
-mySD/OddCollection     Number of hits       18
-  Edep of the first Hit 2.81278
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 12.3464
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 7.98715
  -- G4PEvent 27 stored in /Events/EventContainer/ (sustained)
 >>> Event 28
 Event : 28
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 71.478
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 38.2902
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 8.80629
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 30.2517
  -- G4PEvent 28 stored in /Events/EventContainer/ (sustained)
 >>> Event 29
 Event : 29
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 18.7046
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 24.2962
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 7.47895
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 5.32617
  -- G4PEvent 29 stored in /Events/EventContainer/ (sustained)
 >>> Event 30
 Event : 30
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 17.7432
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 8.45743
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 61.5145
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 48.5887
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 30 stored in /Events/EventContainer/ (sustained)
 >>> Event 31
 Event : 31
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 15.4573
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 5.60297
+mySD/EvenCollection    Number of hits       25
+  Edep of the first Hit 49.5969
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 146.397
  -- G4PEvent 31 stored in /Events/EventContainer/ (sustained)
 >>> Event 32
 Event : 32
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 49.3456
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 4.42142
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 19.0419
+mySD/OddCollection     Number of hits       46
+  Edep of the first Hit 40.6396
  -- G4PEvent 32 stored in /Events/EventContainer/ (sustained)
 >>> Event 33
 Event : 33
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 39.7136
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 40.911
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 58.1887
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 47.4048
  -- G4PEvent 33 stored in /Events/EventContainer/ (sustained)
 >>> Event 34
 Event : 34
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 71.5197
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 49.5622
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 8.3811
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 22.9995
  -- G4PEvent 34 stored in /Events/EventContainer/ (sustained)
 >>> Event 35
 Event : 35
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 38.1744
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 3.09679
+mySD/EvenCollection    Number of hits       15
+  Edep of the first Hit 30.7278
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 2.51942
  -- G4PEvent 35 stored in /Events/EventContainer/ (sustained)
 >>> Event 36
 Event : 36
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 52.4219
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 18.9069
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 40.4002
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 6.39711
  -- G4PEvent 36 stored in /Events/EventContainer/ (sustained)
 >>> Event 37
 Event : 37
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 15.05
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 6.99795
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 14.6393
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 1.04518
  -- G4PEvent 37 stored in /Events/EventContainer/ (sustained)
 >>> Event 38
 Event : 38
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 11.2992
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 63.4584
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 10.8059
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 118.845
  -- G4PEvent 38 stored in /Events/EventContainer/ (sustained)
 >>> Event 39
 Event : 39
-mySD/EvenCollection    Number of hits       3
-  Edep of the first Hit 143.19
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 20.4067
+mySD/EvenCollection    Number of hits       20
+  Edep of the first Hit 38.2447
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 13.7807
  -- G4PEvent 39 stored in /Events/EventContainer/ (sustained)
 >>> Event 40
 Event : 40
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 49.8201
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 35.403
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 10.573
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 36.3471
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 40 stored in /Events/EventContainer/ (sustained)
 >>> Event 41
 Event : 41
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 56.283
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 19.0004
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 35.2729
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 77.8238
  -- G4PEvent 41 stored in /Events/EventContainer/ (sustained)
 >>> Event 42
 Event : 42
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 57.1055
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 36.6327
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 37.8813
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 2.36626
  -- G4PEvent 42 stored in /Events/EventContainer/ (sustained)
 >>> Event 43
 Event : 43
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 7.60171
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 18.0399
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 84.6687
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 65.9001
  -- G4PEvent 43 stored in /Events/EventContainer/ (sustained)
 >>> Event 44
 Event : 44
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 53.2389
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 5.52172
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 22.4192
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 29.7573
  -- G4PEvent 44 stored in /Events/EventContainer/ (sustained)
 >>> Event 45
 Event : 45
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 48.5526
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 25.8542
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 20.3101
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 46.6885
  -- G4PEvent 45 stored in /Events/EventContainer/ (sustained)
 >>> Event 46
 Event : 46
 mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 29.785
+  Edep of the first Hit 29.7857
 mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 1.97563
+  Edep of the first Hit 1.97487
  -- G4PEvent 46 stored in /Events/EventContainer/ (sustained)
 >>> Event 47
 Event : 47
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 49.2885
+  Edep of the first Hit 49.2956
 mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 14.1009
+  Edep of the first Hit 14.1064
  -- G4PEvent 47 stored in /Events/EventContainer/ (sustained)
 >>> Event 48
 Event : 48
 mySD/EvenCollection    Number of hits       7
   Edep of the first Hit 17.334
 mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 28.9757
+  Edep of the first Hit 14.9876
  -- G4PEvent 48 stored in /Events/EventContainer/ (sustained)
 >>> Event 49
 Event : 49
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 30.2462
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 41.7358
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 86.6238
+mySD/OddCollection     Number of hits       46
+  Edep of the first Hit 1.6177
  -- G4PEvent 49 stored in /Events/EventContainer/ (sustained)
 >>> Event 50
 Event : 50
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 7.09492
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 129.963
+mySD/EvenCollection    Number of hits       16
+  Edep of the first Hit 9.98038
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 102.52
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 50 stored in /Events/EventContainer/ (sustained)
 >>> Event 51
 Event : 51
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 1.77473
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 1.6009
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 6.34435
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 1.4159
  -- G4PEvent 51 stored in /Events/EventContainer/ (sustained)
 >>> Event 52
 Event : 52
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 22.1206
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 5.21217
+mySD/EvenCollection    Number of hits       32
+  Edep of the first Hit 26.7945
+mySD/OddCollection     Number of hits       12
+  Edep of the first Hit 3.60454
  -- G4PEvent 52 stored in /Events/EventContainer/ (sustained)
 >>> Event 53
 Event : 53
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 13.318
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 71.7173
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 86.5918
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 20.595
  -- G4PEvent 53 stored in /Events/EventContainer/ (sustained)
 >>> Event 54
 Event : 54
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 10.4189
+mySD/EvenCollection    Number of hits       23
+  Edep of the first Hit 2.5324
 mySD/OddCollection     Number of hits       21
-  Edep of the first Hit 34.7557
+  Edep of the first Hit 58.4734
  -- G4PEvent 54 stored in /Events/EventContainer/ (sustained)
 >>> Event 55
 Event : 55
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 14.7846
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 17.1474
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 37.4059
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 1.93167
  -- G4PEvent 55 stored in /Events/EventContainer/ (sustained)
 >>> Event 56
 Event : 56
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 26.8971
+  Edep of the first Hit 19.5034
 mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 31.0888
+  Edep of the first Hit 31.571
  -- G4PEvent 56 stored in /Events/EventContainer/ (sustained)
 >>> Event 57
 Event : 57
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 44.9334
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 66.4154
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 31.5705
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 30.8361
  -- G4PEvent 57 stored in /Events/EventContainer/ (sustained)
 >>> Event 58
 Event : 58
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 2.20857
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 1.23394
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 26.7245
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 39.5028
  -- G4PEvent 58 stored in /Events/EventContainer/ (sustained)
 >>> Event 59
 Event : 59
-mySD/EvenCollection    Number of hits       22
-  Edep of the first Hit 15.214
-mySD/OddCollection     Number of hits       23
-  Edep of the first Hit 3.83712
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 15.1671
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 2.78718
  -- G4PEvent 59 stored in /Events/EventContainer/ (sustained)
 >>> Event 60
 Event : 60
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 16.8675
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 44.7627
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 27.9909
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 0.712295
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 60 stored in /Events/EventContainer/ (sustained)
 >>> Event 61
 Event : 61
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 3.47969
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 30.56
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 27.6162
+mySD/OddCollection     Number of hits       9
+  Edep of the first Hit 113.325
  -- G4PEvent 61 stored in /Events/EventContainer/ (sustained)
 >>> Event 62
 Event : 62
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 15.0186
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 2.9719
+mySD/EvenCollection    Number of hits       22
+  Edep of the first Hit 21.6302
+mySD/OddCollection     Number of hits       23
+  Edep of the first Hit 0.862425
  -- G4PEvent 62 stored in /Events/EventContainer/ (sustained)
 >>> Event 63
 Event : 63
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 41.015
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 5.60219
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 14.2129
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 25.7919
  -- G4PEvent 63 stored in /Events/EventContainer/ (sustained)
 >>> Event 64
 Event : 64
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 19.799
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 16.2043
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 12.5999
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 15.5595
  -- G4PEvent 64 stored in /Events/EventContainer/ (sustained)
 >>> Event 65
 Event : 65
-mySD/EvenCollection    Number of hits       14
-  Edep of the first Hit 15.7985
+mySD/EvenCollection    Number of hits       15
+  Edep of the first Hit 104.139
 mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 9.14023
+  Edep of the first Hit 31.4386
  -- G4PEvent 65 stored in /Events/EventContainer/ (sustained)
 >>> Event 66
 Event : 66
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 14.5406
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 42.3875
 mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 67.0776
+  Edep of the first Hit 9.47815
  -- G4PEvent 66 stored in /Events/EventContainer/ (sustained)
 >>> Event 67
 Event : 67
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 53.7664
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 53.2186
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 10.7206
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 4.13397
  -- G4PEvent 67 stored in /Events/EventContainer/ (sustained)
 >>> Event 68
 Event : 68
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 0.0268595
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 13.2218
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 5.34416
+mySD/OddCollection     Number of hits       47
+  Edep of the first Hit 3.01975
  -- G4PEvent 68 stored in /Events/EventContainer/ (sustained)
 >>> Event 69
 Event : 69
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 28.0916
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 8.14295
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 14.5703
+mySD/OddCollection     Number of hits       11
+  Edep of the first Hit 7.50074
  -- G4PEvent 69 stored in /Events/EventContainer/ (sustained)
 >>> Event 70
 Event : 70
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 46.4878
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 0.310941
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 58.2356
+mySD/OddCollection     Number of hits       21
+  Edep of the first Hit 0.596397
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 70 stored in /Events/EventContainer/ (sustained)
 >>> Event 71
 Event : 71
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 11.3829
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 5.78213
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 13.1214
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 4.05248
  -- G4PEvent 71 stored in /Events/EventContainer/ (sustained)
 >>> Event 72
 Event : 72
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 102.104
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 31.2024
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 14.054
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 15.1399
  -- G4PEvent 72 stored in /Events/EventContainer/ (sustained)
 >>> Event 73
 Event : 73
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 25.7397
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 13.4817
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 95.5824
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 7.54214
  -- G4PEvent 73 stored in /Events/EventContainer/ (sustained)
 >>> Event 74
 Event : 74
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 4.22867
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 7.92935
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 18.4512
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 12.2678
  -- G4PEvent 74 stored in /Events/EventContainer/ (sustained)
 >>> Event 75
 Event : 75
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 53.4164
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 61.7056
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 52.9679
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 25.0818
  -- G4PEvent 75 stored in /Events/EventContainer/ (sustained)
 >>> Event 76
 Event : 76
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 9.39781
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 24.0445
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 31.5265
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 18.8405
  -- G4PEvent 76 stored in /Events/EventContainer/ (sustained)
 >>> Event 77
 Event : 77
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 6.83122
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 44.4089
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 41.568
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 47.8405
  -- G4PEvent 77 stored in /Events/EventContainer/ (sustained)
 >>> Event 78
 Event : 78
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 1.36272
-mySD/OddCollection     Number of hits       45
-  Edep of the first Hit 1.69722
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 49.3923
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 48.5154
  -- G4PEvent 78 stored in /Events/EventContainer/ (sustained)
 >>> Event 79
 Event : 79
-mySD/EvenCollection    Number of hits       29
-  Edep of the first Hit 56.4575
-mySD/OddCollection     Number of hits       13
-  Edep of the first Hit 2.42198
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 42.3972
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 50.0399
  -- G4PEvent 79 stored in /Events/EventContainer/ (sustained)
 >>> Event 80
 Event : 80
-mySD/EvenCollection    Number of hits       32
-  Edep of the first Hit 6.56751
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 64.8193
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 17.0608
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 10.1892
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 80 stored in /Events/EventContainer/ (sustained)
 >>> Event 81
 Event : 81
-mySD/EvenCollection    Number of hits       23
-  Edep of the first Hit 77.0987
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 43.7444
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 38.5882
+mySD/OddCollection     Number of hits       10
+  Edep of the first Hit 15.3692
  -- G4PEvent 81 stored in /Events/EventContainer/ (sustained)
 >>> Event 82
 Event : 82
-mySD/EvenCollection    Number of hits       29
-  Edep of the first Hit 31.2056
-mySD/OddCollection     Number of hits       11
-  Edep of the first Hit 30.487
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 44.1097
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 0.387436
  -- G4PEvent 82 stored in /Events/EventContainer/ (sustained)
 >>> Event 83
 Event : 83
-mySD/EvenCollection    Number of hits       18
-  Edep of the first Hit 8.34544
-mySD/OddCollection     Number of hits       18
-  Edep of the first Hit 18.5952
+mySD/EvenCollection    Number of hits       25
+  Edep of the first Hit 32.1517
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 28.1264
  -- G4PEvent 83 stored in /Events/EventContainer/ (sustained)
 >>> Event 84
 Event : 84
-mySD/EvenCollection    Number of hits       15
-  Edep of the first Hit 1.30057
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 11.4435
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 1.70742
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 24.3727
  -- G4PEvent 84 stored in /Events/EventContainer/ (sustained)
 >>> Event 85
 Event : 85
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 38.8382
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 14.691
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 7.27166
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 49.4002
  -- G4PEvent 85 stored in /Events/EventContainer/ (sustained)
 >>> Event 86
 Event : 86
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 6.5076
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 103.732
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 51.317
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 1.80263
  -- G4PEvent 86 stored in /Events/EventContainer/ (sustained)
 >>> Event 87
 Event : 87
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 4.17298
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 70.4753
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 9.87022
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 51.1685
  -- G4PEvent 87 stored in /Events/EventContainer/ (sustained)
 >>> Event 88
 Event : 88
-mySD/EvenCollection    Number of hits       31
-  Edep of the first Hit 17.119
-mySD/OddCollection     Number of hits       22
-  Edep of the first Hit 28.4859
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 63.5459
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 33.551
  -- G4PEvent 88 stored in /Events/EventContainer/ (sustained)
 >>> Event 89
 Event : 89
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 47.2302
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 49.3412
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 25.64
+mySD/OddCollection     Number of hits       48
+  Edep of the first Hit 9.03626
  -- G4PEvent 89 stored in /Events/EventContainer/ (sustained)
 >>> Event 90
 Event : 90
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 23.1413
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 18.5923
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 5.46992
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 58.2079
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 90 stored in /Events/EventContainer/ (sustained)
 >>> Event 91
 Event : 91
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 27.6976
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 8.33175
 mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 28.5904
+  Edep of the first Hit 22.6429
  -- G4PEvent 91 stored in /Events/EventContainer/ (sustained)
 >>> Event 92
 Event : 92
-mySD/EvenCollection    Number of hits       14
-  Edep of the first Hit 7.49035
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 85.1197
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 5.97125
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 14.186
  -- G4PEvent 92 stored in /Events/EventContainer/ (sustained)
 >>> Event 93
 Event : 93
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 30.053
-mySD/OddCollection     Number of hits       25
-  Edep of the first Hit 26.7725
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 39.596
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 33.7135
  -- G4PEvent 93 stored in /Events/EventContainer/ (sustained)
 >>> Event 94
 Event : 94
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 15.6043
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 61.7972
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 4.32385
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 2.13595
  -- G4PEvent 94 stored in /Events/EventContainer/ (sustained)
 >>> Event 95
 Event : 95
-mySD/EvenCollection    Number of hits       25
-  Edep of the first Hit 20.5769
-mySD/OddCollection     Number of hits       21
-  Edep of the first Hit 11.6616
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 6.90108
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 5.42919
  -- G4PEvent 95 stored in /Events/EventContainer/ (sustained)
 >>> Event 96
 Event : 96
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 1.25488
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 75.4839
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 17.5102
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 12.6036
  -- G4PEvent 96 stored in /Events/EventContainer/ (sustained)
 >>> Event 97
 Event : 97
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 1.63689
-mySD/OddCollection     Number of hits       31
-  Edep of the first Hit 80.3105
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 11.7109
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 119.389
  -- G4PEvent 97 stored in /Events/EventContainer/ (sustained)
 >>> Event 98
 Event : 98
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 36.8743
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 29.8302
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 18.9865
+mySD/OddCollection     Number of hits       32
+  Edep of the first Hit 85.2291
  -- G4PEvent 98 stored in /Events/EventContainer/ (sustained)
 >>> Event 99
 Event : 99
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 8.25636
-mySD/OddCollection     Number of hits       31
-  Edep of the first Hit 24.0489
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 2.75959
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 42.2406
  -- G4PEvent 99 stored in /Events/EventContainer/ (sustained)
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Runs/RunContainer/ with non-sustained mode.
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
index 631eb1e7d5..acde5f8f9b 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02DetectorConstruction.hh,v 1.3 1999/11/29 18:15:28 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02DetectorConstruction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
index 2bc3909d23..69f0668b8a 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02EventAction.hh,v 1.3 1999/11/29 18:23:31 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
index 01308156cd..8f413f1192 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02PhysicsList.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02PhysicsList_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
index fffae92ac4..ad3df3237a 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02PrimaryGeneratorAction.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02PrimaryGeneratorAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
index a914034681..d5fdd13313 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02RunAction.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02RunAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
index 3e9edd0a0e..c2667275ad 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02StackingAction.hh,v 1.2 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02StackingAction_H
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
index 2d536b2193..13960a70f5 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerHit.ddl,v 1.4 1999/11/29 19:27:52 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02TrackerHit_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
index 52aaeb87de..a64b026c98 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerHitsCollection.ddl,v 1.3 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02TrackerHitsCollection_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
index 5059e92cf2..6812b50858 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerSD.hh,v 1.3 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef PersEx02TrackerSD_h
diff --git a/examples/extended/persistency/PersistentEx02/readDB/readDB.cpp b/examples/extended/persistency/PersistentEx02/readDB/readDB.cpp
index 2cfaf1da57..58d322c087 100644
--- a/examples/extended/persistency/PersistentEx02/readDB/readDB.cpp
+++ b/examples/extended/persistency/PersistentEx02/readDB/readDB.cpp
@@ -46,8 +46,8 @@ public:
       int evt_id = pevent_iterator->GetEventID();
       int n_pvertex = pevent_iterator->GetNumberOfPrimaryVertex();
 
-      cout << endl << "Reading event #" << evt_id << ":" << endl;
-      cout << "  No. of primary vertex: " << n_pvertex << endl;
+      cout << G4endl << "Reading event #" << evt_id << ":" << G4endl;
+      cout << "  No. of primary vertex: " << n_pvertex << G4endl;
 
       // Loop for all primary vertex in this event
       for ( int i = 0; i < n_pvertex; i++ )
@@ -55,9 +55,9 @@ public:
         HepRef(G4PPrimaryVertex) pvertex = 
                              pevent_iterator->GetPrimaryVertex(i);
         cout << "    ObjectID of the primary vertex: "
-             << pvertex.sprint() << endl;
+             << pvertex.sprint() << G4endl;
         cout << "    No. of particle in the primary vertex: "
-             << pvertex->GetNumberOfParticle() << endl;
+             << pvertex->GetNumberOfParticle() << G4endl;
 
         for ( int j = 0; j < pvertex->GetNumberOfParticle() ; j++ )
         {
@@ -65,7 +65,7 @@ public:
            cout << "      PDGcode: " << particle->GetPDGcode()
                 << "      Px = " << particle->GetPx()
                 << "      Py = " << particle->GetPy()
-                << "      Pz = " << particle->GetPz() << endl;
+                << "      Pz = " << particle->GetPz() << G4endl;
         }
       }
 
@@ -73,7 +73,7 @@ public:
       const HepRef(G4PHCofThisEvent) hcte = pevent_iterator->GetHCofThisEvent();
       if( hcte != 0 )
       {
-        cout << "  ObjectID of the Hit Collections: " << hcte.sprint() << endl;
+        cout << "  ObjectID of the Hit Collections: " << hcte.sprint() << G4endl;
 
         // Capacity of the Hit Collections VArray
       //  G4int numHC = hcte->GetCapacity();
@@ -81,7 +81,7 @@ public:
         // Actual number of Hit Collections in this event
         G4int numHCact = hcte->GetNumberOfCollections();
 
-        cout << "  No. of the Hit Collections: " << numHCact << endl;
+        cout << "  No. of the Hit Collections: " << numHCact << G4endl;
         for( G4int i = 0; i<numHCact; i++)
         {
           const HepRef(PersEx02TrackerHitsCollection) aHC =
@@ -90,19 +90,19 @@ public:
           {
             cout << "    Hit Collection[" << i << "]:  Name: "
                  << aHC->GetName();
-            cout << "     Sensitive Detector: " << aHC->GetSDname() << endl;
+            cout << "     Sensitive Detector: " << aHC->GetSDname() << G4endl;
 
             HepRef(PersEx02TrackerHit) aHit = aHC->element(0);
             if( aHit != 0 )
             {
-              cout << "      Number of hits:        " << aHC->size() << endl
-                   << "      Edep of the first hit: " << aHit->GetEdep() << endl;
+              cout << "      Number of hits:        " << aHC->size() << G4endl
+                   << "      Edep of the first hit: " << aHit->GetEdep() << G4endl;
             }
           }
         }
       }
       else
-      { cout << "  No Hit Collections for this event." << endl; }
+      { cout << "  No Hit Collections for this event." << G4endl; }
     }
 
     message("End of loop over events.");
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
index 3701babe65..5a9d747359 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: PersEx02DetectorConstruction.cc,v 1.3 1999/11/29 18:33:27 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: PersEx02DetectorConstruction.cc,v 1.3.4.1 1999/12/08 17:33:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02DetectorConstruction.hh"
@@ -32,7 +32,7 @@ PersEx02DetectorConstruction::~PersEx02DetectorConstruction()
 
 G4VPhysicalVolume* PersEx02DetectorConstruction::Construct()
 {
-    G4cout << "  -- Tracker type sensitive detector" << endl;
+    G4cout << "  -- Tracker type sensitive detector" << G4endl;
 
 //--------- Material definition ---------
 
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
index 9b10525e70..3910f158bd 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: PersEx02EventAction.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: PersEx02EventAction.cc,v 1.3.4.1 1999/12/08 17:33:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02EventAction.hh"
@@ -46,7 +46,7 @@ void PersEx02EventAction::BeginOfEventAction(const G4Event* )
 
 void PersEx02EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
+  G4cout << ">>> Event " << evt->GetEventID() << G4endl;
 
   G4PHCofThisEvent* pHCE = G4PersistentHitMan::GetPersistentHitMan()
                                                 ->GetCurrentPHCofThisEvent();
@@ -55,21 +55,21 @@ void PersEx02EventAction::EndOfEventAction(const G4Event* evt)
   HepRef(PersEx02TrackerHitsCollection) pTHC2
    = (HepRef(PersEx02TrackerHitsCollection))(pHCE->GetHC(colID2));
 
-  G4cout << "Event : " << evt->GetEventID() << endl
+  G4cout << "Event : " << evt->GetEventID() << G4endl
          << pTHC1->GetSDname() << "/" << pTHC1->GetName() << "    "
-         << "Number of hits       " << pTHC1->size() << endl;
+         << "Number of hits       " << pTHC1->size() << G4endl;
   if( pTHC1->size() > 0 )
   {
     HepRef(PersEx02TrackerHit) aHit = pTHC1->element(0);
-    G4cout << "  Edep of the first Hit " << aHit->GetEdep() << endl;
+    G4cout << "  Edep of the first Hit " << aHit->GetEdep() << G4endl;
   }
   G4cout << pTHC2->GetSDname() << "/" << pTHC2->GetName() << "     "
-         << "Number of hits       " << pTHC2->size() << endl;
+         << "Number of hits       " << pTHC2->size() << G4endl;
   if( pTHC2->size() > 0 )
   {
     HepRef(PersEx02TrackerHit) aHit = pTHC2->element(0);
     assert(aHit!=NULL);
-    G4cout << "  Edep of the first Hit " << aHit->GetEdep() << endl;
+    G4cout << "  Edep of the first Hit " << aHit->GetEdep() << G4endl;
   }
 
   G4PersistencyManager* persM
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
index b2fac55134..431f4906aa 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: PersEx02PhysicsList.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: PersEx02PhysicsList.cc,v 1.3.4.3 1999/12/14 07:07:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "globals.hh"
@@ -25,7 +25,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 
 PersEx02PhysicsList::PersEx02PhysicsList():  G4VUserPhysicsList()
@@ -186,7 +186,7 @@ void PersEx02PhysicsList::SetCuts()
 {
   if (verboseLevel >0){
     G4cout << "PersEx02PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
   }  
 
   //  " G4VUserPhysicsList::SetCutsWithDefault" method sets 
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
index 6f4ea6d217..07774fe2c4 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02PrimaryGeneratorAction.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02PrimaryGeneratorAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
index aa9d8fe5b2..4c26471ea3 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02RunAction.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02RunAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
index 690707b1d7..0ad4d68df4 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02StackingAction.cc,v 1.2 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02StackingAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
index 28737de97e..a8cf8cb923 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerHit.cc,v 1.3 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02TrackerHit.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
index 6bcc5be362..454693a4ca 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerHitsCollection.cc,v 1.3 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "PersEx02TrackerHitsCollection.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
index 78df5e6be1..051d8fccd1 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02TrackerSD.cc,v 1.4 1999/12/02 17:05:17 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include <assert.h>
diff --git a/examples/novice/N01/exampleN01.cc b/examples/novice/N01/exampleN01.cc
index 3d6c31b799..6b607236ba 100644
--- a/examples/novice/N01/exampleN01.cc
+++ b/examples/novice/N01/exampleN01.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN01.cc,v 1.1.10.1 1999/12/07 20:47:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN01.cc,v 1.2 1999/12/15 14:49:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N01/exampleN01.out b/examples/novice/N01/exampleN01.out
index 19a938f91b..4c7e8f4fbc 100644
--- a/examples/novice/N01/exampleN01.out
+++ b/examples/novice/N01/exampleN01.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
diff --git a/examples/novice/N01/include/ExN01DetectorConstruction.hh b/examples/novice/N01/include/ExN01DetectorConstruction.hh
index b935153892..d17ce44d0b 100644
--- a/examples/novice/N01/include/ExN01DetectorConstruction.hh
+++ b/examples/novice/N01/include/ExN01DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01DetectorConstruction.hh,v 1.1.10.1 1999/12/07 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01DetectorConstruction.hh,v 1.2 1999/12/15 14:49:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN01DetectorConstruction_H
diff --git a/examples/novice/N01/include/ExN01PhysicsList.hh b/examples/novice/N01/include/ExN01PhysicsList.hh
index 6acc13d1ff..a8736816b7 100644
--- a/examples/novice/N01/include/ExN01PhysicsList.hh
+++ b/examples/novice/N01/include/ExN01PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01PhysicsList.hh,v 1.2.8.1 1999/12/07 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01PhysicsList.hh,v 1.3 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
index 07348ed31b..eb6cab7f8f 100644
--- a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
+++ b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01PrimaryGeneratorAction.hh,v 1.1.10.1 1999/12/07 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN01PrimaryGeneratorAction_h
diff --git a/examples/novice/N01/src/ExN01DetectorConstruction.cc b/examples/novice/N01/src/ExN01DetectorConstruction.cc
index 96bd5daa6d..40a07a71c5 100644
--- a/examples/novice/N01/src/ExN01DetectorConstruction.cc
+++ b/examples/novice/N01/src/ExN01DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01DetectorConstruction.cc,v 1.1.10.1 1999/12/07 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01DetectorConstruction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN01DetectorConstruction.hh"
diff --git a/examples/novice/N01/src/ExN01PhysicsList.cc b/examples/novice/N01/src/ExN01PhysicsList.cc
index acacef1502..fd25326f72 100644
--- a/examples/novice/N01/src/ExN01PhysicsList.cc
+++ b/examples/novice/N01/src/ExN01PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01PhysicsList.cc,v 1.2.8.1 1999/12/07 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01PhysicsList.cc,v 1.3 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
index 6d28822df3..b823b2e111 100644
--- a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
+++ b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN01PrimaryGeneratorAction.cc,v 1.1.10.1 1999/12/07 20:47:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN01PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN01PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N02/History b/examples/novice/N02/History
index 7f3d1815ce..76133504aa 100644
--- a/examples/novice/N02/History
+++ b/examples/novice/N02/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.2 1999/04/16 11:19:54 kurasige Exp $
+$Id: History,v 1.3 1999/11/15 12:20:53 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -14,6 +14,10 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+15-11-99 M.Maire
+- example of user SteppingVerbose class: verbose with units
+     
 16th April 1999 H.Kurashige
 - modify ExN02SteppingAction::UserSteppingAction
 - modify ExN02PhysicsList::SetCuts
diff --git a/examples/novice/N02/exampleN02.cc b/examples/novice/N02/exampleN02.cc
index 3f1c93b98e..c77eb8438e 100644
--- a/examples/novice/N02/exampleN02.cc
+++ b/examples/novice/N02/exampleN02.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN02.cc,v 1.1.10.1 1999/12/07 20:47:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN02.cc,v 1.3 1999/12/15 14:49:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -25,6 +25,7 @@
 #include "ExN02PrimaryGeneratorAction.hh"
 #include "ExN02EventAction.hh"
 #include "ExN02SteppingAction.hh"
+#include "ExN02SteppingVerbose.hh"
 
 #include "G4UImanager.hh"
 #include "G4UIterminal.hh"
@@ -40,6 +41,9 @@
 int
 main(int argc,char** argv) {
 
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new ExN02SteppingVerbose);
+  
   // Run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/novice/N02/exampleN02.in b/examples/novice/N02/exampleN02.in
index 7f4a2ad4f1..07242922ee 100644
--- a/examples/novice/N02/exampleN02.in
+++ b/examples/novice/N02/exampleN02.in
@@ -1,13 +1,25 @@
 /run/initialize
 /gun/position 0 0 -100
 /gun/direction 0 0 1
-/gun/energy    200 MeV
 
 /tracking/verbose 1
+
+/gun/energy    200 MeV
 /gun/particle e+
 /run/beamOn 1
 
+/gun/energy    1 TeV
+/gun/particle mu+
+/run/beamOn 1
+
 /tracking/verbose 0
+
+/gun/energy    200 MeV
+/gun/particle e+
+/run/beamOn 100
+
+/gun/energy    1 TeV
+/gun/particle mu+
 /run/beamOn 100
 
 exit
diff --git a/examples/novice/N02/exampleN02.large_N.in b/examples/novice/N02/exampleN02.large_N.in
new file mode 100644
index 0000000000..ec35d4cc33
--- /dev/null
+++ b/examples/novice/N02/exampleN02.large_N.in
@@ -0,0 +1,25 @@
+/run/initialize
+/gun/position 0 0 -100
+/gun/direction 0 0 1
+
+/tracking/verbose 1
+
+/gun/energy    200 MeV
+/gun/particle e+
+/run/beamOn 1
+
+/gun/energy    1 TeV
+/gun/particle mu+
+/run/beamOn 1
+
+/tracking/verbose 0
+
+/gun/energy    200 MeV
+/gun/particle e+
+/run/beamOn 10000
+
+/gun/energy    1 TeV
+/gun/particle mu+
+/run/beamOn 1000
+
+exit
diff --git a/examples/novice/N02/exampleN02.out b/examples/novice/N02/exampleN02.out
index 3f07f9d06a..f49137964f 100644
--- a/examples/novice/N02/exampleN02.out
+++ b/examples/novice/N02/exampleN02.out
@@ -1,11 +1,8 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
-/tracking/verbose 2
-/tracking/verbose 1
-/run/initialize
 
 The materials defined are : 
 
@@ -85,1424 +82,5070 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
-Idle> /run/initialize
-Idle> /gun/position 0 0 -100
-Idle> /gun/direction 0 0 1
-Idle> /gun/energy    200 MeV
-Idle> Idle> /tracking/verbose 1
-Idle> /gun/particle e+
-Idle> /run/beamOn 1
 ### Run 0 start.
-/tracking/storeTrajectory 1
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e+,   Track ID = 1,   Parent ID = 0
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -25        0        0       200        0        0         0    TargetPV initStep
-    1      -25        0     3.16       195      1.4     3.16      3.16    TargetPV eIoni
-    2      -25        0     3.16       195        0        0      3.16     WorldPV Transportation
-    3    -25.3   -0.133       25       195  0.00398     21.8        25     Tracker Transportation
-    4    -26.2   -0.405     74.1       195  0.00952     49.1      74.1     Tracker eIoni
-    5    -27.2   -0.786      140       195   0.0151     65.5       140     Tracker eIoni
-    6    -28.2     -1.2      207       195   0.0158       67       207     Tracker eIoni
-    7    -30.5    -1.99      357       195   0.0353      151       357     Tracker eIoni
-    8    -33.5    -3.06      558       195   0.0357      201       558     Tracker eIoni
-    9    -33.7    -3.18      574       195  0.00246     15.8       574     Tracker eIoni
-   10    -34.4    -3.54      618       195   0.0109     44.1       618     Tracker eIoni
-   11    -35.2    -4.02      672       195   0.0102     54.3       672     Tracker eIoni
-   12    -35.2    -4.04      674       195 7.21e-05     1.77       674     Tracker eIoni
-   13    -35.2    -4.05      675       195 0.000169     1.46       676     Tracker eIoni
-   14    -35.8     -4.4      711       195  0.00912     35.5       711     Tracker eIoni
-   15    -37.3    -5.28      803       195   0.0194     92.2       803     Tracker eIoni
-   16    -37.4     -5.3      806       190 0.000901     2.44       806     Tracker eBrem
-   17    -37.7    -5.47      825       190  0.00244     19.5       825  trkChamber Transportation
-   18      -38    -5.78      837       185     4.91     11.8       837  trkChamber eBrem
-   19    -37.9    -6.01      843       159     2.37     6.19       843  trkChamber eBrem
-   20    -37.8    -7.39      862        37     8.27     19.2       862  trkChamber eBrem
-   21    -37.9    -7.48      865      36.1    0.976     2.86       865  trkChamber eBrem
-   22      -37    -9.28      878      31.1     4.82     12.8       878  trkChamber eBrem
-   23    -37.2    -9.64      881      29.3     1.63     3.21       881  trkChamber eBrem
-   24    -37.5    -10.2      884      27.2     1.58     3.66       885  trkChamber eBrem
-   25    -37.4    -10.7      887      25.4     1.37     2.33       887  trkChamber eBrem
-   26      -37    -11.2      892      23.2        2     5.68       893  trkChamber eBrem
-   27    -38.5    -12.8      900      19.8     3.39     7.77       901  trkChamber eBrem
-   28    -40.1    -17.8      907      15.8     3.92     9.32       910  trkChamber eBrem
-   29    -40.1      -18      908      15.5    0.102    0.317       910  trkChamber eBrem
-   30    -40.3    -20.9      910      9.41     2.11     3.66       914  trkChamber eBrem
-   31    -39.7    -24.1      914      7.54     1.87     4.95       919  trkChamber eIoni
-   32    -41.2    -25.5      917      5.96     1.52     3.73       923  trkChamber eBrem
-   33    -41.9      -27      919      4.78     1.19     3.24       926  trkChamber eIoni
-   34    -42.7    -29.4      920      3.81    0.965     2.65       929  trkChamber eIoni
-   35    -44.1      -28      919      2.91      0.9     2.16       931  trkChamber eIoni
-   36      -45    -28.3      918      2.18    0.727      1.7       932  trkChamber eIoni
-   37      -46      -28      917      1.75     0.43     1.33       934  trkChamber eIoni
-   38    -45.7    -28.7      916      1.38    0.371     1.11       935  trkChamber eIoni
-   39    -45.9    -29.5      916     0.993     0.39    0.915       936  trkChamber eIoni
-   40    -46.5    -29.4      916     0.711    0.282    0.711       936  trkChamber eIoni
-   41    -46.6    -29.9      916     0.308    0.403    0.561       937  trkChamber eIoni
-   42    -46.7      -30      916     0.138     0.17    0.323       937  trkChamber eIoni
-   43    -46.7      -30      916         0    0.138    0.114       937  trkChamber eIoni
-   44    -46.7      -30      916         0        0        0       937  trkChamber annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm      0 fm      0 fm    200 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1   -2.5 cm      0 fm   3.16 mm    195 MeV   1.4 MeV  3.16 mm   3.16 mm   TargetPV     eIoni
+    2   -2.5 cm      0 fm   3.16 mm    195 MeV     0 eV      0 fm   3.16 mm    WorldPVTransportation
+    3  -2.53 cm   -133 mum   2.5 cm    195 MeV  3.98 keV  2.18 cm    2.5 cm    TrackerTransportation
+    4  -2.62 cm   -405 mum  7.41 cm    195 MeV  9.52 keV  4.91 cm   7.41 cm    Tracker     eIoni
+    5  -2.72 cm   -786 mum    14 cm    195 MeV  15.1 keV  6.55 cm     14 cm    Tracker     eIoni
+    6  -2.82 cm   -1.2 mm   20.7 cm    195 MeV  15.8 keV   6.7 cm   20.7 cm    Tracker     eIoni
+    7  -3.05 cm  -1.99 mm   35.7 cm    195 MeV  35.3 keV  15.1 cm   35.7 cm    Tracker     eIoni
+    8  -3.35 cm  -3.06 mm   55.8 cm    195 MeV  35.7 keV  20.1 cm   55.8 cm    Tracker     eIoni
+    9  -3.37 cm  -3.18 mm   57.4 cm    195 MeV  2.46 keV  1.58 cm   57.4 cm    Tracker     eIoni
+   10  -3.44 cm  -3.54 mm   61.8 cm    195 MeV  10.9 keV  4.41 cm   61.8 cm    Tracker     eIoni
+   11  -3.52 cm  -4.02 mm   67.2 cm    195 MeV  10.2 keV  5.43 cm   67.2 cm    Tracker     eIoni
+   12  -3.52 cm  -4.04 mm   67.4 cm    195 MeV  72.1 eV   1.77 mm   67.4 cm    Tracker     eIoni
+   13  -3.52 cm  -4.05 mm   67.5 cm    195 MeV   169 eV   1.46 mm   67.6 cm    Tracker     eIoni
+   14  -3.58 cm   -4.4 mm   71.1 cm    195 MeV  9.12 keV  3.55 cm   71.1 cm    Tracker     eIoni
+   15  -3.73 cm  -5.28 mm   80.3 cm    195 MeV  19.4 keV  9.22 cm   80.3 cm    Tracker     eIoni
+   16  -3.74 cm   -5.3 mm   80.6 cm    190 MeV   901 eV   2.44 mm   80.6 cm    Tracker     eBrem
+   17  -3.77 cm  -5.47 mm   82.5 cm    190 MeV  2.44 keV  1.95 cm   82.5 cm trkChamberTransportation
+   18   -3.8 cm  -5.78 mm   83.7 cm    185 MeV  4.91 MeV  1.18 cm   83.7 cm trkChamber     eBrem
+   19  -3.79 cm  -6.01 mm   84.3 cm    159 MeV  2.37 MeV  6.19 mm   84.3 cm trkChamber     eBrem
+   20  -3.78 cm  -7.39 mm   86.2 cm     37 MeV  8.27 MeV  1.92 cm   86.2 cm trkChamber     eBrem
+   21  -3.79 cm  -7.48 mm   86.5 cm   36.1 MeV   976 keV  2.86 mm   86.5 cm trkChamber     eBrem
+   22   -3.7 cm  -9.28 mm   87.8 cm   31.1 MeV  4.82 MeV  1.28 cm   87.8 cm trkChamber     eBrem
+   23  -3.72 cm  -9.64 mm   88.1 cm   29.3 MeV  1.63 MeV  3.21 mm   88.1 cm trkChamber     eBrem
+   24  -3.75 cm  -1.02 cm   88.4 cm   27.2 MeV  1.58 MeV  3.66 mm   88.5 cm trkChamber     eBrem
+   25  -3.74 cm  -1.07 cm   88.7 cm   25.4 MeV  1.37 MeV  2.33 mm   88.7 cm trkChamber     eBrem
+   26   -3.7 cm  -1.12 cm   89.2 cm   23.2 MeV     2 MeV  5.68 mm   89.3 cm trkChamber     eBrem
+   27  -3.85 cm  -1.28 cm     90 cm   19.8 MeV  3.39 MeV  7.77 mm   90.1 cm trkChamber     eBrem
+   28  -4.01 cm  -1.78 cm   90.7 cm   15.8 MeV  3.92 MeV  9.32 mm     91 cm trkChamber     eBrem
+   29  -4.01 cm   -1.8 cm   90.8 cm   15.5 MeV   102 keV   317 mum    91 cm trkChamber     eBrem
+   30  -4.03 cm  -2.09 cm     91 cm   9.41 MeV  2.11 MeV  3.66 mm   91.4 cm trkChamber     eBrem
+   31  -3.97 cm  -2.41 cm   91.4 cm   7.54 MeV  1.87 MeV  4.95 mm   91.9 cm trkChamber     eIoni
+   32  -4.12 cm  -2.55 cm   91.7 cm   5.96 MeV  1.52 MeV  3.73 mm   92.3 cm trkChamber     eBrem
+   33  -4.19 cm   -2.7 cm   91.9 cm   4.78 MeV  1.19 MeV  3.24 mm   92.6 cm trkChamber     eIoni
+   34  -4.27 cm  -2.94 cm     92 cm   3.81 MeV   965 keV  2.65 mm   92.9 cm trkChamber     eIoni
+   35  -4.41 cm   -2.8 cm   91.9 cm   2.91 MeV   900 keV  2.16 mm   93.1 cm trkChamber     eIoni
+   36   -4.5 cm  -2.83 cm   91.8 cm   2.18 MeV   727 keV   1.7 mm   93.2 cm trkChamber     eIoni
+   37   -4.6 cm   -2.8 cm   91.7 cm   1.75 MeV   430 keV  1.33 mm   93.4 cm trkChamber     eIoni
+   38  -4.57 cm  -2.87 cm   91.6 cm   1.38 MeV   371 keV  1.11 mm   93.5 cm trkChamber     eIoni
+   39  -4.59 cm  -2.95 cm   91.6 cm    993 keV   390 keV   915 mum  93.6 cm trkChamber     eIoni
+   40  -4.65 cm  -2.94 cm   91.6 cm    711 keV   282 keV   711 mum  93.6 cm trkChamber     eIoni
+   41  -4.66 cm  -2.99 cm   91.6 cm    308 keV   403 keV   561 mum  93.7 cm trkChamber     eIoni
+   42  -4.67 cm     -3 cm   91.6 cm    138 keV   170 keV   323 mum  93.7 cm trkChamber     eIoni
+   43  -4.67 cm     -3 cm   91.6 cm      0 eV    138 keV   114 mum  93.7 cm trkChamber     eIoni
+   44  -4.67 cm     -3 cm   91.6 cm      0 eV      0 eV      0 fm   93.7 cm trkChamber   annihil
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 31,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -46.7      -30      916     0.511        0        0         0  trkChamber initStep
-    1    -98.1    -46.4      940     0.245    0.266     59.1      59.1  trkChamber compt
-    2     -130     9.06      893     0.215   0.0309     79.8       139  trkChamber compt
-    3     -136     8.83      882     0.117   0.0972     12.5       151  trkChamber compt
-    4     -129     9.28      912    0.0905   0.0268     30.9       182  trkChamber compt
-    5     -160       14      910    0.0905   0.0905     31.6       214  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.67 cm     -3 cm   91.6 cm    511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.81 cm  -4.64 cm     94 cm    245 keV   266 keV  5.91 cm   5.91 cm trkChamber     compt
+    2    -13 cm   9.06 mm   89.3 cm    215 keV  30.9 keV  7.98 cm   13.9 cm trkChamber     compt
+    3  -13.6 cm   8.83 mm   88.2 cm    117 keV  97.2 keV  1.25 cm   15.1 cm trkChamber     compt
+    4  -12.9 cm   9.28 mm   91.2 cm   90.5 keV  26.8 keV  3.09 cm   18.2 cm trkChamber     compt
+    5    -16 cm    1.4 cm     91 cm   90.5 keV  90.5 keV  3.16 cm   21.4 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -46.7      -30      916     0.511        0        0         0  trkChamber initStep
-    1    -30.8      -25      909     0.214    0.297     18.3      18.3  trkChamber compt
-    2    -32.6    -36.6      908     0.122   0.0919     11.8      30.1  trkChamber compt
-    3    -27.9    -22.8      898     0.121  0.00099     17.5      47.6  trkChamber compt
-    4    -27.5    -22.2      898    0.0824   0.0388    0.842      48.4  trkChamber compt
-    5    -27.6    -22.4      898    0.0671   0.0153    0.201      48.6  trkChamber compt
-    6    -34.9    -5.21      895    0.0552   0.0119     18.8      67.4  trkChamber compt
-    7    -33.3     -6.7      894    0.0549 0.000262     2.75      70.2  trkChamber compt
-    8    -31.9    -8.07      891    0.0493  0.00564     3.19      73.4  trkChamber compt
-    9    -77.8   -0.511      867    0.0468  0.00245     52.4       126  trkChamber compt
-   10    -81.2    -12.5      841    0.0468   0.0468     28.6       154  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.67 cm     -3 cm   91.6 cm    511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.08 cm   -2.5 cm   90.9 cm    214 keV   297 keV  1.83 cm   1.83 cm trkChamber     compt
+    2  -3.26 cm  -3.66 cm   90.8 cm    122 keV  91.9 keV  1.18 cm   3.01 cm trkChamber     compt
+    3  -2.79 cm  -2.28 cm   89.8 cm    121 keV   990 eV   1.75 cm   4.76 cm trkChamber     compt
+    4  -2.75 cm  -2.22 cm   89.8 cm   82.4 keV  38.8 keV   842 mum  4.84 cm trkChamber     compt
+    5  -2.76 cm  -2.24 cm   89.8 cm   67.1 keV  15.3 keV   201 mum  4.86 cm trkChamber     compt
+    6  -3.49 cm  -5.21 mm   89.5 cm   55.2 keV  11.9 keV  1.88 cm   6.74 cm trkChamber     compt
+    7  -3.33 cm   -6.7 mm   89.4 cm   54.9 keV   262 eV   2.75 mm   7.02 cm trkChamber     compt
+    8  -3.19 cm  -8.07 mm   89.1 cm   49.3 keV  5.64 keV  3.19 mm   7.34 cm trkChamber     compt
+    9  -7.78 cm   -511 mum  86.7 cm   46.8 keV  2.45 keV  5.24 cm   12.6 cm trkChamber     compt
+   10  -8.12 cm  -1.25 cm   84.1 cm   46.8 keV  46.8 keV  2.86 cm   15.4 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 29,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -41.2    -25.5      917    0.0648        0        0         0  trkChamber initStep
-    1    -51.2    -27.3      933    0.0648   0.0648     19.4      19.4  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.12 cm  -2.55 cm   91.7 cm   64.8 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -5.12 cm  -2.73 cm   93.3 cm   64.8 keV  64.8 keV  1.94 cm   1.94 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -40.3    -20.9      910      4.01        0        0         0  trkChamber initStep
-    1    -50.8    -49.8      954     0.283        0     53.8      53.8  trkChamber compt
-    2      -69    -17.7      937      0.27   0.0123     40.6      94.3  trkChamber compt
-    3      -70    -8.33      930      0.15    0.121     11.7       106  trkChamber compt
-    4    -37.5    -11.8      959     0.135   0.0151     43.5       150  trkChamber compt
-    5     41.9    -32.9      945     0.101   0.0338     83.4       233  trkChamber compt
-    6     38.6    -33.1      976    0.0728   0.0282     31.4       264  trkChamber compt
-    7     38.5    -33.6      974    0.0579   0.0148     2.25       267  trkChamber compt
-    8     24.7    -32.8      995    0.0579   0.0579     25.5       292  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.03 cm  -2.09 cm     91 cm   4.01 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -5.08 cm  -4.98 cm   95.4 cm    283 keV     0 eV   5.38 cm   5.38 cm trkChamber     compt
+    2   -6.9 cm  -1.77 cm   93.7 cm    270 keV  12.3 keV  4.06 cm   9.43 cm trkChamber     compt
+    3     -7 cm  -8.33 mm     93 cm    150 keV   121 keV  1.17 cm   10.6 cm trkChamber     compt
+    4  -3.75 cm  -1.18 cm   95.9 cm    135 keV  15.1 keV  4.35 cm     15 cm trkChamber     compt
+    5   4.19 cm  -3.29 cm   94.5 cm    101 keV  33.8 keV  8.34 cm   23.3 cm trkChamber     compt
+    6   3.86 cm  -3.31 cm   97.6 cm   72.8 keV  28.2 keV  3.14 cm   26.4 cm trkChamber     compt
+    7   3.85 cm  -3.36 cm   97.4 cm   57.9 keV  14.8 keV  2.25 mm   26.7 cm trkChamber     compt
+    8   2.47 cm  -3.28 cm   99.5 cm   57.9 keV  57.9 keV  2.55 cm   29.2 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 32,   Parent ID = 28
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -50.8    -49.8      954      3.73        0        0         0  trkChamber initStep
-    1    -51.7    -50.5      956      3.05    0.676     2.07      2.07  trkChamber eIoni
-    2      -52    -51.3      956      2.72    0.319    0.887      2.96  trkChamber eBrem
-    3    -52.6    -52.2      957      1.97    0.747     1.57      4.53  trkChamber eIoni
-    4    -52.9    -53.1      958      1.49     0.48      1.2      5.73  trkChamber eIoni
-    5      -53    -53.9      957      1.14     0.35     0.96      6.69  trkChamber eIoni
-    6    -53.1    -54.5      958      0.85    0.289    0.783      7.47  trkChamber eIoni
-    7    -52.6    -54.7      958      0.64    0.211    0.635       8.1  trkChamber eIoni
-    8    -52.6    -54.5      958     0.462    0.178    0.524      8.63  trkChamber eIoni
-    9    -52.5    -54.3      958     0.322    0.083    0.192      8.82  trkChamber eBrem
-   10    -52.7    -54.3      958     0.144    0.177    0.337      9.16  trkChamber eIoni
-   11    -52.7    -54.3      958         0    0.144    0.129      9.28  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -5.08 cm  -4.98 cm   95.4 cm   3.73 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -5.17 cm  -5.05 cm   95.6 cm   3.05 MeV   676 keV  2.07 mm   2.07 mm trkChamber     eIoni
+    2   -5.2 cm  -5.13 cm   95.6 cm   2.72 MeV   319 keV   887 mum  2.96 mm trkChamber     eBrem
+    3  -5.26 cm  -5.22 cm   95.7 cm   1.97 MeV   747 keV  1.57 mm   4.53 mm trkChamber     eIoni
+    4  -5.29 cm  -5.31 cm   95.8 cm   1.49 MeV   480 keV   1.2 mm   5.73 mm trkChamber     eIoni
+    5   -5.3 cm  -5.39 cm   95.7 cm   1.14 MeV   350 keV   960 mum  6.69 mm trkChamber     eIoni
+    6  -5.31 cm  -5.45 cm   95.8 cm    850 keV   289 keV   783 mum  7.47 mm trkChamber     eIoni
+    7  -5.26 cm  -5.47 cm   95.8 cm    640 keV   211 keV   635 mum   8.1 mm trkChamber     eIoni
+    8  -5.26 cm  -5.45 cm   95.8 cm    462 keV   178 keV   524 mum  8.63 mm trkChamber     eIoni
+    9  -5.25 cm  -5.43 cm   95.8 cm    322 keV    83 keV   192 mum  8.82 mm trkChamber     eBrem
+   10  -5.27 cm  -5.43 cm   95.8 cm    144 keV   177 keV   337 mum  9.16 mm trkChamber     eIoni
+   11  -5.27 cm  -5.43 cm   95.8 cm      0 eV    144 keV   129 mum  9.28 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 32
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -52.5    -54.3      958    0.0572        0        0         0  trkChamber initStep
-    1    -66.5    -77.6      960    0.0516  0.00563     27.3      27.3  trkChamber compt
-    2    -64.5    -78.9      960    0.0451  0.00649     2.36      29.6  trkChamber compt
-    3    -63.9    -69.6      958    0.0451   0.0451     9.54      39.2  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -5.25 cm  -5.43 cm   95.8 cm   57.2 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -6.65 cm  -7.76 cm     96 cm   51.6 keV  5.63 keV  2.73 cm   2.73 cm trkChamber     compt
+    2  -6.45 cm  -7.89 cm     96 cm   45.1 keV  6.49 keV  2.36 mm   2.96 cm trkChamber     compt
+    3  -6.39 cm  -6.96 cm   95.8 cm   45.1 keV  45.1 keV  9.54 mm   3.92 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 32
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -52    -51.3      956    0.0144        0        0         0  trkChamber initStep
-    1    -52.4    -51.7      956    0.0144   0.0144    0.583     0.583  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -5.2 cm  -5.13 cm   95.6 cm   14.4 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -5.24 cm  -5.17 cm   95.6 cm   14.4 keV  14.4 keV   583 mum   583 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -40.1      -18      908     0.171        0        0         0  trkChamber initStep
-    1    -44.9      -58      946     0.108    0.063     55.7      55.7  trkChamber compt
-    2     20.3    -29.2      875     0.095   0.0128      101       156  trkChamber compt
-    3     41.1    -14.1      886     0.079    0.016     27.9       184  trkChamber compt
-    4     39.7    -12.8      886    0.0775   0.0015      1.9       186  trkChamber compt
-    5     13.7     14.6      873    0.0775   0.0775     39.9       226  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.01 cm   -1.8 cm   90.8 cm    171 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -4.49 cm   -5.8 cm   94.6 cm    108 keV    63 keV  5.57 cm   5.57 cm trkChamber     compt
+    2   2.03 cm  -2.92 cm   87.5 cm     95 keV  12.8 keV  10.1 cm   15.6 cm trkChamber     compt
+    3   4.11 cm  -1.41 cm   88.6 cm     79 keV    16 keV  2.79 cm   18.4 cm trkChamber     compt
+    4   3.97 cm  -1.28 cm   88.6 cm   77.5 keV   1.5 keV   1.9 mm   18.6 cm trkChamber     compt
+    5   1.37 cm   1.46 cm   87.3 cm   77.5 keV  77.5 keV  3.99 cm   22.6 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -40.1    -17.8      907    0.0606        0        0         0  trkChamber initStep
-    1    -41.7    -30.4      922    0.0606   0.0606     19.2      19.2  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.01 cm  -1.78 cm   90.7 cm   60.6 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -4.17 cm  -3.04 cm   92.2 cm   60.6 keV  60.6 keV  1.92 cm   1.92 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -38.5    -12.8      900   0.00985        0        0         0  trkChamber initStep
-    1    -38.5    -12.8      900   0.00985  0.00985   0.0116    0.0116  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.85 cm  -1.28 cm     90 cm   9.85 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.85 cm  -1.28 cm     90 cm   9.85 keV  9.85 keV  11.6 mum  11.6 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -37    -11.2      892      0.22        0        0         0  trkChamber initStep
-    1    -37.1    -11.4      893      0.18   0.0397    0.566     0.566  trkChamber compt
-    2    -29.7    -7.74      901      0.13   0.0504     11.4      11.9  trkChamber compt
-    3    -15.8    -55.2      902     0.125  0.00484     49.5      61.4  trkChamber compt
-    4    -14.2    -56.8      903    0.0913   0.0337     2.38      63.8  trkChamber compt
-    5    -6.95      -33      859    0.0703    0.021     50.7       115  trkChamber compt
-    6     -7.8    -38.1      860    0.0703   0.0703     5.39       120  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -3.7 cm  -1.12 cm   89.2 cm    220 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.71 cm  -1.14 cm   89.3 cm    180 keV  39.7 keV   566 mum   566 mumtrkChamber     compt
+    2  -2.97 cm  -7.74 mm   90.1 cm    130 keV  50.4 keV  1.14 cm   1.19 cm trkChamber     compt
+    3  -1.58 cm  -5.52 cm   90.2 cm    125 keV  4.84 keV  4.95 cm   6.14 cm trkChamber     compt
+    4  -1.42 cm  -5.68 cm   90.3 cm   91.3 keV  33.7 keV  2.38 mm   6.38 cm trkChamber     compt
+    5  -6.95 mm   -3.3 cm   85.9 cm   70.3 keV    21 keV  5.07 cm   11.5 cm trkChamber     compt
+    6   -7.8 mm  -3.81 cm     86 cm   70.3 keV  70.3 keV  5.39 mm     12 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.4    -10.7      887     0.447        0        0         0  trkChamber initStep
-    1    -25.9    -52.7 1.02e+03     0.367     0.08      137       137  trkChamber compt
-    2    -31.6    -62.2 1.02e+03     0.367        0     13.9       151     Tracker Transportation
-    3 -1.51e+03 -2.5e+03 3.21e+03     0.367        0 3.59e+03  3.74e+03     WorldPV Transportation
-    4 -2.39e+03 -3.94e+03  4.5e+03     0.367        0 2.12e+03  5.86e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.74 cm  -1.07 cm   88.7 cm    447 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.59 cm  -5.27 cm   1.02 m     367 keV    80 keV  13.7 cm   13.7 cm trkChamber     compt
+    2  -3.16 cm  -6.22 cm   1.02 m     367 keV     0 eV   1.39 cm   15.1 cm    TrackerTransportation
+    3  -1.51 m    -2.5 m    3.21 m     367 keV     0 eV   3.59 m    3.74 m     WorldPVTransportation
+    4  -2.39 m   -3.94 m     4.5 m     367 keV     0 eV   2.12 m    5.86 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.5    -10.2      884     0.514        0        0         0  trkChamber initStep
-    1    -35.4    -23.9      957      0.45   0.0637     73.6      73.6  trkChamber compt
-    2    -41.7    -15.9      983     0.248    0.203     28.3       102  trkChamber compt
-    3    -92.4    -3.47      972     0.127    0.121     53.6       155  trkChamber compt
-    4    -73.1    -8.37      971      0.11   0.0168       20       175  trkChamber compt
-    5    -65.2    -35.5      944    0.0773   0.0326     38.8       214  trkChamber compt
-    6    -71.9    -24.1      953    0.0752  0.00203     15.8       230  trkChamber compt
-    7    -73.8    -14.9      953    0.0663   0.0089     9.34       239  trkChamber compt
-    8     -127    -21.1      958    0.0657  0.00061       54       293  trkChamber compt
-    9     -132      -21      960    0.0597  0.00602     5.11       299  trkChamber compt
-   10     -132      -21      960    0.0568  0.00294   0.0386       299  trkChamber compt
-   11     -203    -45.9      973    0.0471   0.0097     76.4       375  trkChamber compt
-   12     -198    -44.5      975    0.0471   0.0471     5.79       381  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.75 cm  -1.02 cm   88.4 cm    514 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.54 cm  -2.39 cm   95.7 cm    450 keV  63.7 keV  7.36 cm   7.36 cm trkChamber     compt
+    2  -4.17 cm  -1.59 cm   98.3 cm    248 keV   203 keV  2.83 cm   10.2 cm trkChamber     compt
+    3  -9.24 cm  -3.47 mm   97.2 cm    127 keV   121 keV  5.36 cm   15.5 cm trkChamber     compt
+    4  -7.31 cm  -8.37 mm   97.1 cm    110 keV  16.8 keV     2 cm   17.5 cm trkChamber     compt
+    5  -6.52 cm  -3.55 cm   94.4 cm   77.3 keV  32.6 keV  3.88 cm   21.4 cm trkChamber     compt
+    6  -7.19 cm  -2.41 cm   95.3 cm   75.2 keV  2.03 keV  1.58 cm     23 cm trkChamber     compt
+    7  -7.38 cm  -1.49 cm   95.3 cm   66.3 keV   8.9 keV  9.34 mm   23.9 cm trkChamber     compt
+    8  -12.7 cm  -2.11 cm   95.8 cm   65.7 keV   610 eV    5.4 cm   29.3 cm trkChamber     compt
+    9  -13.2 cm   -2.1 cm     96 cm   59.7 keV  6.02 keV  5.11 mm   29.9 cm trkChamber     compt
+   10  -13.2 cm   -2.1 cm     96 cm   56.8 keV  2.94 keV  38.6 mum  29.9 cm trkChamber     compt
+   11  -20.3 cm  -4.59 cm   97.3 cm   47.1 keV   9.7 keV  7.64 cm   37.5 cm trkChamber     compt
+   12  -19.8 cm  -4.45 cm   97.5 cm   47.1 keV  47.1 keV  5.79 mm   38.1 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.2    -9.64      881     0.208        0        0         0  trkChamber initStep
-    1    -38.5    -14.5      917     0.142   0.0666     36.2      36.2  trkChamber compt
-    2    -39.3    -12.7      917     0.136  0.00591     1.94      38.2  trkChamber compt
-    3    -40.2  -0.0841      922     0.092   0.0436     13.7      51.9  trkChamber compt
-    4    -27.9    -16.4      921     0.072     0.02     20.4      72.3  trkChamber compt
-    5    -23.2    -3.22      923    0.0614   0.0106     14.1      86.4  trkChamber compt
-    6    -31.8    -7.52      941    0.0541  0.00725       20       106  trkChamber compt
-    7    -15.2    -4.46      947    0.0526  0.00149     18.1       125  trkChamber compt
-    8    -5.48     6.61      947    0.0438  0.00882     14.7       139  trkChamber compt
-    9    -17.5     -7.9      941    0.0438   0.0438     19.7       159  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.72 cm  -9.64 mm   88.1 cm    208 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.85 cm  -1.45 cm   91.7 cm    142 keV  66.6 keV  3.62 cm   3.62 cm trkChamber     compt
+    2  -3.93 cm  -1.27 cm   91.7 cm    136 keV  5.91 keV  1.94 mm   3.82 cm trkChamber     compt
+    3  -4.02 cm  -84.1 mum  92.2 cm     92 keV  43.6 keV  1.37 cm   5.19 cm trkChamber     compt
+    4  -2.79 cm  -1.64 cm   92.1 cm     72 keV    20 keV  2.04 cm   7.23 cm trkChamber     compt
+    5  -2.32 cm  -3.22 mm   92.3 cm   61.4 keV  10.6 keV  1.41 cm   8.64 cm trkChamber     compt
+    6  -3.18 cm  -7.52 mm   94.1 cm   54.1 keV  7.25 keV     2 cm   10.6 cm trkChamber     compt
+    7  -1.52 cm  -4.46 mm   94.7 cm   52.6 keV  1.49 keV  1.81 cm   12.5 cm trkChamber     compt
+    8  -5.48 mm   6.61 mm   94.7 cm   43.8 keV  8.82 keV  1.47 cm   13.9 cm trkChamber     compt
+    9  -1.75 cm   -7.9 mm   94.1 cm   43.8 keV  43.8 keV  1.97 cm   15.9 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 20,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -37    -9.28      878    0.0929        0        0         0  trkChamber initStep
-    1    -37.1    -9.33      878    0.0849  0.00798     0.41      0.41  trkChamber compt
-    2    -17.1    -5.64      894    0.0849   0.0849       26      26.5  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -3.7 cm  -9.28 mm   87.8 cm   92.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.71 cm  -9.33 mm   87.8 cm   84.9 keV  7.98 keV   410 mum   410 mumtrkChamber     compt
+    2  -1.71 cm  -5.64 mm   89.4 cm   84.9 keV  84.9 keV   2.6 cm   2.65 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.9    -7.48      865    0.0182        0        0         0  trkChamber initStep
-    1    -37.9    -7.48      865    0.0182   0.0182     0.13      0.13  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.79 cm  -7.48 mm   86.5 cm   18.2 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.79 cm  -7.48 mm   86.5 cm   18.2 keV  18.2 keV   130 mum   130 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.8    -7.39      862       114        0        0         0  trkChamber initStep
-    1    -35.2      -15      987         0        0      125       125  trkChamber conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.78 cm  -7.39 mm   86.2 cm    114 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.52 cm   -1.5 cm   98.7 cm      0 eV      0 eV   12.5 cm   12.5 cm trkChamber      conv
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e+,   Track ID = 36,   Parent ID = 18
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2      -15      987      64.7        0        0         0  trkChamber initStep
-    1    -35.6    -16.9    1e+03      57.9     6.35     17.3      17.3  trkChamber eBrem
-    2    -36.4    -17.3 1.01e+03      51.3     5.17     10.7      27.9  trkChamber eBrem
-    3    -36.5    -17.6 1.02e+03        49     2.31     6.08        34  trkChamber eBrem
-    4    -36.5    -17.7 1.02e+03      43.8     0.99     2.63      36.6  trkChamber eBrem
-    5    -36.4    -17.8 1.02e+03      43.3    0.561      1.7      38.3     Tracker Transportation
-    6    -36.2    -24.5 1.08e+03      43.3   0.0123     54.7        93     Tracker eIoni
-    7    -35.9    -33.8 1.15e+03      43.2   0.0109     75.1       168     Tracker eIoni
-    8    -35.9    -36.9 1.18e+03      43.2  0.00462     24.7       193     Tracker eIoni
-    9    -35.6    -42.2 1.22e+03      43.2  0.00785     43.8       237     Tracker eIoni
-   10    -34.4    -58.4 1.35e+03      43.2   0.0223      132       369     Tracker eIoni
-   11    -34.4    -59.4 1.36e+03      43.2  0.00136     7.86       377     Tracker eIoni
-   12    -33.7    -67.7 1.43e+03      43.2   0.0105     68.6       446     Tracker eIoni
-   13    -32.7    -75.3  1.5e+03      43.2   0.0129     66.6       512     Tracker eIoni
-   14    -32.6    -76.2  1.5e+03      43.1   0.0016     8.19       520     Tracker eIoni
-   15    -31.6      -86 1.59e+03      43.1   0.0145     84.9       605     Tracker eIoni
-   16    -31.2    -90.3 1.62e+03      43.1  0.00668     37.6       643  trkChamber Transportation
-   17    -31.2    -90.4 1.63e+03      42.7    0.359    0.953       644  trkChamber eBrem
-   18    -30.9    -92.3 1.63e+03      38.1     3.41     9.22       653  trkChamber eBrem
-   19    -30.3    -92.6 1.64e+03      33.1     3.02     7.34       660  trkChamber eIoni
-   20    -30.4    -92.9 1.64e+03        30    0.543     1.58       662  trkChamber eIoni
-   21    -30.4    -93.1 1.64e+03      29.5    0.456     1.19       663  trkChamber eBrem
-   22      -29      -98 1.66e+03      22.7     6.78     14.8       678  trkChamber eIoni
-   23    -28.1    -98.9 1.67e+03      18.5     4.13     10.3       688  trkChamber eBrem
-   24      -28    -98.9 1.67e+03      18.3   0.0551    0.173       688  trkChamber eBrem
-   25    -27.9    -98.9 1.67e+03      14.7    0.197    0.557       689  trkChamber eIoni
-   26    -25.2    -98.2 1.68e+03        12     2.72     7.57       696  trkChamber eIoni
-   27    -25.2      -98 1.68e+03      11.3    0.676     2.02       698  trkChamber eBrem
-   28    -25.5    -98.8 1.68e+03      8.73      2.6      5.9       704  trkChamber eIoni
-   29    -25.7    -98.8 1.68e+03      7.36    0.101    0.252       705  trkChamber eIoni
-   30      -28    -98.2 1.69e+03      6.03     1.34     3.94       709  trkChamber eIoni
-   31    -29.5    -98.3 1.69e+03       4.8     1.22     3.28       712  trkChamber eIoni
-   32    -31.7    -98.5 1.69e+03      3.94    0.862     2.66       714  trkChamber eIoni
-   33    -33.5    -98.7 1.69e+03       2.9     1.04     2.23       717  trkChamber eIoni
-   34      -35    -98.1 1.69e+03      1.83     1.07      1.7       718  trkChamber eIoni
-   35    -35.8    -98.8 1.69e+03      1.46    0.369     1.15       720  trkChamber eIoni
-   36      -36    -99.3 1.69e+03      1.16    0.304    0.956       720  trkChamber eIoni
-   37      -36    -99.9 1.69e+03     0.721    0.436    0.797       721  trkChamber eIoni
-   38    -36.1     -100 1.69e+03     0.505    0.216    0.567       722  trkChamber eIoni
-   39    -35.9     -100  1.7e+03     0.321    0.184    0.449       722  trkChamber eIoni
-   40    -35.8     -101  1.7e+03     0.151     0.17    0.332       723  trkChamber eIoni
-   41    -35.9     -101  1.7e+03         0    0.151    0.132       723  trkChamber eIoni
-   42    -35.9     -101  1.7e+03         0        0        0       723  trkChamber annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm   -1.5 cm   98.7 cm   64.7 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.56 cm  -1.69 cm      1 m    57.9 MeV  6.35 MeV  1.73 cm   1.73 cm trkChamber     eBrem
+    2  -3.64 cm  -1.73 cm   1.01 m    51.3 MeV  5.17 MeV  1.07 cm   2.79 cm trkChamber     eBrem
+    3  -3.65 cm  -1.76 cm   1.02 m      49 MeV  2.31 MeV  6.08 mm    3.4 cm trkChamber     eBrem
+    4  -3.65 cm  -1.77 cm   1.02 m    43.8 MeV   990 keV  2.63 mm   3.66 cm trkChamber     eBrem
+    5  -3.64 cm  -1.78 cm   1.02 m    43.3 MeV   561 keV   1.7 mm   3.83 cm    TrackerTransportation
+    6  -3.62 cm  -2.45 cm   1.08 m    43.3 MeV  12.3 keV  5.47 cm    9.3 cm    Tracker     eIoni
+    7  -3.59 cm  -3.38 cm   1.15 m    43.2 MeV  10.9 keV  7.51 cm   16.8 cm    Tracker     eIoni
+    8  -3.59 cm  -3.69 cm   1.18 m    43.2 MeV  4.62 keV  2.47 cm   19.3 cm    Tracker     eIoni
+    9  -3.56 cm  -4.22 cm   1.22 m    43.2 MeV  7.85 keV  4.38 cm   23.7 cm    Tracker     eIoni
+   10  -3.44 cm  -5.84 cm   1.35 m    43.2 MeV  22.3 keV  13.2 cm   36.9 cm    Tracker     eIoni
+   11  -3.44 cm  -5.94 cm   1.36 m    43.2 MeV  1.36 keV  7.86 mm   37.7 cm    Tracker     eIoni
+   12  -3.37 cm  -6.77 cm   1.43 m    43.2 MeV  10.5 keV  6.86 cm   44.6 cm    Tracker     eIoni
+   13  -3.27 cm  -7.53 cm    1.5 m    43.2 MeV  12.9 keV  6.66 cm   51.2 cm    Tracker     eIoni
+   14  -3.26 cm  -7.62 cm    1.5 m    43.1 MeV   1.6 keV  8.19 mm     52 cm    Tracker     eIoni
+   15  -3.16 cm   -8.6 cm   1.59 m    43.1 MeV  14.5 keV  8.49 cm   60.5 cm    Tracker     eIoni
+   16  -3.12 cm  -9.03 cm   1.62 m    43.1 MeV  6.68 keV  3.76 cm   64.3 cm trkChamberTransportation
+   17  -3.12 cm  -9.04 cm   1.63 m    42.7 MeV   359 keV   953 mum  64.4 cm trkChamber     eBrem
+   18  -3.09 cm  -9.23 cm   1.63 m    38.1 MeV  3.41 MeV  9.22 mm   65.3 cm trkChamber     eBrem
+   19  -3.03 cm  -9.26 cm   1.64 m    33.1 MeV  3.02 MeV  7.34 mm     66 cm trkChamber     eIoni
+   20  -3.04 cm  -9.29 cm   1.64 m      30 MeV   543 keV  1.58 mm   66.2 cm trkChamber     eIoni
+   21  -3.04 cm  -9.31 cm   1.64 m    29.5 MeV   456 keV  1.19 mm   66.3 cm trkChamber     eBrem
+   22   -2.9 cm   -9.8 cm   1.66 m    22.7 MeV  6.78 MeV  1.48 cm   67.8 cm trkChamber     eIoni
+   23  -2.81 cm  -9.89 cm   1.67 m    18.5 MeV  4.13 MeV  1.03 cm   68.8 cm trkChamber     eBrem
+   24   -2.8 cm  -9.89 cm   1.67 m    18.3 MeV  55.1 keV   173 mum  68.8 cm trkChamber     eBrem
+   25  -2.79 cm  -9.89 cm   1.67 m    14.7 MeV   197 keV   557 mum  68.9 cm trkChamber     eIoni
+   26  -2.52 cm  -9.82 cm   1.68 m      12 MeV  2.72 MeV  7.57 mm   69.6 cm trkChamber     eIoni
+   27  -2.52 cm   -9.8 cm   1.68 m    11.3 MeV   676 keV  2.02 mm   69.8 cm trkChamber     eBrem
+   28  -2.55 cm  -9.88 cm   1.68 m    8.73 MeV   2.6 MeV   5.9 mm   70.4 cm trkChamber     eIoni
+   29  -2.57 cm  -9.88 cm   1.68 m    7.36 MeV   101 keV   252 mum  70.5 cm trkChamber     eIoni
+   30   -2.8 cm  -9.82 cm   1.69 m    6.03 MeV  1.34 MeV  3.94 mm   70.9 cm trkChamber     eIoni
+   31  -2.95 cm  -9.83 cm   1.69 m     4.8 MeV  1.22 MeV  3.28 mm   71.2 cm trkChamber     eIoni
+   32  -3.17 cm  -9.85 cm   1.69 m    3.94 MeV   862 keV  2.66 mm   71.4 cm trkChamber     eIoni
+   33  -3.35 cm  -9.87 cm   1.69 m     2.9 MeV  1.04 MeV  2.23 mm   71.7 cm trkChamber     eIoni
+   34   -3.5 cm  -9.81 cm   1.69 m    1.83 MeV  1.07 MeV   1.7 mm   71.8 cm trkChamber     eIoni
+   35  -3.58 cm  -9.88 cm   1.69 m    1.46 MeV   369 keV  1.15 mm     72 cm trkChamber     eIoni
+   36   -3.6 cm  -9.93 cm   1.69 m    1.16 MeV   304 keV   956 mum    72 cm trkChamber     eIoni
+   37   -3.6 cm  -9.99 cm   1.69 m     721 keV   436 keV   797 mum  72.1 cm trkChamber     eIoni
+   38  -3.61 cm    -10 cm   1.69 m     505 keV   216 keV   567 mum  72.2 cm trkChamber     eIoni
+   39  -3.59 cm    -10 cm    1.7 m     321 keV   184 keV   449 mum  72.2 cm trkChamber     eIoni
+   40  -3.58 cm  -10.1 cm    1.7 m     151 keV   170 keV   332 mum  72.3 cm trkChamber     eIoni
+   41  -3.59 cm  -10.1 cm    1.7 m       0 eV    151 keV   132 mum  72.3 cm trkChamber     eIoni
+   42  -3.59 cm  -10.1 cm    1.7 m       0 eV      0 eV      0 fm   72.3 cm trkChamber   annihil
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.9     -101  1.7e+03     0.511        0        0         0  trkChamber initStep
-    1    -40.8     -100  1.7e+03     0.405    0.105     4.89      4.89  trkChamber compt
-    2    -47.5     -105 1.69e+03     0.181    0.224     8.75      13.6  trkChamber compt
-    3    -49.9    -81.8  1.7e+03      0.16   0.0215     25.9      39.5  trkChamber compt
-    4    -49.6      -71 1.75e+03     0.115    0.045     49.4        89  trkChamber compt
-    5    -47.6    -58.8 1.75e+03     0.115    0.115       14       103  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.59 cm  -10.1 cm    1.7 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -4.08 cm    -10 cm    1.7 m     405 keV   105 keV  4.89 mm   4.89 mm trkChamber     compt
+    2  -4.75 cm  -10.5 cm   1.69 m     181 keV   224 keV  8.75 mm   1.36 cm trkChamber     compt
+    3  -4.99 cm  -8.18 cm    1.7 m     160 keV  21.5 keV  2.59 cm   3.95 cm trkChamber     compt
+    4  -4.96 cm   -7.1 cm   1.75 m     115 keV    45 keV  4.94 cm    8.9 cm trkChamber     compt
+    5  -4.76 cm  -5.88 cm   1.75 m     115 keV   115 keV   1.4 cm   10.3 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.9     -101  1.7e+03     0.511        0        0         0  trkChamber initStep
-    1       29     -106  1.7e+03     0.469   0.0421     65.2      65.2  trkChamber compt
-    2      125     -154 1.72e+03      0.29    0.179      111       176  trkChamber compt
-    3      126     -165 1.72e+03     0.156    0.134     13.5       189  trkChamber compt
-    4      169     -134 1.73e+03     0.122   0.0338     53.6       243  trkChamber compt
-    5      168     -134 1.73e+03     0.083   0.0391     3.17       246  trkChamber compt
-    6      168     -134 1.72e+03      0.08  0.00305     12.7       259  trkChamber compt
-    7      168     -134 1.72e+03    0.0778  0.00214     0.17       259  trkChamber compt
-    8      168     -133 1.72e+03    0.0642   0.0137    0.746       260  trkChamber compt
-    9      168     -133 1.72e+03    0.0576  0.00654     1.03       261  trkChamber compt
-   10      158     -130 1.72e+03    0.0558  0.00178     11.1       272  trkChamber compt
-   11      152     -133 1.72e+03    0.0465  0.00929      6.8       279  trkChamber compt
-   12      164     -132 1.72e+03    0.0416  0.00498     13.3       292  trkChamber compt
-   13      164     -130 1.72e+03    0.0416   0.0416     2.63       295  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.59 cm  -10.1 cm    1.7 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1    2.9 cm  -10.6 cm    1.7 m     469 keV  42.1 keV  6.52 cm   6.52 cm trkChamber     compt
+    2   12.5 cm  -15.4 cm   1.72 m     290 keV   179 keV  11.1 cm   17.6 cm trkChamber     compt
+    3   12.6 cm  -16.5 cm   1.72 m     156 keV   134 keV  1.35 cm   18.9 cm trkChamber     compt
+    4   16.9 cm  -13.4 cm   1.73 m     122 keV  33.8 keV  5.36 cm   24.3 cm trkChamber     compt
+    5   16.8 cm  -13.4 cm   1.73 m      83 keV  39.1 keV  3.17 mm   24.6 cm trkChamber     compt
+    6   16.8 cm  -13.4 cm   1.72 m      80 keV  3.05 keV  1.27 cm   25.9 cm trkChamber     compt
+    7   16.8 cm  -13.4 cm   1.72 m    77.8 keV  2.14 keV   170 mum  25.9 cm trkChamber     compt
+    8   16.8 cm  -13.3 cm   1.72 m    64.2 keV  13.7 keV   746 mum    26 cm trkChamber     compt
+    9   16.8 cm  -13.3 cm   1.72 m    57.6 keV  6.54 keV  1.03 mm   26.1 cm trkChamber     compt
+   10   15.8 cm    -13 cm   1.72 m    55.8 keV  1.78 keV  1.11 cm   27.2 cm trkChamber     compt
+   11   15.2 cm  -13.3 cm   1.72 m    46.5 keV  9.29 keV   6.8 mm   27.9 cm trkChamber     compt
+   12   16.4 cm  -13.2 cm   1.72 m    41.6 keV  4.98 keV  1.33 cm   29.2 cm trkChamber     compt
+   13   16.4 cm    -13 cm   1.72 m    41.6 keV  41.6 keV  2.63 mm   29.5 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 60,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -25.7    -98.8 1.68e+03      1.27        0        0         0  trkChamber initStep
-    1      -26    -98.1 1.69e+03     0.864    0.402    0.847     0.847  trkChamber eIoni
-    2    -26.3    -98.1 1.69e+03     0.614     0.25    0.642      1.49  trkChamber eIoni
-    3    -26.2      -98 1.69e+03     0.378    0.236     0.51         2  trkChamber eIoni
-    4    -26.4    -97.8 1.69e+03     0.228    0.149    0.375      2.37  trkChamber eIoni
-    5    -26.5    -97.9 1.69e+03    0.0573    0.171    0.252      2.63  trkChamber eIoni
-    6    -26.5    -97.9 1.69e+03         0   0.0573   0.0296      2.66  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.57 cm  -9.88 cm   1.68 m    1.27 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -2.6 cm  -9.81 cm   1.69 m     864 keV   402 keV   847 mum   847 mumtrkChamber     eIoni
+    2  -2.63 cm  -9.81 cm   1.69 m     614 keV   250 keV   642 mum  1.49 mm trkChamber     eIoni
+    3  -2.62 cm   -9.8 cm   1.69 m     378 keV   236 keV   510 mum     2 mm trkChamber     eIoni
+    4  -2.64 cm  -9.78 cm   1.69 m     228 keV   149 keV   375 mum  2.37 mm trkChamber     eIoni
+    5  -2.65 cm  -9.79 cm   1.69 m    57.3 keV   171 keV   252 mum  2.63 mm trkChamber     eIoni
+    6  -2.65 cm  -9.79 cm   1.69 m       0 eV   57.3 keV  29.6 mum  2.66 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 59,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -25.2      -98 1.68e+03     0.013        0        0         0  trkChamber initStep
-    1    -25.1      -98 1.68e+03     0.013    0.013    0.528     0.528  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.52 cm   -9.8 cm   1.68 m      13 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.51 cm   -9.8 cm   1.68 m      13 keV    13 keV   528 mum   528 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -27.9    -98.9 1.67e+03       3.4        0        0         0  trkChamber initStep
-    1    -26.8    -99.4 1.67e+03      2.75    0.649     1.91      1.91  trkChamber eIoni
-    2    -26.6     -100 1.67e+03       2.1    0.657     1.59       3.5  trkChamber eIoni
-    3    -27.3     -100 1.67e+03      1.62    0.481     1.26      4.76  trkChamber eIoni
-    4    -27.2    -99.4 1.67e+03     0.817    0.799     1.02      5.78  trkChamber eIoni
-    5    -27.6    -99.1 1.67e+03     0.613    0.204    0.617       6.4  trkChamber eIoni
-    6    -27.3      -99 1.67e+03     0.344    0.269    0.509      6.91  trkChamber eIoni
-    7    -27.1    -99.1 1.67e+03     0.114     0.23    0.352      7.26  trkChamber eIoni
-    8    -27.1    -99.1 1.67e+03         0    0.114   0.0882      7.35  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.79 cm  -9.89 cm   1.67 m     3.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.68 cm  -9.94 cm   1.67 m    2.75 MeV   649 keV  1.91 mm   1.91 mm trkChamber     eIoni
+    2  -2.66 cm    -10 cm   1.67 m     2.1 MeV   657 keV  1.59 mm    3.5 mm trkChamber     eIoni
+    3  -2.73 cm    -10 cm   1.67 m    1.62 MeV   481 keV  1.26 mm   4.76 mm trkChamber     eIoni
+    4  -2.72 cm  -9.94 cm   1.67 m     817 keV   799 keV  1.02 mm   5.78 mm trkChamber     eIoni
+    5  -2.76 cm  -9.91 cm   1.67 m     613 keV   204 keV   617 mum   6.4 mm trkChamber     eIoni
+    6  -2.73 cm   -9.9 cm   1.67 m     344 keV   269 keV   509 mum  6.91 mm trkChamber     eIoni
+    7  -2.71 cm  -9.91 cm   1.67 m     114 keV   230 keV   352 mum  7.26 mm trkChamber     eIoni
+    8  -2.71 cm  -9.91 cm   1.67 m       0 eV    114 keV  88.2 mum  7.35 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 57,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -28    -98.9 1.67e+03    0.0803        0        0         0  trkChamber initStep
-    1    -26.3    -99.3 1.68e+03    0.0655   0.0147     6.67      6.67  trkChamber compt
-    2    -23.4    -87.6 1.67e+03    0.0621  0.00338     13.5      20.2  trkChamber compt
-    3    -19.2    -86.3 1.67e+03    0.0564  0.00571     4.52      24.7  trkChamber compt
-    4    -15.3    -95.7 1.66e+03    0.0526  0.00378     11.1      35.7  trkChamber compt
-    5    -15.4    -96.8 1.67e+03    0.0508  0.00186     1.47      37.2  trkChamber compt
-    6    -27.5     -102 1.67e+03    0.0508   0.0508     14.9      52.1  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.8 cm  -9.89 cm   1.67 m    80.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.63 cm  -9.93 cm   1.68 m    65.5 keV  14.7 keV  6.67 mm   6.67 mm trkChamber     compt
+    2  -2.34 cm  -8.76 cm   1.67 m    62.1 keV  3.38 keV  1.35 cm   2.02 cm trkChamber     compt
+    3  -1.92 cm  -8.63 cm   1.67 m    56.4 keV  5.71 keV  4.52 mm   2.47 cm trkChamber     compt
+    4  -1.53 cm  -9.57 cm   1.66 m    52.6 keV  3.78 keV  1.11 cm   3.57 cm trkChamber     compt
+    5  -1.54 cm  -9.68 cm   1.67 m    50.8 keV  1.86 keV  1.47 mm   3.72 cm trkChamber     compt
+    6  -2.75 cm  -10.2 cm   1.67 m    50.8 keV  50.8 keV  1.49 cm   5.21 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -28.1    -98.9 1.67e+03    0.0929        0        0         0  trkChamber initStep
-    1    -24.7    -99.7 1.68e+03    0.0742   0.0187       15        15  trkChamber compt
-    2    -32.5    -98.3 1.68e+03    0.0742   0.0742     8.03        23  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.81 cm  -9.89 cm   1.67 m    92.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.47 cm  -9.97 cm   1.68 m    74.2 keV  18.7 keV   1.5 cm    1.5 cm trkChamber     compt
+    2  -3.25 cm  -9.83 cm   1.68 m    74.2 keV  74.2 keV  8.03 mm    2.3 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.4    -93.1 1.64e+03    0.0553        0        0         0  trkChamber initStep
-    1    -30.4    -94.2 1.65e+03    0.0553   0.0553     4.35      4.35  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.04 cm  -9.31 cm   1.64 m    55.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.04 cm  -9.42 cm   1.65 m    55.3 keV  55.3 keV  4.35 mm   4.35 mm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 54,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.4    -92.9 1.64e+03       2.6        0        0         0  trkChamber initStep
-    1    -30.6    -93.1 1.65e+03      1.76    0.834     1.51      1.51  trkChamber eIoni
-    2    -30.6    -93.1 1.65e+03      1.71  0.00588   0.0263      1.54  trkChamber eBrem
-    3    -30.9    -92.6 1.65e+03      1.32    0.385     1.07      2.61  trkChamber eIoni
-    4    -30.3    -92.4 1.65e+03     0.484    0.838    0.876      3.48  trkChamber eIoni
-    5      -30    -92.4 1.65e+03     0.336    0.149    0.439      3.92  trkChamber eIoni
-    6    -29.8    -92.5 1.65e+03     0.184    0.152    0.347      4.27  trkChamber eIoni
-    7    -29.8    -92.5 1.65e+03         0    0.184    0.189      4.46  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.04 cm  -9.29 cm   1.64 m     2.6 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.06 cm  -9.31 cm   1.65 m    1.76 MeV   834 keV  1.51 mm   1.51 mm trkChamber     eIoni
+    2  -3.06 cm  -9.31 cm   1.65 m    1.71 MeV  5.88 keV  26.3 mum  1.54 mm trkChamber     eBrem
+    3  -3.09 cm  -9.26 cm   1.65 m    1.32 MeV   385 keV  1.07 mm   2.61 mm trkChamber     eIoni
+    4  -3.03 cm  -9.24 cm   1.65 m     484 keV   838 keV   876 mum  3.48 mm trkChamber     eIoni
+    5     -3 cm  -9.24 cm   1.65 m     336 keV   149 keV   439 mum  3.92 mm trkChamber     eIoni
+    6  -2.98 cm  -9.25 cm   1.65 m     184 keV   152 keV   347 mum  4.27 mm trkChamber     eIoni
+    7  -2.98 cm  -9.25 cm   1.65 m       0 eV    184 keV   189 mum  4.46 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 54
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.6    -93.1 1.65e+03    0.0475        0        0         0  trkChamber initStep
-    1    -34.4    -86.8 1.68e+03    0.0475   0.0475     37.2      37.2  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.06 cm  -9.31 cm   1.65 m    47.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.44 cm  -8.68 cm   1.68 m    47.5 keV  47.5 keV  3.72 cm   3.72 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 53,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.3    -92.6 1.64e+03       1.9        0        0         0  trkChamber initStep
-    1    -30.1    -92.7 1.64e+03      1.54    0.362     1.17      1.17  trkChamber eIoni
-    2    -30.8    -93.1 1.64e+03       1.2    0.344    0.986      2.15  trkChamber eIoni
-    3    -30.1    -93.5 1.64e+03     0.854    0.343    0.812      2.97  trkChamber eIoni
-    4    -29.8    -93.9 1.64e+03     0.636    0.218    0.636       3.6  trkChamber eIoni
-    5    -29.7    -93.7 1.64e+03     0.346     0.29    0.522      4.12  trkChamber eIoni
-    6    -29.9    -93.6 1.64e+03     0.189    0.157    0.354      4.48  trkChamber eIoni
-    7    -29.9    -93.6 1.64e+03         0    0.189    0.198      4.68  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.03 cm  -9.26 cm   1.64 m     1.9 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.01 cm  -9.27 cm   1.64 m    1.54 MeV   362 keV  1.17 mm   1.17 mm trkChamber     eIoni
+    2  -3.08 cm  -9.31 cm   1.64 m     1.2 MeV   344 keV   986 mum  2.15 mm trkChamber     eIoni
+    3  -3.01 cm  -9.35 cm   1.64 m     854 keV   343 keV   812 mum  2.97 mm trkChamber     eIoni
+    4  -2.98 cm  -9.39 cm   1.64 m     636 keV   218 keV   636 mum   3.6 mm trkChamber     eIoni
+    5  -2.97 cm  -9.37 cm   1.64 m     346 keV   290 keV   522 mum  4.12 mm trkChamber     eIoni
+    6  -2.99 cm  -9.36 cm   1.64 m     189 keV   157 keV   354 mum  4.48 mm trkChamber     eIoni
+    7  -2.99 cm  -9.36 cm   1.64 m       0 eV    189 keV   198 mum  4.68 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.9    -92.3 1.63e+03       1.2        0        0         0  trkChamber initStep
-    1    -30.4    -93.8 1.66e+03      1.19   0.0175     20.3      20.3  trkChamber compt
-    2    -13.5    -95.5  1.8e+03     0.252    0.933      143       163  trkChamber compt
-    3    -5.53    -85.1 1.79e+03     0.164    0.088     17.2       180  trkChamber compt
-    4    -11.4    -84.4 1.78e+03     0.127   0.0378      6.5       187  trkChamber compt
-    5    -11.7    -77.6 1.78e+03    0.0892   0.0374     6.86       194  trkChamber compt
-    6      -10    -82.9 1.78e+03    0.0784   0.0108     9.09       203  trkChamber compt
-    7      1.2    -85.8 1.78e+03    0.0635   0.0148     11.7       215  trkChamber compt
-    8    -11.3      -77  1.8e+03    0.0588  0.00475       23       238  trkChamber compt
-    9    -9.37    -83.5 1.81e+03    0.0588   0.0588     12.6       250  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.09 cm  -9.23 cm   1.63 m     1.2 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.04 cm  -9.38 cm   1.66 m    1.19 MeV  17.5 keV  2.03 cm   2.03 cm trkChamber     compt
+    2  -1.35 cm  -9.55 cm    1.8 m     252 keV   933 keV  14.3 cm   16.3 cm trkChamber     compt
+    3  -5.53 mm  -8.51 cm   1.79 m     164 keV    88 keV  1.72 cm     18 cm trkChamber     compt
+    4  -1.14 cm  -8.44 cm   1.78 m     127 keV  37.8 keV   6.5 mm   18.7 cm trkChamber     compt
+    5  -1.17 cm  -7.76 cm   1.78 m    89.2 keV  37.4 keV  6.86 mm   19.4 cm trkChamber     compt
+    6     -1 cm  -8.29 cm   1.78 m    78.4 keV  10.8 keV  9.09 mm   20.3 cm trkChamber     compt
+    7    1.2 mm  -8.58 cm   1.78 m    63.5 keV  14.8 keV  1.17 cm   21.5 cm trkChamber     compt
+    8  -1.13 cm   -7.7 cm    1.8 m    58.8 keV  4.75 keV   2.3 cm   23.8 cm trkChamber     compt
+    9  -9.37 mm  -8.35 cm   1.81 m    58.8 keV  58.8 keV  1.26 cm     25 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -31.2    -90.4 1.63e+03     0.101        0        0         0  trkChamber initStep
-    1    -31.1    -95.7 1.66e+03    0.0961   0.0048     38.7      38.7  trkChamber compt
-    2    -19.6    -95.9 1.68e+03    0.0717   0.0244     17.3        56  trkChamber compt
-    3    -36.1    -83.9 1.67e+03    0.0602   0.0115     22.5      78.5  trkChamber compt
-    4      -34      -92 1.66e+03    0.0581  0.00205     9.94      88.4  trkChamber compt
-    5    -33.7    -92.6 1.66e+03    0.0579 0.000221      2.9      91.3  trkChamber compt
-    6    -36.4    -94.4 1.64e+03    0.0575 0.000391     21.7       113  trkChamber compt
-    7    -39.5    -92.9 1.63e+03    0.0551  0.00245     8.84       122  trkChamber compt
-    8      -37    -87.9 1.62e+03    0.0551        0      7.5       129     Tracker Transportation
-    9      784 1.49e+03       25    0.0551        0 2.39e+03  2.52e+03     WorldPV Transportation
-   10 2.34e+03  4.5e+03 -3.02e+03    0.0551        0 4.55e+03  7.08e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.12 cm  -9.04 cm   1.63 m     101 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.11 cm  -9.57 cm   1.66 m    96.1 keV   4.8 keV  3.87 cm   3.87 cm trkChamber     compt
+    2  -1.96 cm  -9.59 cm   1.68 m    71.7 keV  24.4 keV  1.73 cm    5.6 cm trkChamber     compt
+    3  -3.61 cm  -8.39 cm   1.67 m    60.2 keV  11.5 keV  2.25 cm   7.85 cm trkChamber     compt
+    4   -3.4 cm   -9.2 cm   1.66 m    58.1 keV  2.05 keV  9.94 mm   8.84 cm trkChamber     compt
+    5  -3.37 cm  -9.26 cm   1.66 m    57.9 keV   221 eV    2.9 mm   9.13 cm trkChamber     compt
+    6  -3.64 cm  -9.44 cm   1.64 m    57.5 keV   391 eV   2.17 cm   11.3 cm trkChamber     compt
+    7  -3.95 cm  -9.29 cm   1.63 m    55.1 keV  2.45 keV  8.84 mm   12.2 cm trkChamber     compt
+    8   -3.7 cm  -8.79 cm   1.62 m    55.1 keV     0 eV    7.5 mm   12.9 cm    TrackerTransportation
+    9   78.4 cm   1.49 m     2.5 cm   55.1 keV     0 eV   2.39 m    2.52 m     WorldPVTransportation
+   10   2.34 m     4.5 m   -3.02 m    55.1 keV     0 eV   4.55 m    7.08 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 50,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -31.6      -86 1.59e+03  0.000991        0        0         0     Tracker initStep
-    1    -31.5      -86 1.59e+03         0 0.000991    0.884     0.884     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.16 cm   -8.6 cm   1.59 m     991 eV      0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.15 cm   -8.6 cm   1.59 m       0 eV    991 eV    884 mum   884 mum   Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -32.6    -76.2  1.5e+03   0.00268        0        0         0     Tracker initStep
-    1    -32.5    -76.1  1.5e+03  0.000528  0.00215     1.26      1.26     Tracker eIoni
-    2    -32.5    -76.1  1.5e+03         0 0.000528    0.605      1.87     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.26 cm  -7.62 cm    1.5 m    2.68 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.25 cm  -7.61 cm    1.5 m     528 eV   2.15 keV  1.26 mm   1.26 mm    Tracker     eIoni
+    2  -3.25 cm  -7.61 cm    1.5 m       0 eV    528 eV    605 mum  1.87 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 48,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -32.7    -75.3  1.5e+03   0.00121        0        0         0     Tracker initStep
-    1    -32.7    -75.3  1.5e+03    0.0011 0.000116    0.948     0.948     Tracker eIoni
-    2    -32.7    -75.3 1.49e+03   0.00073 0.000367    0.916      1.86     Tracker eIoni
-    3    -32.7    -75.3 1.49e+03         0  0.00073    0.728      2.59     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.27 cm  -7.53 cm    1.5 m    1.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.27 cm  -7.53 cm    1.5 m     1.1 keV   116 eV    948 mum   948 mum   Tracker     eIoni
+    2  -3.27 cm  -7.53 cm   1.49 m     730 eV    367 eV    916 mum  1.86 mm    Tracker     eIoni
+    3  -3.27 cm  -7.53 cm   1.49 m       0 eV    730 eV    728 mum  2.59 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 47,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -33.7    -67.7 1.43e+03   0.00112        0        0         0     Tracker initStep
-    1    -33.8    -67.7 1.43e+03  0.000869  0.00025    0.922     0.922     Tracker eIoni
-    2    -33.8    -67.7 1.43e+03         0 0.000869    0.811      1.73     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.37 cm  -6.77 cm   1.43 m    1.12 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.38 cm  -6.77 cm   1.43 m     869 eV    250 eV    922 mum   922 mum   Tracker     eIoni
+    2  -3.38 cm  -6.77 cm   1.43 m       0 eV    869 eV    811 mum  1.73 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 46,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.4    -59.4 1.36e+03   0.00159        0        0         0     Tracker initStep
-    1    -34.3    -59.5 1.36e+03   0.00114 0.000449     1.04      1.04     Tracker eIoni
-    2    -34.3    -59.4 1.36e+03   0.00107 6.52e-05    0.928      1.97     Tracker eIoni
-    3    -34.4    -59.5 1.36e+03  0.000944  0.00013    0.909      2.88     Tracker eIoni
-    4    -34.4    -59.5 1.36e+03         0 0.000944    0.855      3.73     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.44 cm  -5.94 cm   1.36 m    1.59 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.43 cm  -5.95 cm   1.36 m    1.14 keV   449 eV   1.04 mm   1.04 mm    Tracker     eIoni
+    2  -3.43 cm  -5.94 cm   1.36 m    1.07 keV  65.2 eV    928 mum  1.97 mm    Tracker     eIoni
+    3  -3.44 cm  -5.95 cm   1.36 m     944 eV    130 eV    909 mum  2.88 mm    Tracker     eIoni
+    4  -3.44 cm  -5.95 cm   1.36 m       0 eV    944 eV    855 mum  3.73 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 45,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.4    -58.4 1.35e+03   0.00473        0        0         0     Tracker initStep
-    1    -34.6    -58.9 1.35e+03   0.00297  0.00176     1.57      1.57     Tracker eIoni
-    2    -34.7    -58.7 1.35e+03   0.00169  0.00128    0.795      2.37     Tracker eIoni
-    3    -34.7    -58.7 1.35e+03  0.000412  0.00128     1.06      3.43     Tracker eIoni
-    4    -34.7    -58.7 1.35e+03         0 0.000412    0.532      3.97     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.44 cm  -5.84 cm   1.35 m    4.73 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.46 cm  -5.89 cm   1.35 m    2.97 keV  1.76 keV  1.57 mm   1.57 mm    Tracker     eIoni
+    2  -3.47 cm  -5.87 cm   1.35 m    1.69 keV  1.28 keV   795 mum  2.37 mm    Tracker     eIoni
+    3  -3.47 cm  -5.87 cm   1.35 m     412 eV   1.28 keV  1.06 mm   3.43 mm    Tracker     eIoni
+    4  -3.47 cm  -5.87 cm   1.35 m       0 eV    412 eV    532 mum  3.97 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 44,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.6    -42.2 1.22e+03   0.00133        0        0         0     Tracker initStep
-    1    -35.7    -42.3 1.22e+03   0.00111 0.000218    0.977     0.977     Tracker eIoni
-    2    -35.6    -42.3 1.22e+03  0.000583 0.000523    0.919       1.9     Tracker eIoni
-    3    -35.6    -42.3 1.22e+03         0 0.000583    0.639      2.54     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.56 cm  -4.22 cm   1.22 m    1.33 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.57 cm  -4.23 cm   1.22 m    1.11 keV   218 eV    977 mum   977 mum   Tracker     eIoni
+    2  -3.56 cm  -4.23 cm   1.22 m     583 eV    523 eV    919 mum   1.9 mm    Tracker     eIoni
+    3  -3.56 cm  -4.23 cm   1.22 m       0 eV    583 eV    639 mum  2.54 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 43,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.9    -36.9 1.18e+03   0.00141        0        0         0     Tracker initStep
-    1    -36.1    -36.9 1.18e+03   0.00133  7.4e-05    0.998     0.998     Tracker eIoni
-    2      -36      -37 1.18e+03  0.000546 0.000785    0.979      1.98     Tracker eIoni
-    3      -36      -37 1.18e+03         0 0.000546    0.616      2.59     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.59 cm  -3.69 cm   1.18 m    1.41 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.61 cm  -3.69 cm   1.18 m    1.33 keV    74 eV    998 mum   998 mum   Tracker     eIoni
+    2   -3.6 cm   -3.7 cm   1.18 m     546 eV    785 eV    979 mum  1.98 mm    Tracker     eIoni
+    3   -3.6 cm   -3.7 cm   1.18 m       0 eV    546 eV    616 mum  2.59 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 42,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.9    -33.8 1.15e+03    0.0186        0        0         0     Tracker initStep
-    1    -35.4      -36 1.15e+03    0.0143  0.00431     3.22      3.22     Tracker eIoni
-    2    -34.5    -34.2 1.15e+03   0.00962  0.00464     2.62      5.83     Tracker eIoni
-    3    -34.3    -33.7 1.15e+03   0.00531  0.00299    0.723      6.56     Tracker eIoni
-    4    -34.2      -34 1.15e+03   0.00286  0.00111    0.663      7.22     Tracker eIoni
-    5      -34    -34.2 1.15e+03   0.00181  0.00105    0.759      7.98     Tracker eIoni
-    6    -33.9    -34.3 1.15e+03   0.00122 0.000589     1.09      9.07     Tracker eIoni
-    7    -33.8    -34.4 1.15e+03  0.000745 0.000476     0.95        10     Tracker eIoni
-    8    -33.8    -34.4 1.15e+03         0 0.000745    0.737      10.8     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.59 cm  -3.38 cm   1.15 m    18.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.54 cm   -3.6 cm   1.15 m    14.3 keV  4.31 keV  3.22 mm   3.22 mm    Tracker     eIoni
+    2  -3.45 cm  -3.42 cm   1.15 m    9.62 keV  4.64 keV  2.62 mm   5.83 mm    Tracker     eIoni
+    3  -3.43 cm  -3.37 cm   1.15 m    5.31 keV  2.99 keV   723 mum  6.56 mm    Tracker     eIoni
+    4  -3.42 cm   -3.4 cm   1.15 m    2.86 keV  1.11 keV   663 mum  7.22 mm    Tracker     eIoni
+    5   -3.4 cm  -3.42 cm   1.15 m    1.81 keV  1.05 keV   759 mum  7.98 mm    Tracker     eIoni
+    6  -3.39 cm  -3.43 cm   1.15 m    1.22 keV   589 eV   1.09 mm   9.07 mm    Tracker     eIoni
+    7  -3.38 cm  -3.44 cm   1.15 m     745 eV    476 eV    950 mum     1 cm    Tracker     eIoni
+    8  -3.38 cm  -3.44 cm   1.15 m       0 eV    745 eV    737 mum  1.08 cm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 42
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.2      -34 1.15e+03   0.00134        0        0         0     Tracker initStep
-    1    -34.3      -34 1.15e+03   0.00117 0.000177    0.982     0.982     Tracker eIoni
-    2    -34.2      -34 1.15e+03   0.00103 0.000136    0.935      1.92     Tracker eIoni
-    3    -34.3      -34 1.15e+03  0.000282 0.000747    0.897      2.81     Tracker eIoni
-    4    -34.3      -34 1.15e+03         0 0.000282    0.445      3.26     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.42 cm   -3.4 cm   1.15 m    1.34 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.43 cm   -3.4 cm   1.15 m    1.17 keV   177 eV    982 mum   982 mum   Tracker     eIoni
+    2  -3.42 cm   -3.4 cm   1.15 m    1.03 keV   136 eV    935 mum  1.92 mm    Tracker     eIoni
+    3  -3.43 cm   -3.4 cm   1.15 m     282 eV    747 eV    897 mum  2.81 mm    Tracker     eIoni
+    4  -3.43 cm   -3.4 cm   1.15 m       0 eV    282 eV    445 mum  3.26 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 64,   Parent ID = 42
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.3    -33.7 1.15e+03   0.00132        0        0         0     Tracker initStep
-    1    -34.4    -33.7 1.15e+03  0.000481 0.000837    0.975     0.975     Tracker eIoni
-    2    -34.4    -33.7 1.15e+03         0 0.000481    0.576      1.55     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.43 cm  -3.37 cm   1.15 m    1.32 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.44 cm  -3.37 cm   1.15 m     481 eV    837 eV    975 mum   975 mum   Tracker     eIoni
+    2  -3.44 cm  -3.37 cm   1.15 m       0 eV    481 eV    576 mum  1.55 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 41,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -36.2    -24.5 1.08e+03   0.00264        0        0         0     Tracker initStep
-    1    -36.4    -24.4 1.08e+03   0.00176 0.000882     1.25      1.25     Tracker eIoni
-    2    -36.4    -24.4 1.08e+03  0.000378  0.00138     1.08      2.33     Tracker eIoni
-    3    -36.4    -24.4 1.08e+03         0 0.000378     0.51      2.84     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.62 cm  -2.45 cm   1.08 m    2.64 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.64 cm  -2.44 cm   1.08 m    1.76 keV   882 eV   1.25 mm   1.25 mm    Tracker     eIoni
+    2  -3.64 cm  -2.44 cm   1.08 m     378 eV   1.38 keV  1.08 mm   2.33 mm    Tracker     eIoni
+    3  -3.64 cm  -2.44 cm   1.08 m       0 eV    378 eV    510 mum  2.84 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 40,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -36.5    -17.7 1.02e+03      4.19        0        0         0  trkChamber initStep
-    1    -36.4    -17.8 1.02e+03      4.19        0      1.7       1.7     Tracker Transportation
-    2   -0.878    -74.6 1.62e+03      4.19        0      604       605  trkChamber Transportation
-    3     3.95    -82.3 1.71e+03       4.1   0.0931     82.1       687  trkChamber compt
-    4     7.92    -97.5  1.8e+03      3.42     0.68     91.3       779  trkChamber compt
-    5     10.6    -98.3 1.81e+03     0.557        0     10.6       789  trkChamber compt
-    6     33.5    -28.3 1.82e+03     0.557        0     75.9       865     Tracker Transportation
-    7      863  2.5e+03 2.49e+03     0.557        0 2.74e+03  3.61e+03     WorldPV Transportation
-    8 1.52e+03  4.5e+03 3.01e+03     0.557        0 2.17e+03  5.78e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.65 cm  -1.77 cm   1.02 m    4.19 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.64 cm  -1.78 cm   1.02 m    4.19 MeV     0 eV    1.7 mm    1.7 mm    TrackerTransportation
+    2   -878 mum -7.46 cm   1.62 m    4.19 MeV     0 eV   60.4 cm   60.5 cm trkChamberTransportation
+    3   3.95 mm  -8.23 cm   1.71 m     4.1 MeV  93.1 keV  8.21 cm   68.7 cm trkChamber     compt
+    4   7.92 mm  -9.75 cm    1.8 m    3.42 MeV   680 keV  9.13 cm   77.9 cm trkChamber     compt
+    5   1.06 cm  -9.83 cm   1.81 m     557 keV     0 eV   1.06 cm   78.9 cm trkChamber     compt
+    6   3.35 cm  -2.83 cm   1.82 m     557 keV     0 eV   7.59 cm   86.5 cm    TrackerTransportation
+    7   86.3 cm    2.5 m    2.49 m     557 keV     0 eV   2.74 m    3.61 m     WorldPVTransportation
+    8   1.52 m     4.5 m    3.01 m     557 keV     0 eV   2.17 m    5.78 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 66,   Parent ID = 40
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     10.6    -98.3 1.81e+03      2.86        0        0         0  trkChamber initStep
-    1     10.6    -98.4 1.81e+03      1.31    0.256    0.811     0.811  trkChamber eIoni
-    2       11    -98.5 1.81e+03      1.05    0.253    0.868      1.68  trkChamber eIoni
-    3     11.6    -98.3 1.81e+03     0.783     0.27    0.739      2.42  trkChamber eIoni
-    4     11.8    -98.5 1.81e+03     0.574    0.209      0.6      3.02  trkChamber eIoni
-    5     12.2    -98.5 1.81e+03     0.308    0.266    0.489      3.51  trkChamber eIoni
-    6     12.2    -98.3 1.81e+03     0.153    0.156    0.326      3.83  trkChamber eIoni
-    7     12.2    -98.4 1.81e+03         0    0.153    0.141      3.97  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   1.06 cm  -9.83 cm   1.81 m    2.86 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   1.06 cm  -9.84 cm   1.81 m    1.31 MeV   256 keV   811 mum   811 mumtrkChamber     eIoni
+    2    1.1 cm  -9.85 cm   1.81 m    1.05 MeV   253 keV   868 mum  1.68 mm trkChamber     eIoni
+    3   1.16 cm  -9.83 cm   1.81 m     783 keV   270 keV   739 mum  2.42 mm trkChamber     eIoni
+    4   1.18 cm  -9.85 cm   1.81 m     574 keV   209 keV   600 mum  3.02 mm trkChamber     eIoni
+    5   1.22 cm  -9.85 cm   1.81 m     308 keV   266 keV   489 mum  3.51 mm trkChamber     eIoni
+    6   1.22 cm  -9.83 cm   1.81 m     153 keV   156 keV   326 mum  3.83 mm trkChamber     eIoni
+    7   1.22 cm  -9.84 cm   1.81 m       0 eV    153 keV   141 mum  3.97 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 67,   Parent ID = 66
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     10.6    -98.4 1.81e+03       1.3        0        0         0  trkChamber initStep
-    1     10.6    -98.1 1.81e+03     0.946    0.353    0.864     0.864  trkChamber eIoni
-    2     11.1    -97.9 1.81e+03     0.691    0.255    0.684      1.55  trkChamber eIoni
-    3     11.4    -98.3 1.81e+03     0.519    0.172    0.551       2.1  trkChamber eIoni
-    4     11.5      -98 1.81e+03     0.283    0.236    0.458      2.56  trkChamber eIoni
-    5     11.5    -98.1 1.81e+03     0.119    0.164    0.307      2.86  trkChamber eIoni
-    6     11.5      -98 1.81e+03         0    0.119   0.0951      2.96  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   1.06 cm  -9.84 cm   1.81 m     1.3 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   1.06 cm  -9.81 cm   1.81 m     946 keV   353 keV   864 mum   864 mumtrkChamber     eIoni
+    2   1.11 cm  -9.79 cm   1.81 m     691 keV   255 keV   684 mum  1.55 mm trkChamber     eIoni
+    3   1.14 cm  -9.83 cm   1.81 m     519 keV   172 keV   551 mum   2.1 mm trkChamber     eIoni
+    4   1.15 cm   -9.8 cm   1.81 m     283 keV   236 keV   458 mum  2.56 mm trkChamber     eIoni
+    5   1.15 cm  -9.81 cm   1.81 m     119 keV   164 keV   307 mum  2.86 mm trkChamber     eIoni
+    6   1.15 cm   -9.8 cm   1.81 m       0 eV    119 keV  95.1 mum  2.96 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -36.5    -17.6 1.02e+03    0.0103        0        0         0  trkChamber initStep
-    1    -36.5    -17.6 1.02e+03    0.0103   0.0103   0.0452    0.0452  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.65 cm  -1.76 cm   1.02 m    10.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.65 cm  -1.76 cm   1.02 m    10.3 keV  10.3 keV  45.2 mum  45.2 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -36.4    -17.3 1.01e+03      1.38        0        0         0  trkChamber initStep
-    1    -36.1    -17.6 1.02e+03      1.38        0     10.4      10.4     Tracker Transportation
-    2      -17    -38.8 1.62e+03      1.38        0      601       611  trkChamber Transportation
-    3    -15.5    -40.5 1.67e+03     0.273        0     48.6       660  trkChamber compt
-    4    -82.2    -91.9 1.62e+03     0.273        0     97.2       757     Tracker Transportation
-    5 -2.28e+03 -1.78e+03       25     0.273        0  3.2e+03  3.96e+03     WorldPV Transportation
-    6 -4.5e+03 -3.5e+03 -1.59e+03     0.273        0 3.24e+03  7.19e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.64 cm  -1.73 cm   1.01 m    1.38 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.61 cm  -1.76 cm   1.02 m    1.38 MeV     0 eV   1.04 cm   1.04 cm    TrackerTransportation
+    2   -1.7 cm  -3.88 cm   1.62 m    1.38 MeV     0 eV   60.1 cm   61.1 cm trkChamberTransportation
+    3  -1.55 cm  -4.05 cm   1.67 m     273 keV     0 eV   4.86 cm     66 cm trkChamber     compt
+    4  -8.22 cm  -9.19 cm   1.62 m     273 keV     0 eV   9.72 cm   75.7 cm    TrackerTransportation
+    5  -2.28 m   -1.78 m     2.5 cm    273 keV     0 eV    3.2 m    3.96 m     WorldPVTransportation
+    6   -4.5 m    -3.5 m   -1.59 m     273 keV     0 eV   3.24 m    7.19 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 68,   Parent ID = 38
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -15.5    -40.5 1.67e+03      1.11        0        0         0  trkChamber initStep
-    1    -15.7    -40.7 1.67e+03     0.495    0.611    0.766     0.766  trkChamber eIoni
-    2    -15.7    -40.4 1.67e+03     0.344     0.15    0.445      1.21  trkChamber eIoni
-    3    -15.5    -40.4 1.67e+03     0.155    0.189    0.353      1.56  trkChamber eIoni
-    4    -15.4    -40.4 1.67e+03         0    0.155    0.144      1.71  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -1.55 cm  -4.05 cm   1.67 m    1.11 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -1.57 cm  -4.07 cm   1.67 m     495 keV   611 keV   766 mum   766 mumtrkChamber     eIoni
+    2  -1.57 cm  -4.04 cm   1.67 m     344 keV   150 keV   445 mum  1.21 mm trkChamber     eIoni
+    3  -1.55 cm  -4.04 cm   1.67 m     155 keV   189 keV   353 mum  1.56 mm trkChamber     eIoni
+    4  -1.54 cm  -4.04 cm   1.67 m       0 eV    155 keV   144 mum  1.71 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 37,   Parent ID = 36
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.6    -16.9    1e+03     0.471        0        0         0  trkChamber initStep
-    1    -35.6    -16.9    1e+03     0.466  0.00568    0.141     0.141  trkChamber compt
-    2    -32.8    -14.6 1.02e+03     0.466        0     21.2      21.3     Tracker Transportation
-    3     47.7     53.8 1.62e+03     0.466        0      609       631  trkChamber Transportation
-    4     56.1     60.9 1.69e+03     0.182    0.284     63.6       694  trkChamber compt
-    5     31.6     61.8 1.67e+03      0.11   0.0719     31.3       725  trkChamber compt
-    6       45     65.2 1.67e+03     0.106  0.00359     13.9       739  trkChamber compt
-    7     97.5     47.5 1.68e+03     0.101  0.00573     56.6       796  trkChamber compt
-    8       98     47.7 1.68e+03     0.101    0.101    0.624       797  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.56 cm  -1.69 cm      1 m     471 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.56 cm  -1.69 cm      1 m     466 keV  5.68 keV   141 mum   141 mumtrkChamber     compt
+    2  -3.28 cm  -1.46 cm   1.02 m     466 keV     0 eV   2.12 cm   2.13 cm    TrackerTransportation
+    3   4.77 cm   5.38 cm   1.62 m     466 keV     0 eV   60.9 cm   63.1 cm trkChamberTransportation
+    4   5.61 cm   6.09 cm   1.69 m     182 keV   284 keV  6.36 cm   69.4 cm trkChamber     compt
+    5   3.16 cm   6.18 cm   1.67 m     110 keV  71.9 keV  3.13 cm   72.5 cm trkChamber     compt
+    6    4.5 cm   6.52 cm   1.67 m     106 keV  3.59 keV  1.39 cm   73.9 cm trkChamber     compt
+    7   9.75 cm   4.75 cm   1.68 m     101 keV  5.73 keV  5.66 cm   79.6 cm trkChamber     compt
+    8    9.8 cm   4.77 cm   1.68 m     101 keV   101 keV   624 mum  79.7 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 35,   Parent ID = 18
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2      -15      987      48.4        0        0         0  trkChamber initStep
-    1    -35.2    -15.1      988      5.55    0.452     1.24      1.24  trkChamber eBrem
-    2    -34.8    -14.9      990       4.2     1.33     2.38      3.61  trkChamber eBrem
-    3      -34    -15.7      992      3.28     0.92      2.3      5.91  trkChamber eIoni
-    4      -35    -17.2      992      2.54    0.741     1.85      7.76  trkChamber eIoni
-    5    -35.4    -18.5      992      2.03    0.503     1.48      9.24  trkChamber eIoni
-    6    -35.4    -17.5      991      1.57     0.46     1.23      10.5  trkChamber eIoni
-    7    -35.5    -16.8      991      1.07    0.498        1      11.5  trkChamber eIoni
-    8    -35.6    -17.2      990     0.783    0.291    0.749      12.2  trkChamber eIoni
-    9    -35.5    -17.6      990     0.585    0.198      0.6      12.8  trkChamber eIoni
-   10    -35.4      -18      990     0.401    0.184    0.495      13.3  trkChamber eIoni
-   11    -35.3    -18.3      990     0.245    0.156     0.39      13.7  trkChamber eIoni
-   12    -35.2    -18.4      990   0.00395    0.242    0.271        14  trkChamber eIoni
-   13    -35.2    -18.4      990         0  0.00395  0.00276        14  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm   -1.5 cm   98.7 cm   48.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.52 cm  -1.51 cm   98.8 cm   5.55 MeV   452 keV  1.24 mm   1.24 mm trkChamber     eBrem
+    2  -3.48 cm  -1.49 cm     99 cm    4.2 MeV  1.33 MeV  2.38 mm   3.61 mm trkChamber     eBrem
+    3   -3.4 cm  -1.57 cm   99.2 cm   3.28 MeV   920 keV   2.3 mm   5.91 mm trkChamber     eIoni
+    4   -3.5 cm  -1.72 cm   99.2 cm   2.54 MeV   741 keV  1.85 mm   7.76 mm trkChamber     eIoni
+    5  -3.54 cm  -1.85 cm   99.2 cm   2.03 MeV   503 keV  1.48 mm   9.24 mm trkChamber     eIoni
+    6  -3.54 cm  -1.75 cm   99.1 cm   1.57 MeV   460 keV  1.23 mm   1.05 cm trkChamber     eIoni
+    7  -3.55 cm  -1.68 cm   99.1 cm   1.07 MeV   498 keV     1 mm   1.15 cm trkChamber     eIoni
+    8  -3.56 cm  -1.72 cm     99 cm    783 keV   291 keV   749 mum  1.22 cm trkChamber     eIoni
+    9  -3.55 cm  -1.76 cm     99 cm    585 keV   198 keV   600 mum  1.28 cm trkChamber     eIoni
+   10  -3.54 cm   -1.8 cm     99 cm    401 keV   184 keV   495 mum  1.33 cm trkChamber     eIoni
+   11  -3.53 cm  -1.83 cm     99 cm    245 keV   156 keV   390 mum  1.37 cm trkChamber     eIoni
+   12  -3.52 cm  -1.84 cm     99 cm   3.95 keV   242 keV   271 mum   1.4 cm trkChamber     eIoni
+   13  -3.52 cm  -1.84 cm     99 cm      0 eV   3.95 keV  2.76 mum   1.4 cm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 35
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.8    -14.9      990    0.0289        0        0         0  trkChamber initStep
-    1    -34.4    -14.8      992    0.0289   0.0289     1.87      1.87  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.48 cm  -1.49 cm     99 cm   28.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.44 cm  -1.48 cm   99.2 cm   28.9 keV  28.9 keV  1.87 mm   1.87 mm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 35
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2    -15.1      988      42.4        0        0         0  trkChamber initStep
-    1    -37.4    -22.3 1.02e+03      42.4        0     37.6      37.6     Tracker Transportation
-    2    -73.6     -139 1.62e+03      42.4        0      612       650  trkChamber Transportation
-    3    -85.6     -177 1.82e+03      42.4        0      204       854     Tracker Transportation
-    4     -122     -294 2.42e+03      42.4        0      612  1.47e+03  trkChamber Transportation
-    5     -134     -332 2.62e+03      42.4        0      204  1.67e+03     Tracker Transportation
-    6     -170     -449 3.22e+03      42.4        0      612  2.28e+03  trkChamber Transportation
-    7     -173     -459 3.28e+03         0        0     54.9  2.34e+03  trkChamber conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm  -1.51 cm   98.8 cm   42.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.74 cm  -2.23 cm   1.02 m    42.4 MeV     0 eV   3.76 cm   3.76 cm    TrackerTransportation
+    2  -7.36 cm  -13.9 cm   1.62 m    42.4 MeV     0 eV   61.2 cm     65 cm trkChamberTransportation
+    3  -8.56 cm  -17.7 cm   1.82 m    42.4 MeV     0 eV   20.4 cm   85.4 cm    TrackerTransportation
+    4  -12.2 cm  -29.4 cm   2.42 m    42.4 MeV     0 eV   61.2 cm   1.47 m  trkChamberTransportation
+    5  -13.4 cm  -33.2 cm   2.62 m    42.4 MeV     0 eV   20.4 cm   1.67 m     TrackerTransportation
+    6    -17 cm  -44.9 cm   3.23 m    42.4 MeV     0 eV   61.2 cm   2.28 m  trkChamberTransportation
+    7  -17.3 cm  -45.9 cm   3.28 m       0 eV      0 eV   5.49 cm   2.34 m  trkChamber      conv
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e+,   Track ID = 72,   Parent ID = 69
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -459 3.28e+03      23.8        0        0         0  trkChamber initStep
-    1     -173     -459 3.28e+03      23.4    0.294    0.693     0.693  trkChamber eBrem
-    2     -173     -460 3.29e+03      21.3     2.09     5.91       6.6  trkChamber eBrem
-    3     -173     -460 3.29e+03      20.9    0.405     1.18      7.78  trkChamber eBrem
-    4     -173     -460 3.29e+03      20.5    0.338     0.73      8.51  trkChamber eBrem
-    5     -172     -464  3.3e+03      16.8     3.74     10.4      18.9  trkChamber eIoni
-    6     -171     -465  3.3e+03      13.4     3.32     8.55      27.4  trkChamber eIoni
-    7     -169     -466 3.31e+03      10.9     2.56     6.93      34.4  trkChamber eIoni
-    8     -169     -465 3.32e+03      7.84     3.03     5.67        40  trkChamber eIoni
-    9     -168     -466 3.32e+03      6.21     1.62     4.18      44.2  trkChamber eIoni
-   10     -167     -468 3.32e+03      4.69     1.52     3.37      47.6  trkChamber eIoni
-   11     -166     -468 3.33e+03      3.62     1.07     2.61      50.2  trkChamber eIoni
-   12     -166     -468 3.33e+03      2.94    0.678     2.07      52.3  trkChamber eIoni
-   13     -166     -466 3.33e+03      2.33    0.616     1.72        54  trkChamber eIoni
-   14     -166     -465 3.33e+03      1.83    0.499      1.4      55.4  trkChamber eIoni
-   15     -165     -465 3.33e+03      1.45    0.381     1.15      56.5  trkChamber eIoni
-   16     -165     -464 3.33e+03     0.962    0.484    0.948      57.5  trkChamber eIoni
-   17     -165     -464 3.33e+03     0.149    0.167    0.592      58.1  trkChamber eBrem
-   18     -165     -464 3.33e+03         0    0.149    0.129      58.2  trkChamber eIoni
-   19     -165     -464 3.33e+03         0        0        0      58.2  trkChamber annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm  -45.9 cm   3.28 m    23.8 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.3 cm  -45.9 cm   3.28 m    23.4 MeV   294 keV   693 mum   693 mumtrkChamber     eBrem
+    2  -17.3 cm    -46 cm   3.29 m    21.3 MeV  2.09 MeV  5.91 mm    6.6 mm trkChamber     eBrem
+    3  -17.3 cm    -46 cm   3.29 m    20.9 MeV   405 keV  1.18 mm   7.78 mm trkChamber     eBrem
+    4  -17.3 cm    -46 cm   3.29 m    20.5 MeV   338 keV   730 mum  8.51 mm trkChamber     eBrem
+    5  -17.2 cm  -46.4 cm    3.3 m    16.8 MeV  3.74 MeV  1.04 cm   1.89 cm trkChamber     eIoni
+    6  -17.1 cm  -46.5 cm    3.3 m    13.4 MeV  3.32 MeV  8.55 mm   2.74 cm trkChamber     eIoni
+    7  -16.9 cm  -46.6 cm   3.31 m    10.9 MeV  2.56 MeV  6.93 mm   3.44 cm trkChamber     eIoni
+    8  -16.9 cm  -46.5 cm   3.32 m    7.84 MeV  3.03 MeV  5.67 mm      4 cm trkChamber     eIoni
+    9  -16.8 cm  -46.6 cm   3.32 m    6.21 MeV  1.62 MeV  4.18 mm   4.42 cm trkChamber     eIoni
+   10  -16.7 cm  -46.8 cm   3.32 m    4.69 MeV  1.52 MeV  3.37 mm   4.76 cm trkChamber     eIoni
+   11  -16.6 cm  -46.8 cm   3.33 m    3.62 MeV  1.07 MeV  2.61 mm   5.02 cm trkChamber     eIoni
+   12  -16.6 cm  -46.8 cm   3.33 m    2.94 MeV   678 keV  2.07 mm   5.23 cm trkChamber     eIoni
+   13  -16.6 cm  -46.6 cm   3.33 m    2.33 MeV   616 keV  1.72 mm    5.4 cm trkChamber     eIoni
+   14  -16.6 cm  -46.5 cm   3.33 m    1.83 MeV   499 keV   1.4 mm   5.54 cm trkChamber     eIoni
+   15  -16.5 cm  -46.5 cm   3.33 m    1.45 MeV   381 keV  1.15 mm   5.65 cm trkChamber     eIoni
+   16  -16.5 cm  -46.4 cm   3.33 m     962 keV   484 keV   948 mum  5.75 cm trkChamber     eIoni
+   17  -16.5 cm  -46.4 cm   3.33 m     149 keV   167 keV   592 mum  5.81 cm trkChamber     eBrem
+   18  -16.5 cm  -46.4 cm   3.33 m       0 eV    149 keV   129 mum  5.82 cm trkChamber     eIoni
+   19  -16.5 cm  -46.4 cm   3.33 m       0 eV      0 eV      0 fm   5.82 cm trkChamber   annihil
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 79,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -165     -464 3.33e+03     0.511        0        0         0  trkChamber initStep
-    1     -181     -436 3.27e+03     0.485   0.0262     66.1      66.1  trkChamber compt
-    2     -190     -428 3.26e+03     0.482  0.00259     17.1      83.3  trkChamber compt
-    3     -207     -407 3.23e+03     0.232     0.25     36.7       120  trkChamber compt
-    4     -209     -403 3.24e+03     0.134   0.0982     7.88       128  trkChamber compt
-    5     -200     -398 3.22e+03     0.134        0     16.7       145     Tracker Transportation
-    6      208     -174 2.62e+03     0.134        0      759       904  trkChamber Transportation
-    7      226     -164  2.6e+03    0.0882   0.0461     33.4       937  trkChamber compt
-    8      203     -171 2.62e+03    0.0882        0     35.4       972     Tracker Transportation
-    9     -308     -336 3.22e+03    0.0882        0      805  1.78e+03  trkChamber Transportation
-   10     -314     -338 3.23e+03    0.0686   0.0196     8.91  1.79e+03  trkChamber compt
-   11     -315     -337 3.22e+03    0.0686        0     6.87  1.79e+03     Tracker Transportation
-   12     -416     -214 2.62e+03    0.0686        0      621  2.41e+03  trkChamber Transportation
-   13     -416     -214 2.62e+03    0.0574   0.0112     1.81  2.42e+03  trkChamber compt
-   14     -418     -213 2.62e+03    0.0574        0     2.81  2.42e+03     Tracker Transportation
-   15 -1.17e+03     -111 3.22e+03    0.0574        0      964  3.38e+03  trkChamber Transportation
-   16 -1.17e+03     -109 3.23e+03    0.0574   0.0574       12  3.39e+03  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -16.5 cm  -46.4 cm   3.33 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -18.1 cm  -43.6 cm   3.27 m     485 keV  26.2 keV  6.61 cm   6.61 cm trkChamber     compt
+    2    -19 cm  -42.8 cm   3.26 m     482 keV  2.59 keV  1.71 cm   8.33 cm trkChamber     compt
+    3  -20.7 cm  -40.7 cm   3.23 m     232 keV   250 keV  3.67 cm     12 cm trkChamber     compt
+    4  -20.9 cm  -40.3 cm   3.24 m     134 keV  98.2 keV  7.88 mm   12.8 cm trkChamber     compt
+    5    -20 cm  -39.8 cm   3.23 m     134 keV     0 eV   1.67 cm   14.5 cm    TrackerTransportation
+    6   20.8 cm  -17.4 cm   2.62 m     134 keV     0 eV   75.9 cm   90.4 cm trkChamberTransportation
+    7   22.6 cm  -16.4 cm    2.6 m    88.2 keV  46.1 keV  3.34 cm   93.7 cm trkChamber     compt
+    8   20.3 cm  -17.1 cm   2.62 m    88.2 keV     0 eV   3.54 cm   97.2 cm    TrackerTransportation
+    9  -30.8 cm  -33.6 cm   3.23 m    88.2 keV     0 eV   80.5 cm   1.78 m  trkChamberTransportation
+   10  -31.4 cm  -33.8 cm   3.23 m    68.6 keV  19.6 keV  8.91 mm   1.79 m  trkChamber     compt
+   11  -31.5 cm  -33.7 cm   3.23 m    68.6 keV     0 eV   6.87 mm   1.79 m     TrackerTransportation
+   12  -41.6 cm  -21.4 cm   2.62 m    68.6 keV     0 eV   62.1 cm   2.41 m  trkChamberTransportation
+   13  -41.6 cm  -21.4 cm   2.62 m    57.4 keV  11.2 keV  1.81 mm   2.42 m  trkChamber     compt
+   14  -41.8 cm  -21.3 cm   2.62 m    57.4 keV     0 eV   2.81 mm   2.42 m     TrackerTransportation
+   15  -1.17 m   -11.1 cm   3.23 m    57.4 keV     0 eV   96.4 cm   3.38 m  trkChamberTransportation
+   16  -1.17 m   -10.9 cm   3.23 m    57.4 keV  57.4 keV   1.2 cm   3.39 m  trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -165     -464 3.33e+03     0.511        0        0         0  trkChamber initStep
-    1     -161     -470 3.34e+03      0.49   0.0214       14        14  trkChamber compt
-    2     -161     -470 3.34e+03     0.378    0.111   0.0181        14  trkChamber compt
-    3     -151     -460 3.35e+03     0.365   0.0133     18.1      32.1  trkChamber compt
-    4     -151     -460 3.35e+03     0.286   0.0785   0.0341      32.1  trkChamber compt
-    5     -153     -456 3.35e+03     0.286    0.286     4.49      36.6  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -16.5 cm  -46.4 cm   3.33 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -16.1 cm    -47 cm   3.34 m     490 keV  21.4 keV   1.4 cm    1.4 cm trkChamber     compt
+    2  -16.1 cm    -47 cm   3.34 m     378 keV   111 keV  18.1 mum   1.4 cm trkChamber     compt
+    3  -15.1 cm    -46 cm   3.35 m     365 keV  13.3 keV  1.81 cm   3.21 cm trkChamber     compt
+    4  -15.1 cm    -46 cm   3.35 m     286 keV  78.5 keV  34.1 mum  3.21 cm trkChamber     compt
+    5  -15.3 cm  -45.6 cm   3.35 m     286 keV   286 keV  4.49 mm   3.66 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 77,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -165     -464 3.33e+03     0.646        0        0         0  trkChamber initStep
-    1     -129     -455 3.32e+03     0.404    0.241     38.6      38.6  trkChamber compt
-    2    -15.2     -398 3.42e+03     0.404        0      168       206     Tracker Transportation
-    3      610    -81.9 4.02e+03     0.404        0      922  1.13e+03  trkChamber Transportation
-    4      643    -65.1 4.06e+03     0.211    0.193     49.3  1.18e+03  trkChamber compt
-    5      643    -68.6 4.06e+03     0.135   0.0763      3.7  1.18e+03  trkChamber compt
-    6      636    -65.9 4.06e+03    0.0886   0.0463     7.55  1.19e+03  trkChamber compt
-    7      639    -67.3 4.06e+03    0.0863   0.0023     2.65  1.19e+03  trkChamber compt
-    8      641    -71.8 4.06e+03    0.0852  0.00111     5.17   1.2e+03  trkChamber compt
-    9      644     -124 4.07e+03     0.084  0.00113     53.9  1.25e+03  trkChamber compt
-   10      651     -139 4.08e+03    0.0769  0.00711     18.8  1.27e+03  trkChamber compt
-   11      651     -139 4.08e+03    0.0741  0.00278     0.56  1.27e+03  trkChamber compt
-   12      663     -144 4.09e+03    0.0741   0.0741     15.2  1.29e+03  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -16.5 cm  -46.4 cm   3.33 m     646 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -12.9 cm  -45.5 cm   3.32 m     404 keV   241 keV  3.86 cm   3.86 cm trkChamber     compt
+    2  -1.52 cm  -39.8 cm   3.42 m     404 keV     0 eV   16.8 cm   20.6 cm    TrackerTransportation
+    3     61 cm  -8.19 cm   4.03 m     404 keV     0 eV   92.2 cm   1.13 m  trkChamberTransportation
+    4   64.3 cm  -6.51 cm   4.06 m     211 keV   193 keV  4.93 cm   1.18 m  trkChamber     compt
+    5   64.3 cm  -6.86 cm   4.06 m     135 keV  76.3 keV   3.7 mm   1.18 m  trkChamber     compt
+    6   63.6 cm  -6.59 cm   4.06 m    88.6 keV  46.3 keV  7.55 mm   1.19 m  trkChamber     compt
+    7   63.9 cm  -6.73 cm   4.06 m    86.3 keV   2.3 keV  2.65 mm   1.19 m  trkChamber     compt
+    8   64.1 cm  -7.18 cm   4.06 m    85.2 keV  1.11 keV  5.17 mm    1.2 m  trkChamber     compt
+    9   64.4 cm  -12.4 cm   4.07 m      84 keV  1.13 keV  5.39 cm   1.25 m  trkChamber     compt
+   10   65.1 cm  -13.9 cm   4.08 m    76.9 keV  7.11 keV  1.88 cm   1.27 m  trkChamber     compt
+   11   65.1 cm  -13.9 cm   4.08 m    74.1 keV  2.78 keV   560 mum  1.27 m  trkChamber     compt
+   12   66.3 cm  -14.4 cm   4.09 m    74.1 keV  74.1 keV  1.52 cm   1.29 m  trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 76,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -460 3.29e+03    0.0163        0        0         0  trkChamber initStep
-    1     -173     -460 3.29e+03    0.0163   0.0163    0.222     0.222  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm    -46 cm   3.29 m    16.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.3 cm    -46 cm   3.29 m    16.3 keV  16.3 keV   222 mum   222 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 75,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -460 3.29e+03    0.0107        0        0         0  trkChamber initStep
-    1     -173     -460 3.29e+03    0.0107   0.0107    0.132     0.132  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm    -46 cm   3.29 m    10.7 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.3 cm    -46 cm   3.29 m    10.7 keV  10.7 keV   132 mum   132 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 74,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -460 3.29e+03    0.0367        0        0         0  trkChamber initStep
-    1     -173     -460 3.29e+03    0.0367   0.0367  0.00491   0.00491  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm    -46 cm   3.29 m    36.7 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.3 cm    -46 cm   3.29 m    36.7 keV  36.7 keV  4.91 mum  4.91 mumtrkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 73,   Parent ID = 72
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -459 3.28e+03     0.115        0        0         0  trkChamber initStep
-    1     -179     -470 3.34e+03     0.102    0.013     61.2      61.2  trkChamber compt
-    2     -143     -450 3.37e+03       0.1  0.00173     50.2       111  trkChamber compt
-    3     -139     -444 3.38e+03    0.0884   0.0118       11       122  trkChamber compt
-    4     -139     -444 3.38e+03    0.0776   0.0108   0.0717       122  trkChamber compt
-    5     -145     -445 3.35e+03    0.0767 0.000903     23.7       146  trkChamber compt
-    6     -147     -436 3.32e+03    0.0767   0.0767     30.2       176  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm  -45.9 cm   3.28 m     115 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.9 cm    -47 cm   3.34 m     102 keV    13 keV  6.12 cm   6.12 cm trkChamber     compt
+    2  -14.3 cm    -45 cm   3.37 m     100 keV  1.73 keV  5.02 cm   11.1 cm trkChamber     compt
+    3  -13.9 cm  -44.4 cm   3.38 m    88.4 keV  11.8 keV   1.1 cm   12.2 cm trkChamber     compt
+    4  -13.9 cm  -44.4 cm   3.38 m    77.6 keV  10.8 keV  71.7 mum  12.2 cm trkChamber     compt
+    5  -14.5 cm  -44.5 cm   3.35 m    76.7 keV   903 eV   2.37 cm   14.6 cm trkChamber     compt
+    6  -14.7 cm  -43.6 cm   3.32 m    76.7 keV  76.7 keV  3.02 cm   17.6 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 69
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -173     -459 3.28e+03      17.5        0        0         0  trkChamber initStep
-    1     -172     -459 3.29e+03      13.2     4.35     8.81      8.81  trkChamber eIoni
-    2     -174     -460 3.29e+03      10.1     1.69      4.3      13.1  trkChamber eBrem
-    3     -174     -460  3.3e+03       8.2     1.86     5.17      18.3  trkChamber eIoni
-    4     -174     -461  3.3e+03      5.38     2.83     4.27      22.5  trkChamber eIoni
-    5     -175     -461  3.3e+03      4.36     1.02     2.88      25.4  trkChamber eIoni
-    6     -177     -462  3.3e+03      3.49    0.873     2.38      27.8  trkChamber eIoni
-    7     -178     -464 3.31e+03      2.66     0.83     1.95      29.8  trkChamber eIoni
-    8     -178     -465 3.31e+03      1.95    0.711     1.54      31.3  trkChamber eIoni
-    9     -177     -465 3.31e+03      1.49    0.454     1.19      32.5  trkChamber eIoni
-   10     -177     -464 3.31e+03      1.15    0.346    0.961      33.5  trkChamber eIoni
-   11     -177     -464 3.31e+03     0.876     0.27    0.786      34.2  trkChamber eIoni
-   12     -177     -464 3.31e+03     0.628    0.248    0.648      34.9  trkChamber eIoni
-   13     -177     -464 3.31e+03     0.406    0.223    0.518      35.4  trkChamber eIoni
-   14     -177     -464 3.31e+03     0.222    0.183    0.393      35.8  trkChamber eIoni
-   15     -177     -464 3.31e+03    0.0525     0.17    0.245        36  trkChamber eIoni
-   16     -177     -464 3.31e+03         0   0.0525    0.026      36.1  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.3 cm  -45.9 cm   3.28 m    17.5 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -17.2 cm  -45.9 cm   3.29 m    13.2 MeV  4.35 MeV  8.81 mm   8.81 mm trkChamber     eIoni
+    2  -17.4 cm    -46 cm   3.29 m    10.1 MeV  1.69 MeV   4.3 mm   1.31 cm trkChamber     eBrem
+    3  -17.4 cm    -46 cm    3.3 m     8.2 MeV  1.86 MeV  5.17 mm   1.83 cm trkChamber     eIoni
+    4  -17.4 cm  -46.1 cm    3.3 m    5.38 MeV  2.83 MeV  4.27 mm   2.25 cm trkChamber     eIoni
+    5  -17.5 cm  -46.1 cm    3.3 m    4.36 MeV  1.02 MeV  2.88 mm   2.54 cm trkChamber     eIoni
+    6  -17.7 cm  -46.2 cm    3.3 m    3.49 MeV   873 keV  2.38 mm   2.78 cm trkChamber     eIoni
+    7  -17.8 cm  -46.4 cm   3.31 m    2.66 MeV   830 keV  1.95 mm   2.98 cm trkChamber     eIoni
+    8  -17.8 cm  -46.5 cm   3.31 m    1.95 MeV   711 keV  1.54 mm   3.13 cm trkChamber     eIoni
+    9  -17.7 cm  -46.5 cm   3.31 m    1.49 MeV   454 keV  1.19 mm   3.25 cm trkChamber     eIoni
+   10  -17.7 cm  -46.4 cm   3.31 m    1.15 MeV   346 keV   961 mum  3.35 cm trkChamber     eIoni
+   11  -17.7 cm  -46.4 cm   3.31 m     876 keV   270 keV   786 mum  3.42 cm trkChamber     eIoni
+   12  -17.7 cm  -46.4 cm   3.31 m     628 keV   248 keV   648 mum  3.49 cm trkChamber     eIoni
+   13  -17.7 cm  -46.4 cm   3.31 m     406 keV   223 keV   518 mum  3.54 cm trkChamber     eIoni
+   14  -17.7 cm  -46.4 cm   3.31 m     222 keV   183 keV   393 mum  3.58 cm trkChamber     eIoni
+   15  -17.7 cm  -46.4 cm   3.31 m    52.5 keV   170 keV   245 mum   3.6 cm trkChamber     eIoni
+   16  -17.7 cm  -46.4 cm   3.31 m       0 eV   52.5 keV    26 mum  3.61 cm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 80,   Parent ID = 71
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -174     -460 3.29e+03      1.44        0        0         0  trkChamber initStep
-    1     -192     -494 3.42e+03      1.44        0      139       139     Tracker Transportation
-    2     -275     -645 4.02e+03      1.44        0      624       763  trkChamber Transportation
-    3     -278     -650 4.05e+03      1.24    0.199     22.3       785  trkChamber compt
-    4     -276     -686 4.11e+03     0.535    0.704     69.6       855  trkChamber compt
-    5     -283     -690 4.11e+03     0.505   0.0305     8.07       863  trkChamber compt
-    6     -305     -703 4.13e+03     0.261    0.243     32.7       896  trkChamber compt
-    7     -298     -735 4.12e+03      0.15    0.112     35.2       931  trkChamber compt
-    8     -299     -735 4.12e+03    0.0962   0.0534     1.84       933  trkChamber compt
-    9     -298     -737 4.11e+03    0.0847   0.0116     9.33       942  trkChamber compt
-   10     -304     -744 4.11e+03    0.0816  0.00305        9       951  trkChamber compt
-   11     -310     -747  4.1e+03    0.0788  0.00281     9.54       961  trkChamber compt
-   12     -309     -802 4.04e+03    0.0619   0.0169     79.5  1.04e+03  trkChamber compt
-   13     -307     -800 4.07e+03    0.0619   0.0619     21.5  1.06e+03  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -17.4 cm    -46 cm   3.29 m    1.44 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -19.2 cm  -49.4 cm   3.42 m    1.44 MeV     0 eV   13.9 cm   13.9 cm    TrackerTransportation
+    2  -27.5 cm  -64.5 cm   4.03 m    1.44 MeV     0 eV   62.4 cm   76.3 cm trkChamberTransportation
+    3  -27.8 cm    -65 cm   4.05 m    1.24 MeV   199 keV  2.23 cm   78.5 cm trkChamber     compt
+    4  -27.6 cm  -68.6 cm   4.11 m     535 keV   704 keV  6.96 cm   85.5 cm trkChamber     compt
+    5  -28.3 cm    -69 cm   4.11 m     505 keV  30.5 keV  8.07 mm   86.3 cm trkChamber     compt
+    6  -30.5 cm  -70.3 cm   4.13 m     261 keV   243 keV  3.27 cm   89.6 cm trkChamber     compt
+    7  -29.8 cm  -73.5 cm   4.12 m     150 keV   112 keV  3.52 cm   93.1 cm trkChamber     compt
+    8  -29.9 cm  -73.5 cm   4.12 m    96.2 keV  53.4 keV  1.84 mm   93.3 cm trkChamber     compt
+    9  -29.8 cm  -73.7 cm   4.11 m    84.7 keV  11.6 keV  9.33 mm   94.2 cm trkChamber     compt
+   10  -30.4 cm  -74.4 cm   4.11 m    81.6 keV  3.05 keV     9 mm   95.1 cm trkChamber     compt
+   11    -31 cm  -74.7 cm    4.1 m    78.8 keV  2.81 keV  9.54 mm   96.1 cm trkChamber     compt
+   12  -30.9 cm  -80.2 cm   4.04 m    61.9 keV  16.9 keV  7.95 cm   1.04 m  trkChamber     compt
+   13  -30.7 cm    -80 cm   4.07 m    61.9 keV  61.9 keV  2.15 cm   1.06 m  trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.9    -6.01      843      22.8        0        0         0  trkChamber initStep
-    1    -39.1    -8.86      926      5.64        0     82.7      82.7  trkChamber compt
-    2    -66.1     3.88    1e+03      5.09    0.549       83       166  trkChamber compt
-    3    -70.9     5.72 1.02e+03      5.09        0     22.4       188     Tracker Transportation
-    4     -202     56.3 1.62e+03      5.09        0      616       804  trkChamber Transportation
-    5     -204     57.3 1.64e+03     0.508        0     12.7       817  trkChamber compt
-    6     -212     77.1 1.64e+03     0.461   0.0469     21.1       838  trkChamber compt
-    7     -246      111 1.63e+03     0.446   0.0152     48.4       887  trkChamber compt
-    8     -254      126 1.62e+03     0.446        0     18.2       905     Tracker Transportation
-    9 -1.59e+03  2.5e+03 1.15e+03     0.446        0 2.76e+03  3.67e+03     WorldPV Transportation
-   10 -2.71e+03  4.5e+03      744     0.446        0 2.33e+03     6e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.79 cm  -6.01 mm   84.3 cm   22.8 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.91 cm  -8.86 mm   92.6 cm   5.64 MeV     0 eV   8.27 cm   8.27 cm trkChamber     compt
+    2  -6.61 cm   3.88 mm      1 m    5.09 MeV   549 keV   8.3 cm   16.6 cm trkChamber     compt
+    3  -7.09 cm   5.72 mm   1.02 m    5.09 MeV     0 eV   2.24 cm   18.8 cm    TrackerTransportation
+    4  -20.2 cm   5.63 cm   1.62 m    5.09 MeV     0 eV   61.6 cm   80.4 cm trkChamberTransportation
+    5  -20.4 cm   5.73 cm   1.64 m     508 keV     0 eV   1.27 cm   81.7 cm trkChamber     compt
+    6  -21.2 cm   7.71 cm   1.64 m     461 keV  46.9 keV  2.11 cm   83.8 cm trkChamber     compt
+    7  -24.6 cm   11.1 cm   1.63 m     446 keV  15.2 keV  4.84 cm   88.7 cm trkChamber     compt
+    8  -25.4 cm   12.6 cm   1.62 m     446 keV     0 eV   1.82 cm   90.5 cm    TrackerTransportation
+    9  -1.59 m     2.5 m    1.15 m     446 keV     0 eV   2.76 m    3.67 m     WorldPVTransportation
+   10  -2.71 m     4.5 m    74.4 cm    446 keV     0 eV   2.33 m       6 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 82,   Parent ID = 17
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -204     57.3 1.64e+03      4.58        0        0         0  trkChamber initStep
-    1     -204     57.9 1.64e+03      3.67    0.908     2.49      2.49  trkChamber eIoni
-    2     -205     58.3 1.64e+03      2.97    0.701     2.04      4.53  trkChamber eIoni
-    3     -206     59.3 1.64e+03      2.43    0.543      1.7      6.23  trkChamber eIoni
-    4     -207     59.6 1.64e+03      1.79    0.644     1.43      7.66  trkChamber eIoni
-    5     -208     60.2 1.64e+03       1.3    0.425    0.963      8.62  trkChamber eBrem
-    6     -208     60.2 1.64e+03      1.28   0.0039   0.0134      8.63  trkChamber eBrem
-    7     -208     60.6 1.64e+03     0.956     0.32    0.852      9.49  trkChamber eIoni
-    8     -208     60.9 1.64e+03     0.667    0.289    0.689      10.2  trkChamber eIoni
-    9     -209     60.7 1.64e+03      0.46    0.207    0.539      10.7  trkChamber eIoni
-   10     -209     60.5 1.64e+03     0.284    0.176    0.425      11.1  trkChamber eIoni
-   11     -209     60.6 1.64e+03    0.0666    0.217    0.307      11.4  trkChamber eIoni
-   12     -209     60.6 1.64e+03         0   0.0666   0.0375      11.5  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -20.4 cm   5.73 cm   1.64 m    4.58 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -20.4 cm   5.79 cm   1.64 m    3.67 MeV   908 keV  2.49 mm   2.49 mm trkChamber     eIoni
+    2  -20.5 cm   5.83 cm   1.64 m    2.97 MeV   701 keV  2.04 mm   4.53 mm trkChamber     eIoni
+    3  -20.6 cm   5.93 cm   1.64 m    2.43 MeV   543 keV   1.7 mm   6.23 mm trkChamber     eIoni
+    4  -20.7 cm   5.96 cm   1.64 m    1.79 MeV   644 keV  1.43 mm   7.66 mm trkChamber     eIoni
+    5  -20.8 cm   6.02 cm   1.64 m     1.3 MeV   425 keV   963 mum  8.62 mm trkChamber     eBrem
+    6  -20.8 cm   6.02 cm   1.64 m    1.28 MeV   3.9 keV  13.4 mum  8.63 mm trkChamber     eBrem
+    7  -20.8 cm   6.06 cm   1.64 m     956 keV   320 keV   852 mum  9.49 mm trkChamber     eIoni
+    8  -20.8 cm   6.09 cm   1.64 m     667 keV   289 keV   689 mum  1.02 cm trkChamber     eIoni
+    9  -20.9 cm   6.07 cm   1.64 m     460 keV   207 keV   539 mum  1.07 cm trkChamber     eIoni
+   10  -20.9 cm   6.05 cm   1.64 m     284 keV   176 keV   425 mum  1.11 cm trkChamber     eIoni
+   11  -20.9 cm   6.06 cm   1.64 m    66.6 keV   217 keV   307 mum  1.14 cm trkChamber     eIoni
+   12  -20.9 cm   6.06 cm   1.64 m       0 eV   66.6 keV  37.5 mum  1.15 cm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 84,   Parent ID = 82
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -208     60.2 1.64e+03    0.0213        0        0         0  trkChamber initStep
-    1     -206     61.6 1.64e+03    0.0213   0.0213     2.16      2.16  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -20.8 cm   6.02 cm   1.64 m    21.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -20.6 cm   6.16 cm   1.64 m    21.3 keV  21.3 keV  2.16 mm   2.16 mm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 82
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0     -208     60.2 1.64e+03    0.0593        0        0         0  trkChamber initStep
-    1     -203     66.6 1.66e+03    0.0516  0.00774     17.9      17.9  trkChamber compt
-    2     -197     39.3 1.66e+03    0.0516   0.0516       28        46  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -20.8 cm   6.02 cm   1.64 m    59.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -20.3 cm   6.66 cm   1.66 m    51.6 keV  7.74 keV  1.79 cm   1.79 cm trkChamber     compt
+    2  -19.7 cm   3.93 cm   1.66 m    51.6 keV  51.6 keV   2.8 cm    4.6 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 81,   Parent ID = 17
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -39.1    -8.86      926      17.1        0        0         0  trkChamber initStep
-    1    -39.7    -10.3      934      11.6     3.03     8.05      8.05  trkChamber eBrem
-    2    -40.1    -9.11      939      9.18     2.39     5.91        14  trkChamber eIoni
-    3    -40.9    -8.99      942      5.66     1.26     2.67      16.6  trkChamber eIoni
-    4    -39.6     -8.2      944      4.45     1.22     3.02      19.6  trkChamber eIoni
-    5    -38.4    -8.77      946      3.63    0.813     2.43      22.1  trkChamber eIoni
-    6    -37.9     -8.6      948      2.98    0.656     2.02      24.1  trkChamber eIoni
-    7    -36.6    -7.98      949      2.35    0.624      1.7      25.8  trkChamber eIoni
-    8    -35.4    -7.65      949      1.83    0.522     1.39      27.2  trkChamber eIoni
-    9    -34.6    -7.59      950      1.46    0.369     1.13      28.3  trkChamber eIoni
-   10    -34.5    -7.82      951     0.934    0.531    0.948      29.3  trkChamber eIoni
-   11      -35    -7.96      951       0.7    0.234    0.678      29.9  trkChamber eIoni
-   12    -34.7    -7.82      951     0.459    0.241    0.556      30.5  trkChamber eIoni
-   13    -34.4    -7.96      951     0.285    0.174    0.425      30.9  trkChamber eIoni
-   14    -34.3    -8.06      951     0.112    0.173    0.308      31.2  trkChamber eIoni
-   15    -34.3    -8.05      951         0    0.112   0.0856      31.3  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.91 cm  -8.86 mm   92.6 cm   17.1 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.97 cm  -1.03 cm   93.4 cm   11.6 MeV  3.03 MeV  8.05 mm   8.05 mm trkChamber     eBrem
+    2  -4.01 cm  -9.11 mm   93.9 cm   9.18 MeV  2.39 MeV  5.91 mm    1.4 cm trkChamber     eIoni
+    3  -4.09 cm  -8.99 mm   94.2 cm   5.66 MeV  1.26 MeV  2.67 mm   1.66 cm trkChamber     eIoni
+    4  -3.96 cm   -8.2 mm   94.4 cm   4.45 MeV  1.22 MeV  3.02 mm   1.96 cm trkChamber     eIoni
+    5  -3.84 cm  -8.77 mm   94.6 cm   3.63 MeV   813 keV  2.43 mm   2.21 cm trkChamber     eIoni
+    6  -3.79 cm   -8.6 mm   94.8 cm   2.98 MeV   656 keV  2.02 mm   2.41 cm trkChamber     eIoni
+    7  -3.66 cm  -7.98 mm   94.9 cm   2.35 MeV   624 keV   1.7 mm   2.58 cm trkChamber     eIoni
+    8  -3.54 cm  -7.65 mm   94.9 cm   1.83 MeV   522 keV  1.39 mm   2.72 cm trkChamber     eIoni
+    9  -3.46 cm  -7.59 mm     95 cm   1.46 MeV   369 keV  1.13 mm   2.83 cm trkChamber     eIoni
+   10  -3.45 cm  -7.82 mm   95.1 cm    934 keV   531 keV   948 mum  2.93 cm trkChamber     eIoni
+   11   -3.5 cm  -7.96 mm   95.1 cm    700 keV   234 keV   678 mum  2.99 cm trkChamber     eIoni
+   12  -3.47 cm  -7.82 mm   95.1 cm    459 keV   241 keV   556 mum  3.05 cm trkChamber     eIoni
+   13  -3.44 cm  -7.96 mm   95.1 cm    285 keV   174 keV   425 mum  3.09 cm trkChamber     eIoni
+   14  -3.43 cm  -8.06 mm   95.1 cm    112 keV   173 keV   308 mum  3.12 cm trkChamber     eIoni
+   15  -3.43 cm  -8.05 mm   95.1 cm      0 eV    112 keV  85.6 mum  3.13 cm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 86,   Parent ID = 81
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -40.9    -8.99      942      2.26        0        0         0  trkChamber initStep
-    1    -41.8    -8.66      943       1.8    0.463     1.34      1.34  trkChamber eIoni
-    2    -42.5    -8.69      943      1.39    0.405     1.11      2.46  trkChamber eIoni
-    3    -42.4    -7.89      944      1.09    0.302     0.91      3.37  trkChamber eIoni
-    4    -42.1    -7.27      944     0.842    0.247    0.757      4.12  trkChamber eIoni
-    5    -41.8    -7.71      944      0.56    0.282     0.63      4.75  trkChamber eIoni
-    6    -42.1    -7.61      944     0.376    0.183    0.481      5.24  trkChamber eIoni
-    7    -42.2    -7.39      944     0.144    0.232    0.374      5.61  trkChamber eIoni
-    8    -42.2    -7.39      944         0    0.144    0.129      5.74  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -4.09 cm  -8.99 mm   94.2 cm   2.26 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -4.18 cm  -8.66 mm   94.3 cm    1.8 MeV   463 keV  1.34 mm   1.34 mm trkChamber     eIoni
+    2  -4.25 cm  -8.69 mm   94.3 cm   1.39 MeV   405 keV  1.11 mm   2.46 mm trkChamber     eIoni
+    3  -4.24 cm  -7.89 mm   94.4 cm   1.09 MeV   302 keV   910 mum  3.37 mm trkChamber     eIoni
+    4  -4.21 cm  -7.27 mm   94.4 cm    842 keV   247 keV   757 mum  4.12 mm trkChamber     eIoni
+    5  -4.18 cm  -7.71 mm   94.4 cm    560 keV   282 keV   630 mum  4.75 mm trkChamber     eIoni
+    6  -4.21 cm  -7.61 mm   94.4 cm    376 keV   183 keV   481 mum  5.24 mm trkChamber     eIoni
+    7  -4.22 cm  -7.39 mm   94.4 cm    144 keV   232 keV   374 mum  5.61 mm trkChamber     eIoni
+    8  -4.22 cm  -7.39 mm   94.4 cm      0 eV    144 keV   129 mum  5.74 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 81
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -39.7    -10.3      934      2.55        0        0         0  trkChamber initStep
-    1    -42.6    -12.1 1.02e+03      2.55        0     91.5      91.5     Tracker Transportation
-    2    -61.1    -24.1 1.62e+03      2.55        0      600       692  trkChamber Transportation
-    3    -61.3    -24.3 1.63e+03      1.19        0     8.38       700  trkChamber compt
-    4    -58.9    -25.7 1.64e+03      0.22    0.973     4.51       705  trkChamber compt
-    5    -69.5    -27.6 1.62e+03      0.22        0     16.1       721     Tracker Transportation
-    6 -1.5e+03     -274       25      0.22        0 2.16e+03  2.88e+03     WorldPV Transportation
-    7 -4.5e+03     -791 -3.34e+03      0.22        0 4.54e+03  7.42e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.97 cm  -1.03 cm   93.4 cm   2.55 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -4.26 cm  -1.21 cm   1.02 m    2.55 MeV     0 eV   9.15 cm   9.15 cm    TrackerTransportation
+    2  -6.11 cm  -2.41 cm   1.62 m    2.55 MeV     0 eV     60 cm   69.2 cm trkChamberTransportation
+    3  -6.13 cm  -2.43 cm   1.63 m    1.19 MeV     0 eV   8.38 mm     70 cm trkChamber     compt
+    4  -5.89 cm  -2.57 cm   1.64 m     220 keV   973 keV  4.51 mm   70.5 cm trkChamber     compt
+    5  -6.95 cm  -2.76 cm   1.62 m     220 keV     0 eV   1.61 cm   72.1 cm    TrackerTransportation
+    6   -1.5 m   -27.4 cm    2.5 cm    220 keV     0 eV   2.16 m    2.88 m     WorldPVTransportation
+    7   -4.5 m   -79.1 cm  -3.34 m     220 keV     0 eV   4.54 m    7.42 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 87,   Parent ID = 85
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -61.3    -24.3 1.63e+03      1.36        0        0         0  trkChamber initStep
-    1    -61.4    -24.4 1.63e+03      1.06    0.305    0.896     0.896  trkChamber eIoni
-    2    -61.6    -24.3 1.63e+03     0.794    0.264    0.741      1.64  trkChamber eIoni
-    3      -62    -24.6 1.63e+03     0.584     0.21    0.605      2.24  trkChamber eIoni
-    4    -61.9    -24.4 1.63e+03     0.398    0.186    0.494      2.74  trkChamber eIoni
-    5      -62    -24.4 1.64e+03     0.215    0.183    0.388      3.12  trkChamber eIoni
-    6    -61.9    -24.5 1.64e+03    0.0148      0.2    0.236      3.36  trkChamber eIoni
-    7    -61.9    -24.5 1.64e+03         0   0.0148  0.00565      3.37  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -6.13 cm  -2.43 cm   1.63 m    1.36 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -6.14 cm  -2.44 cm   1.63 m    1.06 MeV   305 keV   896 mum   896 mumtrkChamber     eIoni
+    2  -6.16 cm  -2.43 cm   1.63 m     794 keV   264 keV   741 mum  1.64 mm trkChamber     eIoni
+    3   -6.2 cm  -2.46 cm   1.63 m     584 keV   210 keV   605 mum  2.24 mm trkChamber     eIoni
+    4  -6.19 cm  -2.44 cm   1.63 m     398 keV   186 keV   494 mum  2.74 mm trkChamber     eIoni
+    5   -6.2 cm  -2.44 cm   1.64 m     215 keV   183 keV   388 mum  3.12 mm trkChamber     eIoni
+    6  -6.19 cm  -2.45 cm   1.64 m    14.8 keV   200 keV   236 mum  3.36 mm trkChamber     eIoni
+    7  -6.19 cm  -2.45 cm   1.64 m       0 eV   14.8 keV  5.65 mum  3.37 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -38    -5.78      837     0.136        0        0         0  trkChamber initStep
-    1      -38    -5.88      839     0.115   0.0209     2.58      2.58  trkChamber compt
-    2    -12.3     34.6      857    0.0906   0.0246     51.2      53.8  trkChamber compt
-    3    -9.63     19.4      874    0.0903 0.000338     23.1      76.9  trkChamber compt
-    4    -6.33     11.5      882    0.0713    0.019     11.3      88.1  trkChamber compt
-    5    -32.2     12.3      873    0.0642  0.00708     27.3       115  trkChamber compt
-    6    -37.2     22.6      880    0.0642   0.0642     13.4       129  trkChamber phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -3.8 cm  -5.78 mm   83.7 cm    136 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -3.8 cm  -5.88 mm   83.9 cm    115 keV  20.9 keV  2.58 mm   2.58 mm trkChamber     compt
+    2  -1.23 cm   3.46 cm   85.7 cm   90.6 keV  24.6 keV  5.12 cm   5.38 cm trkChamber     compt
+    3  -9.63 mm   1.94 cm   87.4 cm   90.3 keV   338 eV   2.31 cm   7.69 cm trkChamber     compt
+    4  -6.33 mm   1.15 cm   88.2 cm   71.3 keV    19 keV  1.13 cm   8.81 cm trkChamber     compt
+    5  -3.22 cm   1.23 cm   87.3 cm   64.2 keV  7.08 keV  2.73 cm   11.5 cm trkChamber     compt
+    6  -3.72 cm   2.26 cm     88 cm   64.2 keV  64.2 keV  1.34 cm   12.9 cm trkChamber      phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.4     -5.3      806      4.95        0        0         0     Tracker initStep
-    1    -37.7    -5.66      825      4.95        0     19.5      19.5  trkChamber Transportation
-    2    -37.8    -5.75      830     0.586        0     4.88      24.4  trkChamber compt
-    3    -44.3      101      857     0.216     0.37      110       135  trkChamber compt
-    4      -52     95.2      842     0.193   0.0228     18.3       153  trkChamber compt
-    5    -66.9     99.1      832     0.141    0.052     18.1       171  trkChamber compt
-    6    -65.1       90      825     0.141        0     11.7       183     Tracker Transportation
-    7      139     -906       25     0.141        0 1.29e+03  1.48e+03     WorldPV Transportation
-    8      874 -4.5e+03 -2.86e+03     0.141        0 4.67e+03  6.14e+03  OutOfWorld Transportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.74 cm   -5.3 mm   80.6 cm   4.95 MeV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.77 cm  -5.66 mm   82.5 cm   4.95 MeV     0 eV   1.95 cm   1.95 cm trkChamberTransportation
+    2  -3.78 cm  -5.75 mm     83 cm    586 keV     0 eV   4.88 mm   2.44 cm trkChamber     compt
+    3  -4.43 cm   10.1 cm   85.7 cm    216 keV   370 keV    11 cm   13.5 cm trkChamber     compt
+    4   -5.2 cm   9.52 cm   84.2 cm    193 keV  22.8 keV  1.83 cm   15.3 cm trkChamber     compt
+    5  -6.69 cm   9.91 cm   83.2 cm    141 keV    52 keV  1.81 cm   17.1 cm trkChamber     compt
+    6  -6.51 cm      9 cm   82.5 cm    141 keV     0 eV   1.17 cm   18.3 cm    TrackerTransportation
+    7   13.9 cm  -90.6 cm    2.5 cm    141 keV     0 eV   1.29 m    1.48 m     WorldPVTransportation
+    8   87.4 cm   -4.5 m   -2.86 m     141 keV     0 eV   4.67 m    6.14 m  OutOfWorldTransportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 88,   Parent ID = 15
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.8    -5.75      830      4.37        0        0         0  trkChamber initStep
-    1    -37.1    -5.79      832      3.49    0.881     2.39      2.39  trkChamber eIoni
-    2      -38    -6.63      834      2.78    0.708     1.95      4.34  trkChamber eIoni
-    3    -37.4    -7.41      835      2.18    0.595      1.6      5.94  trkChamber eIoni
-    4    -37.3    -7.28      836      1.23    0.956     1.31      7.24  trkChamber eIoni
-    5    -37.6    -7.86      837     0.941    0.286    0.827      8.07  trkChamber eIoni
-    6    -37.3    -8.31      837      0.63    0.311    0.681      8.75  trkChamber eIoni
-    7    -37.7    -8.18      837     0.435    0.195    0.519      9.27  trkChamber eIoni
-    8    -37.4    -8.32      837     0.239    0.195     0.41      9.68  trkChamber eIoni
-    9    -37.5    -8.33      837    0.0282    0.211    0.265      9.95  trkChamber eIoni
-   10    -37.5    -8.32      837         0   0.0282   0.0109      9.96  trkChamber eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.78 cm  -5.75 mm     83 cm   4.37 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.71 cm  -5.79 mm   83.2 cm   3.49 MeV   881 keV  2.39 mm   2.39 mm trkChamber     eIoni
+    2   -3.8 cm  -6.63 mm   83.4 cm   2.78 MeV   708 keV  1.95 mm   4.34 mm trkChamber     eIoni
+    3  -3.74 cm  -7.41 mm   83.5 cm   2.18 MeV   595 keV   1.6 mm   5.94 mm trkChamber     eIoni
+    4  -3.73 cm  -7.28 mm   83.6 cm   1.23 MeV   956 keV  1.31 mm   7.24 mm trkChamber     eIoni
+    5  -3.76 cm  -7.86 mm   83.7 cm    941 keV   286 keV   827 mum  8.07 mm trkChamber     eIoni
+    6  -3.73 cm  -8.31 mm   83.7 cm    630 keV   311 keV   681 mum  8.75 mm trkChamber     eIoni
+    7  -3.77 cm  -8.18 mm   83.7 cm    435 keV   195 keV   519 mum  9.27 mm trkChamber     eIoni
+    8  -3.74 cm  -8.32 mm   83.7 cm    239 keV   195 keV   410 mum  9.68 mm trkChamber     eIoni
+    9  -3.75 cm  -8.33 mm   83.7 cm   28.2 keV   211 keV   265 mum  9.95 mm trkChamber     eIoni
+   10  -3.75 cm  -8.32 mm   83.7 cm      0 eV   28.2 keV  10.9 mum  9.96 mm trkChamber     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 14,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -37.3    -5.28      803    0.0145        0        0         0     Tracker initStep
-    1      -36    -6.38      802   0.00799  0.00656     2.65      2.65     Tracker eIoni
-    2    -36.3    -5.64      803   0.00356  0.00258     1.52      4.17     Tracker eIoni
-    3    -36.1    -5.51      802    0.0027 0.000863     1.41      5.58     Tracker eIoni
-    4      -36    -5.55      802   0.00103  0.00167     1.26      6.84     Tracker eIoni
-    5    -36.1    -5.63      802  0.000873 0.000157    0.897      7.74     Tracker eIoni
-    6    -36.1    -5.64      802         0 0.000873    0.814      8.55     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.73 cm  -5.28 mm   80.3 cm   14.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -3.6 cm  -6.38 mm   80.2 cm   7.99 keV  6.56 keV  2.65 mm   2.65 mm    Tracker     eIoni
+    2  -3.63 cm  -5.64 mm   80.3 cm   3.56 keV  2.58 keV  1.52 mm   4.17 mm    Tracker     eIoni
+    3  -3.61 cm  -5.51 mm   80.2 cm    2.7 keV   863 eV   1.41 mm   5.58 mm    Tracker     eIoni
+    4   -3.6 cm  -5.55 mm   80.2 cm   1.03 keV  1.67 keV  1.26 mm   6.84 mm    Tracker     eIoni
+    5  -3.61 cm  -5.63 mm   80.2 cm    873 eV    157 eV    897 mum  7.74 mm    Tracker     eIoni
+    6  -3.61 cm  -5.64 mm   80.2 cm      0 eV    873 eV    814 mum  8.55 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 89,   Parent ID = 14
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -36.3    -5.64      803   0.00185        0        0         0     Tracker initStep
-    1    -36.2    -5.67      803    0.0007  0.00115      1.1       1.1     Tracker eIoni
-    2    -36.2    -5.66      803         0   0.0007     0.71      1.81     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.63 cm  -5.64 mm   80.3 cm   1.85 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.62 cm  -5.67 mm   80.3 cm    700 eV   1.15 keV   1.1 mm    1.1 mm    Tracker     eIoni
+    2  -3.62 cm  -5.66 mm   80.3 cm      0 eV    700 eV    710 mum  1.81 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 13,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.8     -4.4      711   0.00586        0        0         0     Tracker initStep
-    1    -36.2    -4.69      711   0.00425   0.0016     1.72      1.72     Tracker eIoni
-    2    -36.3    -4.26      712   0.00369  0.00056     1.51      3.23     Tracker eIoni
-    3    -36.3     -4.4      712   0.00129   0.0024     1.43      4.65     Tracker eIoni
-    4    -36.3    -4.27      712   0.00124 5.07e-05    0.969      5.62     Tracker eIoni
-    5    -36.2    -4.31      712  0.000891 0.000352    0.956      6.58     Tracker eIoni
-    6    -36.2     -4.3      712         0 0.000891    0.824       7.4     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.58 cm   -4.4 mm   71.1 cm   5.86 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.62 cm  -4.69 mm   71.1 cm   4.25 keV   1.6 keV  1.72 mm   1.72 mm    Tracker     eIoni
+    2  -3.63 cm  -4.26 mm   71.2 cm   3.69 keV   560 eV   1.51 mm   3.23 mm    Tracker     eIoni
+    3  -3.63 cm   -4.4 mm   71.2 cm   1.29 keV   2.4 keV  1.43 mm   4.65 mm    Tracker     eIoni
+    4  -3.63 cm  -4.27 mm   71.2 cm   1.24 keV  50.7 eV    969 mum  5.62 mm    Tracker     eIoni
+    5  -3.62 cm  -4.31 mm   71.2 cm    891 eV    352 eV    956 mum  6.58 mm    Tracker     eIoni
+    6  -3.62 cm   -4.3 mm   71.2 cm      0 eV    891 eV    824 mum   7.4 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 12,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2    -4.05      675   0.00122        0        0         0     Tracker initStep
-    1    -35.2    -4.06      676   0.00104 0.000181     0.95      0.95     Tracker eIoni
-    2    -35.2    -4.09      675  0.000794 0.000247      0.9      1.85     Tracker eIoni
-    3    -35.1     -4.1      675         0 0.000794    0.766      2.62     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm  -4.05 mm   67.5 cm   1.22 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.52 cm  -4.06 mm   67.6 cm   1.04 keV   181 eV    950 mum   950 mum   Tracker     eIoni
+    2  -3.52 cm  -4.09 mm   67.5 cm    794 eV    247 eV    900 mum  1.85 mm    Tracker     eIoni
+    3  -3.51 cm   -4.1 mm   67.5 cm      0 eV    794 eV    766 mum  2.62 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 11,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2    -4.04      674   0.00185        0        0         0     Tracker initStep
-    1    -35.3    -4.07      674   0.00114 0.000708      1.1       1.1     Tracker eIoni
-    2    -35.2    -3.92      674   0.00102 0.000128    0.929      2.03     Tracker eIoni
-    3    -35.1    -3.82      674   0.00092 9.55e-05    0.893      2.92     Tracker eIoni
-    4    -35.1    -3.82      674         0  0.00092    0.841      3.76     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm  -4.04 mm   67.4 cm   1.85 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.53 cm  -4.07 mm   67.4 cm   1.14 keV   708 eV    1.1 mm    1.1 mm    Tracker     eIoni
+    2  -3.52 cm  -3.92 mm   67.4 cm   1.02 keV   128 eV    929 mum  2.03 mm    Tracker     eIoni
+    3  -3.51 cm  -3.82 mm   67.4 cm    920 eV   95.5 eV    893 mum  2.92 mm    Tracker     eIoni
+    4  -3.51 cm  -3.82 mm   67.4 cm      0 eV    920 eV    841 mum  3.76 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 10,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -35.2    -4.02      672   0.00593        0        0         0     Tracker initStep
-    1    -34.8    -3.66      672   0.00306  0.00287     1.73      1.73     Tracker eIoni
-    2    -34.9    -3.41      672   0.00173  0.00133    0.917      2.64     Tracker eIoni
-    3      -35    -3.28      672    0.0013 0.000433     1.07      3.72     Tracker eIoni
-    4    -35.1    -3.29      672  0.000988 0.000314    0.971      4.69     Tracker eIoni
-    5    -35.1     -3.3      672         0 0.000988    0.882      5.57     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.52 cm  -4.02 mm   67.2 cm   5.93 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.48 cm  -3.66 mm   67.2 cm   3.06 keV  2.87 keV  1.73 mm   1.73 mm    Tracker     eIoni
+    2  -3.49 cm  -3.41 mm   67.2 cm   1.73 keV  1.33 keV   917 mum  2.64 mm    Tracker     eIoni
+    3   -3.5 cm  -3.28 mm   67.2 cm    1.3 keV   433 eV   1.07 mm   3.72 mm    Tracker     eIoni
+    4  -3.51 cm  -3.29 mm   67.2 cm    988 eV    314 eV    971 mum  4.69 mm    Tracker     eIoni
+    5  -3.51 cm   -3.3 mm   67.2 cm      0 eV    988 eV    882 mum  5.57 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -34.4    -3.54      618   0.00201        0        0         0     Tracker initStep
-    1    -34.4    -3.37      618   0.00164 0.000375     1.13      1.13     Tracker eIoni
-    2    -34.4    -3.38      618   0.00128 0.000351     1.05      2.19     Tracker eIoni
-    3    -34.3    -3.55      618   0.00122 6.71e-05    0.966      3.15     Tracker eIoni
-    4    -34.2    -3.51      618  0.000809 0.000407    0.949       4.1     Tracker eIoni
-    5    -34.2     -3.5      618         0 0.000809    0.776      4.88     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.44 cm  -3.54 mm   61.8 cm   2.01 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.44 cm  -3.37 mm   61.8 cm   1.64 keV   375 eV   1.13 mm   1.13 mm    Tracker     eIoni
+    2  -3.44 cm  -3.38 mm   61.8 cm   1.28 keV   351 eV   1.05 mm   2.19 mm    Tracker     eIoni
+    3  -3.43 cm  -3.55 mm   61.8 cm   1.22 keV  67.1 eV    966 mum  3.15 mm    Tracker     eIoni
+    4  -3.42 cm  -3.51 mm   61.8 cm    809 eV    407 eV    949 mum   4.1 mm    Tracker     eIoni
+    5  -3.42 cm   -3.5 mm   61.8 cm      0 eV    809 eV    776 mum  4.88 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -33.7    -3.18      574   0.00116        0        0         0     Tracker initStep
-    1    -33.7    -3.17      574  0.000104  0.00106    0.934     0.934     Tracker eIoni
-    2    -33.7    -3.17      574         0 0.000104    0.273      1.21     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.37 cm  -3.18 mm   57.4 cm   1.16 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.37 cm  -3.17 mm   57.4 cm    104 eV   1.06 keV   934 mum   934 mum   Tracker     eIoni
+    2  -3.37 cm  -3.17 mm   57.4 cm      0 eV    104 eV    273 mum  1.21 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -33.5    -3.06      558   0.00104        0        0         0     Tracker initStep
-    1    -33.5     -3.1      558  0.000889 0.000151      0.9       0.9     Tracker eIoni
-    2    -33.5    -3.11      558         0 0.000889    0.823      1.72     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.35 cm  -3.06 mm   55.8 cm   1.04 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.35 cm   -3.1 mm   55.8 cm    889 eV    151 eV    900 mum   900 mum   Tracker     eIoni
+    2  -3.35 cm  -3.11 mm   55.8 cm      0 eV    889 eV    823 mum  1.72 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -30.5    -1.99      357   0.00221        0        0         0     Tracker initStep
-    1    -30.4    -1.87      357  0.000531  0.00168     1.17      1.17     Tracker eIoni
-    2    -30.4    -1.88      357         0 0.000531    0.607      1.78     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.05 cm  -1.99 mm   35.7 cm   2.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -3.04 cm  -1.87 mm   35.7 cm    531 eV   1.68 keV  1.17 mm   1.17 mm    Tracker     eIoni
+    2  -3.04 cm  -1.88 mm   35.7 cm      0 eV    531 eV    607 mum  1.78 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 5,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -28.2     -1.2      207   0.00103        0        0         0     Tracker initStep
-    1    -28.2    -1.07      207  0.000854 0.000181    0.898     0.898     Tracker eIoni
-    2    -28.2    -1.08      207         0 0.000854    0.802       1.7     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.82 cm   -1.2 mm   20.7 cm   1.03 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.82 cm  -1.07 mm   20.7 cm    854 eV    181 eV    898 mum   898 mum   Tracker     eIoni
+    2  -2.82 cm  -1.08 mm   20.7 cm      0 eV    854 eV    802 mum   1.7 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -27.2   -0.786      140   0.00106        0        0         0     Tracker initStep
-    1    -27.3   -0.805      140  0.000715 0.000342    0.905     0.905     Tracker eIoni
-    2    -27.3   -0.802      140         0 0.000715    0.719      1.62     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.72 cm   -786 mum    14 cm   1.06 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.73 cm   -805 mum    14 cm    715 eV    342 eV    905 mum   905 mum   Tracker     eIoni
+    2  -2.73 cm   -802 mum    14 cm      0 eV    715 eV    719 mum  1.62 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -26.2   -0.405     74.1   0.00304        0        0         0     Tracker initStep
-    1    -26.3     -0.2       74   0.00152  0.00152     1.32      1.32     Tracker eIoni
-    2    -26.2   -0.228     74.1   0.00116 0.000355     1.02      2.35     Tracker eIoni
-    3    -26.1   -0.242     74.1  0.000706 0.000454    0.934      3.28     Tracker eIoni
-    4    -26.1   -0.235     74.1         0 0.000706    0.714      3.99     Tracker eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.62 cm   -405 mum  7.41 cm   3.04 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.63 cm   -200 mum   7.4 cm   1.52 keV  1.52 keV  1.32 mm   1.32 mm    Tracker     eIoni
+    2  -2.62 cm   -228 mum  7.41 cm   1.16 keV   355 eV   1.02 mm   2.35 mm    Tracker     eIoni
+    3  -2.61 cm   -242 mum  7.41 cm    706 eV    454 eV    934 mum  3.28 mm    Tracker     eIoni
+    4  -2.61 cm   -235 mum  7.41 cm      0 eV    706 eV    714 mum  3.99 mm    Tracker     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0      -25        0     3.16      3.81        0        0         0    TargetPV initStep
-    1      -24    0.186     4.94      3.13    0.679     2.11      2.11    TargetPV eIoni
-    2      -23     1.53     4.38       2.1     1.02     1.77      3.88    TargetPV eIoni
-    3    -22.2     1.59     3.54      1.65    0.453     1.27      5.15    TargetPV eIoni
-    4    -22.1     1.61     3.56      1.61   0.0251   0.0722      5.22    TargetPV eBrem
-    5    -21.4     1.44     4.23       1.3    0.312     1.02      6.24    TargetPV eIoni
-    6    -20.8     1.19     4.71      1.03    0.274    0.864      7.11    TargetPV eIoni
-    7    -20.7    0.679     4.26     0.364    0.662    0.725      7.83    TargetPV eIoni
-    8    -20.5    0.526     4.32     0.209    0.155    0.366       8.2    TargetPV eIoni
-    9    -20.6    0.541     4.34   0.00567    0.203    0.228      8.43    TargetPV eIoni
-   10    -20.6    0.541     4.34         0  0.00567  0.00331      8.43    TargetPV eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm      0 fm   3.16 mm   3.81 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1   -2.4 cm    186 mum  4.94 mm   3.13 MeV   679 keV  2.11 mm   2.11 mm   TargetPV     eIoni
+    2   -2.3 cm   1.53 mm   4.38 mm    2.1 MeV  1.02 MeV  1.77 mm   3.88 mm   TargetPV     eIoni
+    3  -2.22 cm   1.59 mm   3.54 mm   1.65 MeV   453 keV  1.27 mm   5.15 mm   TargetPV     eIoni
+    4  -2.21 cm   1.61 mm   3.56 mm   1.61 MeV  25.1 keV  72.2 mum  5.22 mm   TargetPV     eBrem
+    5  -2.14 cm   1.44 mm   4.23 mm    1.3 MeV   312 keV  1.02 mm   6.24 mm   TargetPV     eIoni
+    6  -2.08 cm   1.19 mm   4.71 mm   1.03 MeV   274 keV   864 mum  7.11 mm   TargetPV     eIoni
+    7  -2.07 cm    679 mum  4.26 mm    364 keV   662 keV   725 mum  7.83 mm   TargetPV     eIoni
+    8  -2.05 cm    526 mum  4.32 mm    209 keV   155 keV   366 mum   8.2 mm   TargetPV     eIoni
+    9  -2.06 cm    541 mum  4.34 mm   5.67 keV   203 keV   228 mum  8.43 mm   TargetPV     eIoni
+   10  -2.06 cm    541 mum  4.34 mm      0 eV   5.67 keV  3.31 mum  8.43 mm   TargetPV     eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 90,   Parent ID = 2
 *********************************************************************************************************
 
-Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
-    0    -22.1     1.61     3.56    0.0139        0        0         0    TargetPV initStep
-    1    -21.7     1.76     4.09    0.0139   0.0139    0.713     0.713    TargetPV phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.21 cm   1.61 mm   3.56 mm   13.9 keV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1  -2.17 cm   1.76 mm   4.09 mm   13.9 keV  13.9 keV   713 mum   713 mum  TargetPV      phot
 >>> Event 0
     90 trajectories stored in this event.
-Idle> Idle> /tracking/verbose 0
-Idle> /run/beamOn 100
 ### Run 1 start.
-/tracking/storeTrajectory 1
+
+*********************************************************************************************************
+* G4Track Information:   Particle = mu+,   Track ID = 1,   Parent ID = 0
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm      0 fm      0 fm      1 TeV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1   -2.5 cm      0 fm   2.39 mm  1e+03 GeV   880 keV  2.39 mm   2.39 mm   TargetPV    MuIoni
+    2   -2.5 cm      0 fm   2.39 mm  1e+03 GeV     0 eV      0 fm   2.39 mm    WorldPVTransportation
+    3   -2.5 cm   4.95 nm    2.5 cm  1e+03 GeV  5.34 keV  2.26 cm    2.5 cm    TrackerTransportation
+    4   -2.5 cm   7.27 nm   4.87 cm  1e+03 GeV  6.34 keV  2.37 cm   4.87 cm    Tracker    MuIoni
+    5   -2.5 cm   9.61 Ang  8.54 cm  1e+03 GeV  9.99 keV  3.67 cm   8.54 cm    Tracker    MuIoni
+    6   -2.5 cm -3.19e+03 fm   9.14 cm  1e+03 GeV   999 eV      6 mm   9.14 cm    Tracker    MuIoni
+    7   -2.5 cm  -7.11 nm   15.9 cm  1e+03 GeV  18.1 keV  6.75 cm   15.9 cm    Tracker    MuIoni
+    8   -2.5 cm  -39.7 nm   22.1 cm  1e+03 GeV  10.9 keV  6.25 cm   22.1 cm    Tracker    MuIoni
+    9   -2.5 cm  -40.7 nm   43.7 cm  1e+03 GeV  55.8 keV  21.5 cm   43.7 cm    Tracker    MuIoni
+   10   -2.5 cm  -68.4 nm     60 cm  1e+03 GeV  38.9 keV  16.4 cm     60 cm    Tracker    MuIoni
+   11   -2.5 cm  -43.1 nm   65.4 cm  1e+03 GeV  13.4 keV  5.39 cm   65.4 cm    Tracker    MuIoni
+   12   -2.5 cm  -4.06 nm   70.7 cm  1e+03 GeV  11.1 keV  5.23 cm   70.7 cm    Tracker    MuIoni
+   13   -2.5 cm     23 nm   75.4 cm  1e+03 GeV  10.1 keV  4.73 cm   75.4 cm    Tracker    MuIoni
+   14   -2.5 cm   34.1 nm     77 cm  1e+03 GeV  3.86 keV  1.62 cm     77 cm    Tracker    MuIoni
+   15   -2.5 cm   53.7 nm   79.9 cm  1e+03 GeV  6.23 keV   2.9 cm   79.9 cm    Tracker    MuIoni
+   16   -2.5 cm     63 nm   81.6 cm  1e+03 GeV  5.18 keV  1.68 cm   81.6 cm    Tracker    MuIoni
+   17   -2.5 cm   70.4 nm   82.5 cm  1e+03 GeV  1.88 keV  9.11 mm   82.5 cm trkChamberTransportation
+   18   -2.5 cm    139 nm   84.6 cm  1e+03 GeV  9.08 MeV   2.1 cm   84.6 cm trkChamber    MuIoni
+   19   -2.5 cm   48.5 nm   88.8 cm  1e+03 GeV  18.6 MeV  4.24 cm   88.8 cm trkChamber    MuIoni
+   20   -2.5 cm   -114 nm   94.3 cm  1e+03 GeV  22.5 MeV  5.46 cm   94.3 cm trkChamber    MuIoni
+   21   -2.5 cm   -127 nm   95.6 cm  1e+03 GeV  5.08 MeV  1.26 cm   95.6 cm trkChamber    MuIoni
+   22   -2.5 cm   50.2 nm   1.02 m   1e+03 GeV  32.4 MeV  6.94 cm   1.03 m     TrackerTransportation
+   23   -2.5 cm  -14.3 nm   1.03 m   1e+03 GeV   972 eV   8.93 mm   1.03 m     Tracker    MuIoni
+   24   -2.5 cm   -719 nm   1.13 m   1e+03 GeV  22.7 keV    10 cm   1.13 m     Tracker    MuIoni
+   25   -2.5 cm   -731 nm   1.14 m   1e+03 GeV   278 eV   1.73 mm   1.14 m     Tracker    MuIoni
+   26   -2.5 cm  -1.86 mum  1.29 m   1e+03 GeV  36.9 keV    15 cm   1.29 m     Tracker    MuIoni
+   27   -2.5 cm  -2.16 mum  1.33 m   1e+03 GeV  10.9 keV  4.42 cm   1.33 m     Tracker    MuIoni
+   28   -2.5 cm  -2.47 mum  1.38 m   1e+03 GeV  10.8 keV  4.67 cm   1.38 m     Tracker    MuIoni
+   29   -2.5 cm  -2.54 mum  1.39 m   1e+03 GeV  2.07 keV  1.07 cm   1.39 m     Tracker    MuIoni
+   30   -2.5 cm  -3.94 mum  1.59 m   1e+03 GeV  47.5 keV    20 cm   1.59 m     Tracker    MuIoni
+   31   -2.5 cm   -4.2 mum  1.62 m   1e+03 GeV  8.31 keV  3.75 cm   1.63 m  trkChamberTransportation
+   32   -2.5 cm  -4.22 mum  1.63 m   1e+03 GeV  1.48 MeV  2.62 mm   1.63 m  trkChamber    MuIoni
+   33   -2.5 cm  -4.25 mum  1.63 m   1e+03 GeV  2.48 MeV   5.9 mm   1.63 m  trkChamber    MuIoni
+   34   -2.5 cm  -4.54 mum  1.65 m   1e+03 GeV  8.78 MeV  2.12 cm   1.65 m  trkChamber    MuIoni
+   35   -2.5 cm  -4.47 mum  1.68 m   1e+03 GeV  8.38 MeV  2.06 cm   1.68 m  trkChamber    MuIoni
+   36   -2.5 cm  -4.62 mum  1.72 m   1e+03 GeV  17.6 MeV  4.06 cm   1.72 m  trkChamber    MuIoni
+   37   -2.5 cm  -4.85 mum  1.74 m   1e+03 GeV  11.9 MeV  2.63 cm   1.74 m  trkChamber    MuIoni
+   38   -2.5 cm  -4.87 mum  1.79 m   1e+03 GeV    24 MeV   5.2 cm   1.79 m  trkChamber    MuIoni
+   39   -2.5 cm  -5.26 mum  1.82 m   1e+03 GeV  12.9 MeV  3.08 cm   1.83 m     TrackerTransportation
+   40   -2.5 cm  -6.62 mum  1.99 m   1e+03 GeV  35.5 keV  16.4 cm   1.99 m     Tracker    MuIoni
+   41   -2.5 cm  -6.98 mum  2.03 m   1e+03 GeV  9.55 keV   4.3 cm   2.03 m     Tracker    MuIoni
+   42   -2.5 cm  -7.22 mum  2.06 m   1e+03 GeV  4.14 keV   2.8 cm   2.06 m     Tracker    MuIoni
+   43   -2.5 cm  -7.91 mum  2.14 m   1e+03 GeV  17.3 keV  8.08 cm   2.14 m     Tracker    MuIoni
+   44   -2.5 cm   -9.6 mum  2.34 m   1e+03 GeV  41.1 keV  20.2 cm   2.34 m     Tracker    MuIoni
+   45   -2.5 cm  -10.3 mum  2.42 m   1e+03 GeV    14 keV  7.51 cm   2.42 m     Tracker    MuIoni
+   46   -2.5 cm  -10.4 mum  2.42 m   1e+03 GeV   2.2 keV  7.02 mm   2.43 m  trkChamberTransportation
+   47   -2.5 cm  -10.8 mum  2.51 m   1e+03 GeV  34.3 MeV  8.12 cm   2.51 m  trkChamber    MuIoni
+   48   -2.5 cm  -10.8 mum  2.52 m   1e+03 GeV  3.65 MeV  8.93 mm   2.52 m  trkChamber    MuIoni
+   49   -2.5 cm  -10.9 mum  2.52 m   1e+03 GeV  3.75 MeV   9.8 mm   2.52 m  trkChamber    MuIoni
+   50   -2.5 cm  -10.8 mum  2.55 m   1e+03 GeV     8 MeV  2.01 cm   2.55 m  trkChamber    MuIoni
+   51   -2.5 cm  -10.5 mum  2.59 m   1e+03 GeV  18.7 MeV  4.46 cm   2.59 m  trkChamber    MuIoni
+   52   -2.5 cm  -10.3 mum   2.6 m   1e+03 GeV  7.07 MeV  1.34 cm    2.6 m  trkChamber    MuIoni
+   53   -2.5 cm  -10.1 mum  2.61 m   1e+03 GeV  4.13 MeV  1.04 cm   2.61 m  trkChamber    MuIoni
+   54   -2.5 cm  -9.98 mum  2.62 m   1e+03 GeV  5.12 MeV  1.16 cm   2.63 m     TrackerTransportation
+   55   -2.5 cm  -8.92 mum  2.71 m   1e+03 GeV  19.7 keV  8.23 cm   2.71 m     Tracker    MuIoni
+   56   -2.5 cm  -7.02 mum  2.86 m   1e+03 GeV  35.3 keV    15 cm   2.86 m     Tracker    MuIoni
+   57   -2.5 cm  -6.33 mum  2.91 m   1e+03 GeV  11.9 keV  5.22 cm   2.91 m     Tracker    MuIoni
+   58   -2.5 cm  -4.17 mum  3.08 m   1e+03 GeV  31.5 keV  16.8 cm   3.08 m     Tracker    MuIoni
+   59   -2.5 cm  -3.54 mum  3.12 m   1e+03 GeV  8.34 keV  4.73 cm   3.12 m     Tracker    MuIoni
+   60   -2.5 cm   -2.8 mum  3.18 m   1e+03 GeV  11.2 keV  5.47 cm   3.18 m     Tracker    MuIoni
+   61   -2.5 cm  -2.59 mum  3.19 m   1e+03 GeV  3.42 keV  1.52 cm   3.19 m     Tracker    MuIoni
+   62   -2.5 cm  -2.17 mum  3.23 m   1e+03 GeV  8.54 keV   3.1 cm   3.23 m  trkChamberTransportation
+   63   -2.5 cm  -1.86 mum  3.24 m   1e+03 GeV  7.18 MeV  1.77 cm   3.24 m  trkChamber    MuIoni
+   64   -2.5 cm   -676 nm    3.3 m   1e+03 GeV  25.2 MeV  6.05 cm    3.3 m  trkChamber    MuIoni
+   65   -2.5 cm  -1.69 mum  3.32 m   1e+03 GeV  8.83 MeV  2.01 cm   3.32 m  trkChamber    MuIoni
+   66   -2.5 cm  -2.67 mum  3.34 m   1e+03 GeV  7.93 MeV  1.92 cm   3.34 m  trkChamber    MuIoni
+   67   -2.5 cm  -4.64 mum  3.38 m   1e+03 GeV    18 MeV  4.11 cm   3.38 m  trkChamber    MuIoni
+   68   -2.5 cm  -5.58 mum   3.4 m   1e+03 GeV   7.6 MeV  1.74 cm    3.4 m  trkChamber    MuIoni
+   69   -2.5 cm  -7.12 mum  3.42 m   1e+03 GeV  10.8 MeV  2.39 cm   3.43 m     TrackerTransportation
+   70   -2.5 cm  -14.4 mum  3.56 m   1e+03 GeV    34 keV  13.7 cm   3.56 m     Tracker    MuIoni
+   71   -2.5 cm  -27.5 mum  3.81 m   1e+03 GeV  53.4 keV  24.7 cm   3.81 m     Tracker    MuIoni
+   72   -2.5 cm  -31.4 mum  3.88 m   1e+03 GeV  18.5 keV   7.4 cm   3.88 m     Tracker    MuIoni
+   73   -2.5 cm    -32 mum  3.89 m   1e+03 GeV  1.78 keV  1.09 cm   3.89 m     Tracker    MuIoni
+   74  -2.49 cm    -39 mum  4.03 m   1e+03 GeV  30.4 keV  13.1 cm   4.03 m  trkChamberTransportation
+   75  -2.49 cm  -44.4 mum  4.13 m     999 GeV  44.8 MeV  10.2 cm   4.13 m  trkChamber    MuIoni
+   76   -2.5 cm  -47.4 mum  4.22 m     999 GeV    44 MeV  9.77 cm   4.23 m     TrackerTransportation
+   77   -2.5 cm  -48.4 mum  4.25 m     999 GeV  4.43 keV  2.43 cm   4.25 m     Tracker    MuIoni
+   78   -2.5 cm  -51.6 mum  4.33 m     999 GeV  19.8 keV  7.78 cm   4.33 m     Tracker    MuIoni
+   79   -2.5 cm  -52.3 mum  4.34 m     999 GeV  4.68 keV  1.63 cm   4.34 m     Tracker    MuIoni
+   80   -2.5 cm  -60.4 mum  4.54 m     999 GeV  44.6 keV  19.8 cm   4.54 m     Tracker    MuIoni
+   81   -2.5 cm  -61.2 mum  4.56 m     999 GeV  4.24 keV  2.03 cm   4.56 m     Tracker    MuIoni
+   82   -2.5 cm  -65.1 mum  4.66 m     999 GeV  24.7 keV  9.74 cm   4.66 m     Tracker    MuIoni
+   83   -2.5 cm    -68 mum  4.73 m     999 GeV  12.6 keV  7.09 cm   4.73 m     Tracker    MuIoni
+   84   -2.5 cm  -70.4 mum  4.79 m     999 GeV  12.9 keV  5.73 cm   4.79 m     Tracker    MuIoni
+   85   -2.5 cm  -71.6 mum  4.82 m     999 GeV  7.22 keV  2.78 cm   4.82 m     Tracker    MuIoni
+   86   -2.5 cm  -75.7 mum  4.92 m     999 GeV    24 keV  10.1 cm   4.92 m     Tracker    MuIoni
+   87   -2.5 cm  -76.3 mum  4.93 m     999 GeV  3.13 keV   1.5 cm   4.93 m     Tracker    MuIoni
+   88   -2.5 cm  -80.2 mum  5.03 m     999 GeV  18.9 keV   9.4 cm   5.03 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 76,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -76.3 mum  4.93 m    9.41 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 75,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -75.7 mum  4.92 m    1.51 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 74,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -71.6 mum  4.82 m    1.03 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 73,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -70.4 mum  4.79 m    3.89 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 72,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm    -68 mum  4.73 m    30.2 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -65.1 mum  4.66 m    1.26 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 70,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -61.2 mum  4.56 m    4.72 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 69,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -60.4 mum  4.54 m    2.16 keV     0 eV      0 fm      0 fm OutOfWorld   initStep
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 68,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -52.3 mum  4.34 m    5.05 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.55 cm    152 mum  4.34 m    3.35 keV  1.71 keV  1.62 mm   1.62 mm    Tracker     eIoni
+    2  -2.55 cm   -139 mum  4.34 m     1.6 keV  1.75 keV  1.37 mm   2.99 mm    Tracker     eIoni
+    3  -2.55 cm   49.5 mum  4.34 m     1.2 keV   395 eV   1.04 mm   4.03 mm    Tracker     eIoni
+    4  -2.55 cm    -82 mum  4.34 m     914 eV    286 eV    945 mum  4.98 mm    Tracker     eIoni
+    5  -2.55 cm    -69 mum  4.34 m       0 eV    914 eV    838 mum  5.82 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 67,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -51.6 mum  4.33 m    5.56 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.47 cm    268 mum  4.33 m    2.68 keV  2.89 keV  1.68 mm   1.68 mm    Tracker     eIoni
+    2  -2.45 cm    298 mum  4.33 m    1.44 keV  1.24 keV  1.26 mm   2.94 mm    Tracker     eIoni
+    3  -2.46 cm    162 mum  4.33 m    1.04 keV   398 eV   1.01 mm   3.95 mm    Tracker     eIoni
+    4  -2.45 cm    272 mum  4.33 m     932 eV    109 eV    900 mum  4.85 mm    Tracker     eIoni
+    5  -2.45 cm    277 mum  4.33 m       0 eV    932 eV    849 mum   5.7 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 66,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -48.4 mum  4.25 m    6.62 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.46 cm    418 mum  4.25 m    2.93 keV  2.67 keV  1.15 mm   1.15 mm    Tracker     eIoni
+    2  -2.44 cm    343 mum  4.25 m    1.71 keV  1.21 keV   1.3 mm   2.46 mm    Tracker     eIoni
+    3  -2.44 cm    170 mum  4.25 m     1.2 keV   515 eV   1.07 mm   3.53 mm    Tracker     eIoni
+    4  -2.44 cm    127 mum  4.25 m     353 eV    846 eV    944 mum  4.47 mm    Tracker     eIoni
+    5  -2.44 cm    125 mum  4.25 m       0 eV    353 eV    493 mum  4.96 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 77,   Parent ID = 66
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.46 cm    418 mum  4.25 m    1.03 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.46 cm    360 mum  4.25 m     387 eV    638 eV    896 mum   896 mum   Tracker     eIoni
+    2  -2.46 cm    364 mum  4.25 m       0 eV    387 eV    516 mum  1.41 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.49 cm  -44.4 mum  4.13 m    1.45 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.46 cm    667 mum  4.13 m    1.15 MeV   295 keV   938 mum   938 mumtrkChamber     eIoni
+    2   -2.4 cm    863 mum  4.13 m     888 keV   263 keV   788 mum  1.73 mm trkChamber     eIoni
+    3  -2.35 cm    600 mum  4.13 m     696 keV   191 keV   654 mum  2.38 mm trkChamber     eIoni
+    4  -2.32 cm    993 mum  4.13 m     424 keV   272 keV   554 mum  2.93 mm trkChamber     eIoni
+    5  -2.32 cm    890 mum  4.13 m     347 keV  64.1 keV   144 mum  3.08 mm trkChamber     eBrem
+    6  -2.33 cm    653 mum  4.13 m     190 keV   157 keV   355 mum  3.43 mm trkChamber     eIoni
+    7  -2.33 cm    604 mum  4.13 m       0 eV    190 keV   198 mum  3.63 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 65
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.32 cm    890 mum  4.13 m    13.2 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.36 cm    776 mum  4.13 m    13.2 keV  13.2 keV   404 mum   404 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 64,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm    -32 mum  3.89 m    1.43 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm    -22 mum  3.89 m     565 eV    862 eV      1 mm      1 mm    Tracker     eIoni
+    2   -2.5 cm  -17.1 mum  3.89 m       0 eV    565 eV    628 mum  1.63 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 63,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -31.4 mum  3.88 m     3.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.46 cm    153 mum  3.88 m    2.66 keV   636 eV   1.37 mm   1.37 mm    Tracker     eIoni
+    2  -2.43 cm   7.98 mum  3.88 m    1.94 keV   717 eV   1.26 mm   2.62 mm    Tracker     eIoni
+    3  -2.42 cm    176 mum  3.88 m    1.71 keV   231 eV   1.12 mm   3.74 mm    Tracker     eIoni
+    4  -2.42 cm    142 mum  3.88 m    37.3 eV   1.68 keV  1.07 mm   4.81 mm    Tracker     eIoni
+    5  -2.42 cm    143 mum  3.88 m       0 eV   37.3 eV    108 mum  4.92 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 62,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -27.5 mum  3.81 m    1.32 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm  -14.5 mum  3.81 m     785 eV    535 eV    976 mum   976 mum   Tracker     eIoni
+    2  -2.51 cm  -3.12 mum  3.81 m       0 eV    785 eV    761 mum  1.74 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 61,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -14.4 mum  3.56 m     4.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm    444 mum  3.56 m    2.69 keV  1.41 keV  1.49 mm   1.49 mm    Tracker     eIoni
+    2  -2.49 cm    350 mum  3.56 m    1.05 keV  1.63 keV  1.26 mm   2.75 mm    Tracker     eIoni
+    3   -2.5 cm    274 mum  3.56 m     944 eV    108 eV    903 mum  3.65 mm    Tracker     eIoni
+    4   -2.5 cm    293 mum  3.56 m       0 eV    944 eV    856 mum  4.51 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 60,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -5.58 mum   3.4 m    26.5 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.21 cm   3.01 mm   3.41 m    21.4 MeV  5.08 MeV  1.31 cm   1.31 cm trkChamber     eIoni
+    2  -2.08 cm   4.53 mm   3.42 m    1.13 MeV  2.25 MeV  5.44 mm   1.86 cm trkChamber     eBrem
+    3  -2.06 cm   5.04 mm   3.42 m     877 keV   252 keV   777 mum  1.93 cm trkChamber     eIoni
+    4  -2.04 cm   4.87 mm   3.42 m     639 keV   237 keV   648 mum     2 cm trkChamber     eIoni
+    5  -2.06 cm    5.1 mm   3.42 m     444 keV   195 keV   524 mum  2.05 cm trkChamber     eIoni
+    6  -2.08 cm   5.05 mm   3.42 m     275 keV   169 keV   416 mum  2.09 cm trkChamber     eIoni
+    7  -2.07 cm   5.16 mm   3.42 m     108 keV   167 keV   299 mum  2.12 cm trkChamber     eIoni
+    8  -2.07 cm   5.16 mm   3.42 m       0 eV    108 keV  80.9 mum  2.13 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 79,   Parent ID = 60
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.08 cm   4.53 mm   3.42 m      18 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -1.9 cm   6.62 mm   3.42 m      18 MeV     0 eV   7.03 mm   7.03 mm    TrackerTransportation
+    2   14.8 cm   20.1 cm   4.03 m      18 MeV     0 eV   65.2 cm   65.9 cm trkChamberTransportation
+    3   19.5 cm   25.7 cm    4.2 m    6.65 MeV     0 eV   18.7 cm   84.7 cm trkChamber     compt
+    4   21.4 cm   26.9 cm   4.22 m    6.65 MeV     0 eV   3.55 cm   88.2 cm    TrackerTransportation
+    5   75.9 cm   61.1 cm   5.03 m    6.65 MeV     0 eV   1.03 m    1.91 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 80,   Parent ID = 79
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.5 cm   25.7 cm    4.2 m    11.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   19.5 cm   25.8 cm    4.2 m    9.65 MeV   969 keV  2.82 mm   2.82 mm trkChamber     eBrem
+    2   19.6 cm   25.8 cm    4.2 m     7.9 MeV   533 keV  1.48 mm    4.3 mm trkChamber     eBrem
+    3   19.5 cm   25.9 cm    4.2 m    6.71 MeV  1.15 MeV  3.05 mm   7.35 mm trkChamber     eBrem
+    4   19.5 cm     26 cm   4.21 m    5.53 MeV  1.17 MeV  3.54 mm   1.09 cm trkChamber     eIoni
+    5   19.6 cm     26 cm   4.21 m    4.61 MeV   844 keV  1.47 mm   1.24 cm trkChamber     eBrem
+    6   19.7 cm     26 cm   4.21 m    2.46 MeV   186 keV   600 mum   1.3 cm trkChamber     eBrem
+    7   19.8 cm     26 cm   4.21 m    1.94 MeV   524 keV  1.44 mm   1.44 cm trkChamber     eIoni
+    8   19.9 cm     26 cm   4.21 m    1.54 MeV   393 keV  1.18 mm   1.56 cm trkChamber     eIoni
+    9     20 cm     26 cm   4.21 m    1.24 MeV   302 keV   988 mum  1.66 cm trkChamber     eIoni
+   10   20.1 cm   25.9 cm   4.21 m     940 keV   302 keV   835 mum  1.74 cm trkChamber     eIoni
+   11   20.1 cm     26 cm   4.21 m     695 keV   246 keV   681 mum  1.81 cm trkChamber     eIoni
+   12   20.2 cm     26 cm   4.21 m     414 keV   280 keV   553 mum  1.86 cm trkChamber     eIoni
+   13   20.2 cm     26 cm   4.21 m     156 keV   259 keV   398 mum   1.9 cm trkChamber     eIoni
+   14   20.2 cm     26 cm   4.21 m       0 eV    156 keV   146 mum  1.92 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 80
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.7 cm     26 cm   4.21 m    1.97 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   20.1 cm   25.7 cm   4.21 m    1.71 MeV   260 keV  6.51 mm   6.51 mm trkChamber     compt
+    2   21.6 cm   25.4 cm   4.22 m    1.71 MeV     0 eV   1.89 cm   2.54 cm    TrackerTransportation
+    3   1.24 m    4.68 cm   5.03 m    1.71 MeV     0 eV   1.32 m    1.34 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 84,   Parent ID = 80
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.6 cm     26 cm   4.21 m    75.7 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   20.1 cm   25.9 cm   4.21 m    64.7 keV  11.1 keV  6.23 mm   6.23 mm trkChamber     compt
+    2   19.6 cm   25.3 cm   4.22 m    64.7 keV  64.7 keV  8.36 mm   1.46 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 80
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.5 cm   25.9 cm    4.2 m    39.1 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   19.6 cm     26 cm   4.21 m    39.1 keV  39.1 keV  1.62 mm   1.62 mm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 82,   Parent ID = 80
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.6 cm   25.8 cm    4.2 m    1.22 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   19.6 cm   25.9 cm    4.2 m     498 keV   722 keV  2.13 mm   2.13 mm trkChamber     compt
+    2   15.8 cm   29.5 cm   4.22 m     427 keV    71 keV  5.62 cm   5.83 cm trkChamber     compt
+    3   15.6 cm   30.4 cm   4.22 m     427 keV     0 eV    9.1 mm   6.74 cm    TrackerTransportation
+    4  -30.9 cm    2.5 m    4.74 m     427 keV     0 eV    2.3 m    2.37 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 81,   Parent ID = 80
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   19.5 cm   25.8 cm    4.2 m     745 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   20.2 cm   26.7 cm   4.22 m     745 keV     0 eV   2.74 cm   2.74 cm    TrackerTransportation
+    2   41.1 cm   56.9 cm   5.03 m     745 keV     0 eV     88 cm   90.7 cm OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 59,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.64 mum  3.38 m    1.08 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.45 cm   -472 mum  3.38 m     858 keV   223 keV   753 mum   753 mumtrkChamber     eIoni
+    2  -2.45 cm   -839 mum  3.38 m     368 keV   490 keV   638 mum  1.39 mm trkChamber     eIoni
+    3  -2.43 cm   -880 mum  3.38 m     210 keV   158 keV   368 mum  1.76 mm trkChamber     eIoni
+    4  -2.44 cm   -911 mum  3.38 m    42.5 keV   168 keV   229 mum  1.99 mm trkChamber     eIoni
+    5  -2.44 cm   -913 mum  3.38 m       0 eV   42.5 keV    19 mum  2.01 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -2.67 mum  3.34 m    4.28 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.45 cm  -40.7 mum  3.34 m    3.24 MeV  1.04 MeV  2.34 mm   2.34 mm trkChamber     eIoni
+    2  -2.35 cm  -74.7 mum  3.35 m    2.63 MeV   608 keV  1.83 mm   4.17 mm trkChamber     eIoni
+    3  -2.23 cm     88 mum  3.35 m    2.13 MeV   504 keV  1.53 mm    5.7 mm trkChamber     eIoni
+    4   -2.2 cm    1.2 mm   3.35 m     1.7 MeV   427 keV  1.28 mm   6.98 mm trkChamber     eIoni
+    5  -2.23 cm   2.09 mm   3.35 m    1.34 MeV   361 keV  1.07 mm   8.05 mm trkChamber     eIoni
+    6  -2.26 cm   2.87 mm   3.35 m    1.04 MeV   306 keV   886 mum  8.93 mm trkChamber     eIoni
+    7  -2.25 cm   3.53 mm   3.35 m     757 keV   278 keV   730 mum  9.66 mm trkChamber     eIoni
+    8  -2.27 cm   3.96 mm   3.35 m     537 keV   220 keV   586 mum  1.02 cm trkChamber     eIoni
+    9  -2.28 cm   3.91 mm   3.35 m     357 keV   180 keV   469 mum  1.07 cm trkChamber     eIoni
+   10  -2.26 cm   4.02 mm   3.35 m     162 keV   195 keV   361 mum  1.11 cm trkChamber     eIoni
+   11  -2.25 cm   4.01 mm   3.35 m       0 eV    162 keV   155 mum  1.12 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 57,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -1.69 mum  3.32 m    2.01 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.46 cm  -15.8 mum  3.32 m    1.55 MeV   463 keV  1.22 mm   1.22 mm trkChamber     eIoni
+    2  -2.39 cm   -611 mum  3.32 m    1.22 MeV   331 keV   991 mum  2.21 mm trkChamber     eIoni
+    3   -2.4 cm  -1.03 mm   3.32 m     968 keV   252 keV   824 mum  3.04 mm trkChamber     eIoni
+    4  -2.35 cm   -987 mum  3.32 m     725 keV   243 keV   695 mum  3.73 mm trkChamber     eIoni
+    5  -2.33 cm   -625 mum  3.32 m     533 keV   193 keV   569 mum   4.3 mm trkChamber     eIoni
+    6  -2.32 cm   -493 mum  3.32 m     222 keV   310 keV   466 mum  4.77 mm trkChamber     eIoni
+    7  -2.32 cm   -435 mum  3.32 m    28.9 keV   193 keV   245 mum  5.01 mm trkChamber     eIoni
+    8  -2.32 cm   -433 mum  3.32 m       0 eV   28.9 keV  11.2 mum  5.02 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 56,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -676 nm    3.3 m     1.2 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.53 cm   97.2 mum   3.3 m     939 keV   258 keV   813 mum   813 mumtrkChamber     eIoni
+    2   -2.5 cm    591 mum   3.3 m     707 keV   232 keV   681 mum  1.49 mm trkChamber     eIoni
+    3  -2.47 cm    345 mum   3.3 m     513 keV   195 keV   560 mum  2.05 mm trkChamber     eIoni
+    4  -2.45 cm    299 mum   3.3 m     256 keV   257 keV   455 mum  2.51 mm trkChamber     eIoni
+    5  -2.46 cm    403 mum   3.3 m    89.5 keV   166 keV   281 mum  2.79 mm trkChamber     eIoni
+    6  -2.45 cm    400 mum   3.3 m       0 eV   89.5 keV    60 mum  2.85 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 55,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -1.86 mum  3.24 m    1.25 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -2.5 cm   -169 mum  3.24 m    1.02 MeV   138 keV   389 mum   389 mumtrkChamber     eBrem
+    2  -2.52 cm   -770 mum  3.24 m     666 keV   352 keV   721 mum  1.11 mm trkChamber     eIoni
+    3  -2.49 cm   -694 mum  3.24 m     474 keV   191 keV   538 mum  1.65 mm trkChamber     eIoni
+    4  -2.47 cm   -755 mum  3.24 m    47.8 keV   427 keV   433 mum  2.08 mm trkChamber     eIoni
+    5  -2.47 cm   -752 mum  3.24 m       0 eV   47.8 keV  22.5 mum   2.1 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 86,   Parent ID = 55
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -169 mum  3.24 m    95.6 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.12 cm  -1.22 cm   3.26 m    79.4 keV  16.2 keV   1.8 cm    1.8 cm trkChamber     compt
+    2   -1.8 cm   2.57 mm   3.27 m    77.9 keV  1.49 keV  1.85 cm   3.65 cm trkChamber     compt
+    3  -1.43 cm   6.54 mm   3.27 m    72.9 keV  5.03 keV  9.32 mm   4.58 cm trkChamber     compt
+    4  -1.57 cm   2.57 cm   3.28 m    72.9 keV  72.9 keV  1.96 cm   6.54 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 54,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -2.59 mum  3.19 m    2.03 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm    144 mum  3.19 m    1.01 keV  1.02 keV  1.14 mm   1.14 mm    Tracker     eIoni
+    2  -2.48 cm    264 mum  3.19 m     741 eV    268 eV    891 mum  2.03 mm    Tracker     eIoni
+    3  -2.48 cm    271 mum  3.19 m       0 eV    741 eV    735 mum  2.76 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 53,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -2.8 mum  3.18 m    1.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm   13.8 mum  3.18 m     833 eV    393 eV    952 mum   952 mum   Tracker     eIoni
+    2  -2.49 cm     12 mum  3.18 m       0 eV    833 eV    790 mum  1.74 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 52,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -3.54 mum  3.12 m    1.19 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   -126 mum  3.12 m     802 eV    392 eV    943 mum   943 mum   Tracker     eIoni
+    2   -2.5 cm   -119 mum  3.12 m       0 eV    802 eV    771 mum  1.71 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 51,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.17 mum  3.08 m    1.01 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm    104 mum  3.08 m     857 eV    149 eV    890 mum   890 mum   Tracker     eIoni
+    2   -2.5 cm    112 mum  3.08 m       0 eV    857 eV    804 mum  1.69 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 50,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -6.33 mum  2.91 m    1.63 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   41.5 mum  2.91 m    1.28 keV   353 eV   1.05 mm   1.05 mm    Tracker     eIoni
+    2   -2.5 cm  -7.81 mum  2.91 m     920 eV    359 eV    965 mum  2.02 mm    Tracker     eIoni
+    3   -2.5 cm    475 nm   2.91 m       0 eV    920 eV    841 mum  2.86 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -7.02 mum  2.86 m    4.53 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.48 cm    303 mum  2.86 m    1.62 keV  2.91 keV  1.55 mm   1.55 mm    Tracker     eIoni
+    2  -2.48 cm    245 mum  2.86 m     973 eV    649 eV   1.05 mm    2.6 mm    Tracker     eIoni
+    3  -2.48 cm    227 mum  2.86 m       0 eV    973 eV    873 mum  3.47 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 48,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -8.92 mum  2.71 m    30.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.47 cm   1.29 mm   2.71 m    25.6 keV  2.37 keV  1.38 mm   1.38 mm    Tracker     eIoni
+    2  -2.47 cm   1.34 mm   2.71 m    23.9 keV   146 eV    145 mum  1.52 mm    Tracker     eIoni
+    3  -2.51 cm    2.3 mm   2.71 m    19.5 keV  2.44 keV  1.58 mm    3.1 mm    Tracker     eIoni
+    4  -2.55 cm    246 mum  2.71 m      15 keV  4.41 keV  3.36 mm   6.46 mm    Tracker     eIoni
+    5  -2.45 cm   -343 mum  2.71 m    10.3 keV  4.78 keV  2.71 mm   9.18 mm    Tracker     eIoni
+    6  -2.35 cm   -825 mum  2.71 m    5.47 keV  4.79 keV  2.17 mm   1.14 cm    Tracker     eIoni
+    7  -2.33 cm   -432 mum  2.71 m    3.02 keV   507 eV    859 mum  1.22 cm    Tracker     eIoni
+    8  -2.33 cm   -507 mum  2.71 m     843 eV   2.18 keV  1.32 mm   1.35 cm    Tracker     eIoni
+    9  -2.34 cm   -508 mum  2.71 m       0 eV    843 eV    796 mum  1.43 cm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 90,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.33 cm   -432 mum  2.71 m    1.94 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.35 cm   -593 mum  2.71 m    1.35 keV   588 eV   1.12 mm   1.12 mm    Tracker     eIoni
+    2  -2.34 cm   -466 mum  2.71 m    1.14 keV   209 eV    984 mum   2.1 mm    Tracker     eIoni
+    3  -2.34 cm   -528 mum  2.71 m     987 eV    156 eV    929 mum  3.03 mm    Tracker     eIoni
+    4  -2.34 cm   -512 mum  2.71 m       0 eV    987 eV    881 mum  3.91 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 89,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.51 cm    2.3 mm   2.71 m    1.96 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.52 cm   2.43 mm   2.71 m    1.44 keV   529 eV   1.12 mm   1.12 mm    Tracker     eIoni
+    2  -2.52 cm   2.28 mm   2.71 m     851 eV    585 eV   1.01 mm   2.13 mm    Tracker     eIoni
+    3  -2.52 cm   2.26 mm   2.71 m       0 eV    851 eV    800 mum  2.93 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 88,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.47 cm   1.34 mm   2.71 m    1.58 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.46 cm   1.23 mm   2.71 m     950 eV    630 eV   1.04 mm   1.04 mm    Tracker     eIoni
+    2  -2.46 cm   1.21 mm   2.71 m       0 eV    950 eV    859 mum   1.9 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 87,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.47 cm   1.29 mm   2.71 m    2.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.45 cm   1.21 mm   2.71 m    1.43 keV   860 eV   1.19 mm   1.19 mm    Tracker     eIoni
+    2  -2.45 cm   1.21 mm   2.71 m     892 eV    540 eV      1 mm   2.19 mm    Tracker     eIoni
+    3  -2.45 cm    1.2 mm   2.71 m       0 eV    892 eV    824 mum  3.02 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 47,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.1 mum  2.61 m    1.22 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.54 cm  -9.61 mum  2.61 m     927 keV   297 keV   826 mum   826 mumtrkChamber     eIoni
+    2  -2.58 cm    124 mum  2.61 m     668 keV   259 keV   674 mum   1.5 mm trkChamber     eIoni
+    3  -2.56 cm    384 mum  2.61 m     474 keV   194 keV   539 mum  2.04 mm trkChamber     eIoni
+    4  -2.57 cm    531 mum  2.61 m     313 keV   161 keV   433 mum  2.47 mm trkChamber     eIoni
+    5  -2.59 cm    536 mum  2.61 m    35.7 keV   277 keV   330 mum   2.8 mm trkChamber     eIoni
+    6  -2.59 cm    539 mum  2.61 m       0 eV   35.7 keV  14.8 mum  2.82 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 46,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.3 mum   2.6 m    1.41 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.48 cm    431 mum   2.6 m    1.06 MeV   342 keV   918 mum   918 mumtrkChamber     eIoni
+    2  -2.46 cm    853 mum   2.6 m     784 keV   280 keV   744 mum  1.66 mm trkChamber     eIoni
+    3  -2.44 cm   1.22 mm    2.6 m     589 keV   195 keV   600 mum  2.26 mm trkChamber     eIoni
+    4   -2.4 cm   1.37 mm    2.6 m     371 keV   218 keV   497 mum  2.76 mm trkChamber     eIoni
+    5   -2.4 cm    1.6 mm    2.6 m     121 keV   251 keV   371 mum  3.13 mm trkChamber     eIoni
+    6   -2.4 cm   1.57 mm    2.6 m       0 eV    121 keV  96.9 mum  3.23 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 45,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.5 mum  2.59 m    1.42 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.45 cm    187 mum  2.59 m     861 keV   563 keV   927 mum   927 mumtrkChamber     eIoni
+    2  -2.44 cm   86.7 mum  2.59 m     615 keV   246 keV   640 mum  1.57 mm trkChamber     eIoni
+    3  -2.44 cm   90.8 mum  2.59 m     583 keV  3.84 keV  10.4 mum  1.58 mm trkChamber     eBrem
+    4  -2.41 cm    115 mum  2.59 m     403 keV   180 keV   494 mum  2.07 mm trkChamber     eIoni
+    5  -2.41 cm    255 mum  2.59 m     223 keV   180 keV   391 mum  2.46 mm trkChamber     eIoni
+    6  -2.42 cm    190 mum  2.59 m    58.6 keV   165 keV   246 mum  2.71 mm trkChamber     eIoni
+    7  -2.42 cm    187 mum  2.59 m       0 eV   58.6 keV  30.7 mum  2.74 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 91,   Parent ID = 45
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.44 cm   90.8 mum  2.59 m    28.4 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.93 cm   7.32 mm    2.6 m    27.8 keV   638 eV   1.07 cm   1.07 cm trkChamber     compt
+    2  -3.02 cm   6.91 mm    2.6 m    27.8 keV  27.8 keV   6.1 mm   1.68 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 44,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.8 mum  2.55 m    1.21 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.43 cm  -17.3 mum  2.55 m     947 keV   261 keV   818 mum   818 mumtrkChamber     eIoni
+    2  -2.39 cm    102 mum  2.55 m     727 keV   221 keV   685 mum   1.5 mm trkChamber     eIoni
+    3  -2.35 cm    452 mum  2.55 m     531 keV   196 keV   570 mum  2.07 mm trkChamber     eIoni
+    4  -2.34 cm    222 mum  2.55 m     321 keV   210 keV   465 mum  2.54 mm trkChamber     eIoni
+    5  -2.34 cm    273 mum  2.55 m     135 keV   187 keV   336 mum  2.87 mm trkChamber     eIoni
+    6  -2.34 cm    311 mum  2.55 m       0 eV    135 keV   115 mum  2.99 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 43,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.9 mum  2.52 m    6.97 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.52 cm  -1.87 mm   2.53 m    5.68 MeV  1.28 MeV  3.66 mm   3.66 mm trkChamber     eIoni
+    2  -2.54 cm  -2.09 mm   2.53 m    5.45 MeV   223 keV   572 mum  4.23 mm trkChamber     eBrem
+    3  -2.65 cm  -2.52 mm   2.53 m     4.4 MeV  1.04 MeV  2.92 mm   7.15 mm trkChamber     eIoni
+    4  -2.59 cm  -3.32 mm   2.53 m    3.45 MeV   950 keV   2.4 mm   9.56 mm trkChamber     eIoni
+    5  -2.59 cm  -3.92 mm   2.54 m    2.77 MeV   681 keV  1.94 mm   1.15 cm trkChamber     eIoni
+    6  -2.61 cm   -4.7 mm   2.54 m    2.23 MeV   547 keV   1.6 mm   1.31 cm trkChamber     eIoni
+    7  -2.69 cm  -5.08 mm   2.54 m    1.73 MeV   499 keV  1.33 mm   1.44 cm trkChamber     eIoni
+    8  -2.72 cm  -4.85 mm   2.54 m    1.35 MeV   381 keV  1.08 mm   1.55 cm trkChamber     eIoni
+    9  -2.73 cm  -5.45 mm   2.54 m    1.05 MeV   293 keV   888 mum  1.64 cm trkChamber     eIoni
+   10  -2.73 cm  -5.53 mm   2.54 m     914 keV   125 keV   309 mum  1.67 cm trkChamber     eBrem
+   11  -2.72 cm  -5.46 mm   2.54 m     679 keV   235 keV   667 mum  1.74 cm trkChamber     eIoni
+   12  -2.71 cm  -5.24 mm   2.54 m     473 keV   206 keV   545 mum  1.79 cm trkChamber     eIoni
+   13  -2.69 cm  -5.28 mm   2.54 m     132 keV   342 keV   433 mum  1.83 cm trkChamber     eIoni
+   14  -2.68 cm  -5.29 mm   2.54 m       0 eV    132 keV   111 mum  1.84 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 93,   Parent ID = 43
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.73 cm  -5.53 mm   2.54 m    14.3 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.75 cm  -5.66 mm   2.54 m    14.3 keV  14.3 keV   334 mum   334 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 92,   Parent ID = 43
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.54 cm  -2.09 mm   2.53 m    13.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.54 cm   -2.1 mm   2.53 m    13.5 keV  13.5 keV  26.1 mum  26.1 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 42,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.8 mum  2.52 m    1.07 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.47 cm   -102 mum  2.52 m     812 keV   258 keV   748 mum   748 mumtrkChamber     eIoni
+    2  -2.47 cm   -553 mum  2.52 m     578 keV   198 keV   510 mum  1.26 mm trkChamber     eBrem
+    3  -2.44 cm   -805 mum  2.52 m     391 keV   187 keV   491 mum  1.75 mm trkChamber     eIoni
+    4  -2.42 cm   -873 mum  2.52 m     240 keV   151 keV   383 mum  2.13 mm trkChamber     eIoni
+    5  -2.43 cm   -856 mum  2.52 m    48.5 keV   192 keV   265 mum   2.4 mm trkChamber     eIoni
+    6  -2.42 cm   -856 mum  2.52 m       0 eV   48.5 keV    23 mum  2.42 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 94,   Parent ID = 42
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.47 cm   -553 mum  2.52 m    36.1 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.47 cm   -516 mum  2.52 m    32.8 keV  3.29 keV  38.6 mum  38.6 mumtrkChamber     compt
+    2  -2.58 cm  -4.58 mm   2.52 m    32.8 keV  32.8 keV  7.84 mm   7.88 mm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 41,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.8 mum  2.51 m    1.61 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.48 cm   -157 mum  2.51 m    1.06 MeV   545 keV  1.02 mm   1.02 mm trkChamber     eIoni
+    2  -2.49 cm  -75.2 mum  2.51 m     700 keV   362 keV   743 mum  1.76 mm trkChamber     eIoni
+    3   -2.5 cm   -298 mum  2.51 m     388 keV   312 keV   556 mum  2.32 mm trkChamber     eIoni
+    4  -2.48 cm   -423 mum  2.51 m     228 keV   160 keV   382 mum   2.7 mm trkChamber     eIoni
+    5  -2.49 cm   -517 mum  2.51 m    39.6 keV   188 keV   251 mum  2.95 mm trkChamber     eIoni
+    6  -2.49 cm   -515 mum  2.51 m       0 eV   39.6 keV  17.2 mum  2.97 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 40,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -10.3 mum  2.42 m     3.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm   96.4 mum  2.42 m    1.97 keV  1.42 keV   430 mum   430 mum   Tracker     eIoni
+    2  -2.51 cm   44.6 mum  2.42 m    1.21 keV   767 eV   1.13 mm   1.56 mm    Tracker     eIoni
+    3   -2.5 cm   37.4 mum  2.42 m    1.03 keV   181 eV    946 mum   2.5 mm    Tracker     eIoni
+    4  -2.52 cm  -8.34 mum  2.42 m     813 eV    213 eV    896 mum   3.4 mm    Tracker     eIoni
+    5  -2.52 cm   -3.8 mum  2.42 m       0 eV    813 eV    778 mum  4.18 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 39,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -9.6 mum  2.34 m    2.78 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm  -2.86 mum  2.34 m     474 eV    2.3 keV  1.28 mm   1.28 mm    Tracker     eIoni
+    2  -2.51 cm   1.73 mum  2.34 m       0 eV    474 eV    571 mum  1.85 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 38,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -7.91 mum  2.14 m     2.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm    107 mum  2.14 m     1.5 keV   896 eV   1.21 mm   1.21 mm    Tracker     eIoni
+    2  -2.51 cm   36.5 mum  2.14 m     866 eV    639 eV   1.02 mm   2.23 mm    Tracker     eIoni
+    3  -2.51 cm   25.3 mum  2.14 m       0 eV    866 eV    809 mum  3.04 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 37,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -7.22 mum  2.06 m    1.87 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm   45.6 mum  2.06 m     530 eV   1.34 keV  1.11 mm   1.11 mm    Tracker     eIoni
+    2  -2.51 cm   52.8 mum  2.06 m       0 eV    530 eV    606 mum  1.71 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 36,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -6.98 mum  2.03 m     4.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.54 cm   24.4 mum  2.03 m    2.63 keV  1.47 keV  1.49 mm   1.49 mm    Tracker     eIoni
+    2  -2.55 cm    221 mum  2.03 m    1.78 keV   850 eV   1.25 mm   2.74 mm    Tracker     eIoni
+    3  -2.54 cm    122 mum  2.03 m    1.64 keV   142 eV   1.08 mm   3.82 mm    Tracker     eIoni
+    4  -2.55 cm    161 mum  2.03 m     644 eV    994 eV   1.05 mm   4.88 mm    Tracker     eIoni
+    5  -2.55 cm    163 mum  2.03 m       0 eV    644 eV    676 mum  5.55 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 35,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -6.62 mum  1.99 m    1.54 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   9.97 mum  1.99 m     921 eV    615 eV   1.03 mm   1.03 mm    Tracker     eIoni
+    2   -2.5 cm   19.4 mum  1.99 m       0 eV    921 eV    842 mum  1.87 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 34,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.87 mum  1.79 m    2.96 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.44 cm  -1.25 mm    1.8 m    1.86 MeV  1.11 MeV  1.69 mm   1.69 mm trkChamber     eIoni
+    2  -2.44 cm  -1.24 mm    1.8 m    1.45 MeV   402 keV  1.14 mm   2.83 mm trkChamber     eIoni
+    3  -2.42 cm   -530 mum   1.8 m    1.11 MeV   341 keV   942 mum  3.78 mm trkChamber     eIoni
+    4  -2.49 cm   -437 mum   1.8 m     844 keV   269 keV   770 mum  4.55 mm trkChamber     eIoni
+    5  -2.45 cm   44.6 mum   1.8 m     616 keV   228 keV   631 mum  5.18 mm trkChamber     eIoni
+    6  -2.46 cm   18.6 mum   1.8 m     539 keV  14.7 keV  40.4 mum  5.22 mm trkChamber     eBrem
+    7  -2.48 cm   4.43 mum   1.8 m     379 keV   160 keV   470 mum  5.69 mm trkChamber     eIoni
+    8  -2.48 cm   68.5 mum   1.8 m     237 keV   142 keV   376 mum  6.06 mm trkChamber     eIoni
+    9  -2.48 cm    162 mum   1.8 m    35.3 keV   201 keV   262 mum  6.33 mm trkChamber     eIoni
+   10  -2.48 cm    161 mum   1.8 m       0 eV   35.3 keV  14.6 mum  6.34 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 95,   Parent ID = 34
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.46 cm   18.6 mum   1.8 m      62 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.48 cm  -2.28 cm   1.81 m    53.2 keV  8.81 keV  2.67 cm   2.67 cm trkChamber     compt
+    2  -2.79 cm  -2.35 cm    1.8 m    53.2 keV  53.2 keV  7.06 mm   3.38 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 33,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.85 mum  1.74 m    76.7 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.54 cm   -328 mum  1.75 m    71.8 MeV  2.53 MeV  5.67 mm   5.67 mm trkChamber     eBrem
+    2  -2.59 cm   -355 mum  1.75 m    69.5 MeV  1.64 MeV  4.17 mm   9.85 mm trkChamber     eBrem
+    3  -2.61 cm   -403 mum  1.75 m    68.9 MeV   591 keV  1.81 mm   1.17 cm trkChamber     eBrem
+    4  -2.62 cm   -418 mum  1.76 m    27.9 MeV   492 keV  1.31 mm    1.3 cm trkChamber     eBrem
+    5  -2.64 cm   -861 mum  1.76 m    26.2 MeV  1.65 MeV  4.64 mm   1.76 cm trkChamber     eBrem
+    6  -2.79 cm  -1.44 mm   1.77 m    21.3 MeV  4.49 MeV  1.01 cm   2.77 cm trkChamber     eBrem
+    7  -2.84 cm  -2.01 mm   1.77 m    18.9 MeV   902 keV  2.39 mm   3.01 cm trkChamber     eIoni
+    8  -2.85 cm   -2.1 mm   1.77 m    18.3 MeV   564 keV   799 mum  3.09 cm trkChamber     eBrem
+    9  -2.88 cm  -2.22 mm   1.77 m    13.2 MeV   392 keV  1.21 mm   3.21 cm trkChamber     eBrem
+   10   -2.9 cm  -2.29 mm   1.78 m    10.6 MeV   624 keV  1.74 mm   3.38 cm trkChamber     eIoni
+   11  -2.91 cm  -2.26 mm   1.78 m    9.52 MeV  1.09 MeV  2.96 mm   3.68 cm trkChamber     eBrem
+   12  -2.91 cm   -2.3 mm   1.78 m     6.5 MeV  79.2 keV   150 mum   3.7 cm trkChamber     eIoni
+   13  -2.92 cm  -2.22 mm   1.78 m    5.76 MeV   629 keV  1.96 mm   3.89 cm trkChamber     eBrem
+   14  -2.75 cm    124 mum  1.78 m    4.49 MeV  1.27 MeV  3.07 mm    4.2 cm trkChamber     eIoni
+   15  -2.83 cm   2.02 mm   1.78 m    2.97 MeV  1.52 MeV  2.45 mm   4.44 cm trkChamber     eIoni
+   16  -2.72 cm    3.3 mm   1.78 m    2.23 MeV   741 keV  1.69 mm   4.61 cm trkChamber     eIoni
+   17  -2.63 cm   3.85 mm   1.78 m    1.47 MeV   757 keV  1.33 mm   4.75 cm trkChamber     eIoni
+   18  -2.59 cm   4.21 mm   1.78 m    1.16 MeV   229 keV   551 mum   4.8 cm trkChamber     eBrem
+   19  -2.54 cm   4.24 mm   1.78 m     811 keV   352 keV   795 mum  4.88 cm trkChamber     eIoni
+   20  -2.58 cm    3.8 mm   1.78 m     545 keV   266 keV   614 mum  4.94 cm trkChamber     eIoni
+   21   -2.6 cm   3.53 mm   1.78 m     358 keV   187 keV   473 mum  4.99 cm trkChamber     eIoni
+   22  -2.62 cm   3.32 mm   1.78 m     197 keV   161 keV   362 mum  5.03 cm trkChamber     eIoni
+   23  -2.62 cm   3.26 mm   1.78 m     326 eV    197 keV   210 mum  5.05 cm trkChamber     eIoni
+   24  -2.62 cm   3.26 mm   1.78 m       0 eV    326 eV    454 nm   5.05 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 109,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.59 cm   4.21 mm   1.78 m    77.6 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -1.45 cm   1.72 cm   1.82 m    77.6 keV  77.6 keV  3.86 cm   3.86 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 108,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.92 cm  -2.22 mm   1.78 m     112 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.26 cm   9.77 mm   1.79 m    88.2 keV  23.7 keV  1.67 cm   1.67 cm trkChamber     compt
+    2  -1.07 cm   7.61 mm   1.78 m    65.7 keV  22.5 keV  1.73 cm    3.4 cm trkChamber     compt
+    3  -1.55 cm   9.12 mm   1.79 m    62.4 keV  3.38 keV   9.1 mm   4.31 cm trkChamber     compt
+    4  -2.37 mm   2.43 mm   1.82 m    60.5 keV   1.9 keV  4.12 cm   8.43 cm trkChamber     compt
+    5   -614 mum   1.4 mm   1.82 m    60.5 keV     0 eV   2.28 mm   8.66 cm    TrackerTransportation
+    6   1.02 m   -59.5 cm   2.42 m    60.5 keV     0 eV   1.32 m    1.41 m  trkChamberTransportation
+    7   1.02 m   -59.5 cm   2.43 m    51.1 keV     0 eV    2.8 mum  1.41 m  trkChamber     compt
+    8   1.02 m   -59.5 cm   2.42 m    51.1 keV     0 eV   4.24 mum  1.41 m     TrackerTransportation
+    9   1.06 m     2.5 m    1.45 m    51.1 keV     0 eV   3.24 m    4.65 m     WorldPVTransportation
+   10   1.09 m     4.5 m    82.3 cm   51.1 keV     0 eV    2.1 m    6.75 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 110,   Parent ID = 108
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   1.02 m   -59.5 cm   2.43 m    9.39 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   1.02 m   -59.5 cm   2.43 m       0 eV   9.39 keV  4.26 mum  4.26 mumtrkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 107,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.91 cm   -2.3 mm   1.78 m    2.94 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.03 cm  -2.45 mm   1.78 m    2.36 MeV   578 keV  1.68 mm   1.68 mm trkChamber     eIoni
+    2  -3.05 cm  -2.81 mm   1.78 m    2.06 MeV   210 keV   536 mum  2.21 mm trkChamber     eBrem
+    3  -3.06 cm  -2.83 mm   1.78 m    1.53 MeV    82 keV   223 mum  2.44 mm trkChamber     eBrem
+    4  -3.06 cm  -2.56 mm   1.78 m    1.19 MeV   341 keV   982 mum  3.42 mm trkChamber     eIoni
+    5  -3.05 cm  -2.99 mm   1.78 m     948 keV   243 keV   810 mum  4.23 mm trkChamber     eIoni
+    6  -2.99 cm  -2.77 mm   1.78 m     721 keV   227 keV   685 mum  4.91 mm trkChamber     eIoni
+    7  -2.99 cm  -2.48 mm   1.78 m     528 keV   194 keV   567 mum  5.48 mm trkChamber     eIoni
+    8     -3 cm  -2.19 mm   1.78 m     342 keV   186 keV   463 mum  5.94 mm trkChamber     eIoni
+    9  -2.99 cm  -2.22 mm   1.78 m     165 keV   177 keV   351 mum   6.3 mm trkChamber     eIoni
+   10  -2.98 cm  -2.25 mm   1.78 m       0 eV    165 keV   159 mum  6.45 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 112,   Parent ID = 107
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.06 cm  -2.83 mm   1.78 m     443 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.83 cm  -8.95 mm   1.79 m     291 keV   152 keV  1.14 cm   1.14 cm trkChamber     compt
+    2   3.56 mm  -2.13 cm   1.79 m     247 keV  43.7 keV  3.42 cm   4.56 cm trkChamber     compt
+    3   2.24 cm  -5.39 cm   1.77 m     190 keV  56.7 keV   4.2 cm   8.76 cm trkChamber     compt
+    4   2.08 cm  -5.46 cm   1.77 m     122 keV  68.2 keV  5.44 mm   9.31 cm trkChamber     compt
+    5    9.1 mm   -5.7 cm   1.78 m     111 keV    11 keV   1.8 cm   11.1 cm trkChamber     compt
+    6   6.68 mm  -5.07 cm   1.79 m     110 keV  1.59 keV  9.18 mm     12 cm trkChamber     compt
+    7  -3.52 cm    3.5 cm   1.82 m     110 keV     0 eV   10.3 cm   22.3 cm    TrackerTransportation
+    8  -1.24 m     2.5 m    2.93 m     110 keV     0 eV   2.96 m    3.18 m     WorldPVTransportation
+    9  -2.22 m     4.5 m    3.84 m     110 keV     0 eV    2.4 m    5.59 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 111,   Parent ID = 107
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -3.05 cm  -2.81 mm   1.78 m    89.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.28 cm  -5.69 mm    1.8 m    76.2 keV  13.3 keV  1.89 cm   1.89 cm trkChamber     compt
+    2  -2.18 cm  -2.14 cm    1.8 m    61.5 keV  14.7 keV  1.92 cm   3.81 cm trkChamber     compt
+    3  -1.87 cm  -9.86 mm   1.79 m    54.8 keV  6.69 keV  1.24 cm   5.05 cm trkChamber     compt
+    4  -6.18 mm  -9.52 mm   1.81 m    54.8 keV  54.8 keV  1.85 cm    6.9 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 106,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.91 cm  -2.26 mm   1.78 m    25.8 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.91 cm   -2.4 mm   1.78 m    25.8 keV  25.8 keV   520 mum   520 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 105,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.9 cm  -2.29 mm   1.78 m    1.96 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.98 cm  -2.86 mm   1.78 m    1.48 MeV   475 keV  1.19 mm   1.19 mm trkChamber     eIoni
+    2  -2.93 cm  -3.62 mm   1.78 m    1.08 MeV   406 keV   956 mum  2.15 mm trkChamber     eIoni
+    3  -2.96 cm  -4.25 mm   1.78 m     839 keV   237 keV   750 mum   2.9 mm trkChamber     eIoni
+    4  -2.94 cm  -4.78 mm   1.78 m     638 keV   201 keV   628 mum  3.53 mm trkChamber     eIoni
+    5  -2.92 cm  -5.08 mm   1.78 m     308 keV   330 keV   523 mum  4.05 mm trkChamber     eIoni
+    6   -2.9 cm  -5.05 mm   1.78 m     156 keV   152 keV   326 mum  4.38 mm trkChamber     eIoni
+    7   -2.9 cm   -5.1 mm   1.78 m       0 eV    156 keV   146 mum  4.52 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 104,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.88 cm  -2.22 mm   1.77 m    4.71 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.87 cm  -1.04 cm   1.82 m    4.71 MeV     0 eV   5.27 cm   5.27 cm    TrackerTransportation
+    2  -15.6 cm  -10.7 cm   2.42 m    4.71 MeV     0 eV   61.9 cm   67.2 cm trkChamberTransportation
+    3  -16.4 cm  -11.4 cm   2.47 m     335 keV     0 eV    4.3 cm   71.5 cm trkChamber     compt
+    4    -15 cm  -11.3 cm   2.46 m     174 keV   161 keV  1.41 cm   72.9 cm trkChamber     compt
+    5  -16.2 cm    -13 cm   2.45 m     116 keV  58.2 keV  2.35 cm   75.2 cm trkChamber     compt
+    6  -15.2 cm  -13.3 cm   2.46 m     107 keV   8.3 keV  1.18 cm   76.4 cm trkChamber     compt
+    7  -15.1 cm  -13.5 cm   2.46 m    81.5 keV  25.8 keV  2.71 mm   76.7 cm trkChamber     compt
+    8  -14.7 cm    -13 cm   2.45 m    77.7 keV  3.74 keV  9.08 mm   77.6 cm trkChamber     compt
+    9  -14.8 cm  -12.9 cm   2.45 m    70.8 keV  6.95 keV  2.88 mm   77.9 cm trkChamber     compt
+   10  -14.1 cm  -11.9 cm   2.45 m    70.8 keV  70.8 keV  1.23 cm   79.1 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 113,   Parent ID = 104
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -16.4 cm  -11.4 cm   2.47 m    4.38 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -16.4 cm  -11.4 cm   2.47 m    2.86 MeV  1.52 MeV  2.39 mm   2.39 mm trkChamber     eIoni
+    2  -16.4 cm  -11.4 cm   2.47 m     2.1 MeV   502 keV  1.09 mm   3.48 mm trkChamber     eBrem
+    3  -16.5 cm  -11.4 cm   2.47 m    1.57 MeV   536 keV  1.27 mm   4.75 mm trkChamber     eIoni
+    4  -16.5 cm  -11.4 cm   2.47 m    1.21 MeV   359 keV   999 mum  5.75 mm trkChamber     eIoni
+    5  -16.4 cm  -11.4 cm   2.47 m     930 keV   278 keV   818 mum  6.56 mm trkChamber     eIoni
+    6  -16.5 cm  -11.4 cm   2.47 m     708 keV   222 keV   676 mum  7.24 mm trkChamber     eIoni
+    7  -16.5 cm  -11.4 cm   2.47 m     517 keV   191 keV   560 mum   7.8 mm trkChamber     eIoni
+    8  -16.5 cm  -11.4 cm   2.47 m     308 keV   208 keV   457 mum  8.26 mm trkChamber     eIoni
+    9  -16.5 cm  -11.3 cm   2.47 m     144 keV   165 keV   327 mum  8.58 mm trkChamber     eIoni
+   10  -16.5 cm  -11.3 cm   2.47 m       0 eV    144 keV   128 mum  8.71 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 114,   Parent ID = 113
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -16.4 cm  -11.4 cm   2.47 m     255 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1    -18 cm  -10.5 cm   2.49 m     134 keV   121 keV  2.98 cm   2.98 cm trkChamber     compt
+    2  -17.2 cm  -9.81 cm   2.47 m     134 keV   134 keV  2.36 cm   5.34 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 103,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.85 cm   -2.1 mm   1.77 m    21.2 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.88 cm  -2.36 mm   1.78 m    21.2 keV  21.2 keV  2.67 mm   2.67 mm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 102,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.84 cm  -2.01 mm   1.77 m    1.51 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.79 cm  -1.49 mm   1.77 m    1.17 MeV   340 keV   972 mum   972 mumtrkChamber     eIoni
+    2  -2.72 cm  -1.64 mm   1.77 m     924 keV   248 keV   800 mum  1.77 mm trkChamber     eIoni
+    3  -2.68 cm  -1.34 mm   1.77 m     715 keV   209 keV   672 mum  2.44 mm trkChamber     eIoni
+    4  -2.67 cm  -1.42 mm   1.77 m     541 keV   174 keV   564 mum  3.01 mm trkChamber     eIoni
+    5  -2.66 cm  -1.23 mm   1.77 m     360 keV   181 keV   471 mum  3.48 mm trkChamber     eIoni
+    6  -2.68 cm  -1.02 mm   1.77 m     190 keV   170 keV   363 mum  3.84 mm trkChamber     eIoni
+    7  -2.67 cm  -1.04 mm   1.77 m       0 eV    190 keV   200 mum  4.04 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 101,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.79 cm  -1.44 mm   1.77 m     351 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -3.4 cm  -3.26 mm    1.8 m     153 keV   198 keV  3.57 cm   3.57 cm trkChamber     compt
+    2  -3.48 cm  -2.48 mm    1.8 m    96.2 keV  56.7 keV   3.1 mm   3.88 cm trkChamber     compt
+    3  -3.42 cm  -3.12 mm    1.8 m    91.5 keV  4.72 keV  1.57 mm   4.04 cm trkChamber     compt
+    4  -3.37 cm  -3.03 mm    1.8 m    83.3 keV  8.23 keV   590 mum   4.1 cm trkChamber     compt
+    5  -3.35 cm  -3.43 mm    1.8 m    64.5 keV  18.8 keV   520 mum  4.15 cm trkChamber     compt
+    6  -3.33 cm   1.41 cm    1.8 m    53.8 keV  10.7 keV  1.76 cm    5.9 cm trkChamber     compt
+    7  -4.43 cm  -1.82 mm   1.82 m    53.8 keV     0 eV   2.92 cm   8.83 cm    TrackerTransportation
+    8  -12.7 cm  -12.2 cm   1.99 m    46.1 keV     0 eV     22 cm   30.8 cm    Tracker     compt
+    9  -27.7 cm   6.88 cm   1.82 m    46.1 keV     0 eV   29.3 cm   60.2 cm trkChamberTransportation
+   10  -27.8 cm   6.95 cm   1.82 m    46.1 keV  46.1 keV  1.06 mm   60.3 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 115,   Parent ID = 101
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -12.7 cm  -12.2 cm   1.99 m    7.69 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -12.7 cm  -12.2 cm   1.99 m    3.55 keV  4.14 keV  1.92 mm   1.92 mm    Tracker     eIoni
+    2  -12.7 cm  -12.2 cm   1.99 m    2.79 keV   760 eV   1.41 mm   3.33 mm    Tracker     eIoni
+    3  -12.7 cm  -12.2 cm   1.99 m    1.72 keV  1.06 keV  1.28 mm   4.61 mm    Tracker     eIoni
+    4  -12.7 cm  -12.2 cm   1.99 m     769 eV    956 eV   1.07 mm   5.68 mm    Tracker     eIoni
+    5  -12.7 cm  -12.2 cm   1.99 m       0 eV    769 eV    751 mum  6.43 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 100,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.64 cm   -861 mum  1.76 m     136 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.67 cm  -2.57 mm   1.79 m     128 keV  8.82 keV  3.04 cm   3.04 cm trkChamber     compt
+    2   -2.9 cm   2.57 cm   1.82 m     128 keV     0 eV    4.5 cm   7.54 cm    TrackerTransportation
+    3  -6.88 cm     51 cm   2.42 m     128 keV     0 eV   77.2 cm   84.8 cm trkChamberTransportation
+    4  -6.98 cm   52.2 cm   2.44 m     106 keV  21.8 keV  1.96 cm   86.7 cm trkChamber     compt
+    5  -7.12 cm   52.9 cm   2.44 m    97.2 keV  8.56 keV  8.07 mm   87.5 cm trkChamber     compt
+    6  -6.66 cm   53.4 cm   2.44 m    83.4 keV  13.9 keV  6.91 mm   88.2 cm trkChamber     compt
+    7  -6.92 cm   53.7 cm   2.42 m    83.4 keV     0 eV   1.11 cm   89.3 cm    TrackerTransportation
+    8  -21.6 cm   68.4 cm   1.82 m    83.4 keV     0 eV   63.5 cm   1.53 m  trkChamberTransportation
+    9  -21.7 cm   68.6 cm   1.82 m    76.4 keV  6.99 keV  7.64 mm   1.54 m  trkChamber     compt
+   10  -21.6 cm     70 cm   1.81 m    76.4 keV     0 eV   1.44 cm   1.55 m     TrackerTransportation
+   11    1.1 cm    2.5 m    1.33 m    76.4 keV     0 eV   1.88 m    3.43 m     WorldPVTransportation
+   12   26.3 cm    4.5 m    78.8 cm   76.4 keV     0 eV   2.09 m    5.52 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 99,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.62 cm   -418 mum  1.76 m    40.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.64 cm   -461 mum  1.76 m    36.4 MeV     0 eV   2.31 mm   2.31 mm trkChamber     compt
+    2  -3.31 cm   -5.3 mm   1.82 m    36.4 MeV     0 eV   6.81 cm   7.04 cm    TrackerTransportation
+    3  -9.29 cm  -4.83 cm   2.42 m    36.4 MeV     0 eV   60.4 cm   67.5 cm trkChamberTransportation
+    4  -9.94 cm   -5.3 cm   2.49 m       0 eV      0 eV    6.6 cm   74.1 cm trkChamber      conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 118,   Parent ID = 99
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.94 cm   -5.3 cm   2.49 m    16.4 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1    -10 cm  -5.46 cm    2.5 m    13.5 MeV  2.98 MeV  8.41 mm   8.41 mm trkChamber     eIoni
+    2  -10.1 cm  -5.27 cm   2.51 m    10.9 MeV  2.53 MeV  6.95 mm   1.54 cm trkChamber     eIoni
+    3  -10.3 cm  -5.11 cm   2.51 m    4.54 MeV  1.25 MeV  3.51 mm   1.89 cm trkChamber     eBrem
+    4  -10.5 cm  -5.07 cm   2.51 m    3.78 MeV   711 keV  1.99 mm   2.09 cm trkChamber     eBrem
+    5  -10.6 cm  -4.93 cm   2.51 m    3.02 MeV   762 keV  2.15 mm    2.3 cm trkChamber     eIoni
+    6  -10.5 cm  -4.97 cm   2.51 m    2.43 MeV   587 keV  1.76 mm   2.48 cm trkChamber     eIoni
+    7  -10.6 cm  -4.99 cm   2.51 m    1.76 MeV   670 keV  1.46 mm   2.62 cm trkChamber     eIoni
+    8  -10.6 cm  -4.94 cm   2.51 m    1.44 MeV   323 keV  1.11 mm   2.73 cm trkChamber     eIoni
+    9  -10.6 cm  -4.93 cm   2.51 m    1.33 MeV  46.8 keV   144 mum  2.75 cm trkChamber     eBrem
+   10  -10.6 cm  -4.96 cm   2.51 m     909 keV   421 keV   887 mum  2.84 cm trkChamber     eIoni
+   11  -10.6 cm  -5.02 cm   2.51 m     658 keV   250 keV   666 mum   2.9 cm trkChamber     eIoni
+   12  -10.5 cm  -5.02 cm   2.51 m     477 keV   181 keV   533 mum  2.96 cm trkChamber     eIoni
+   13  -10.5 cm  -5.01 cm   2.51 m     306 keV   171 keV   433 mum     3 cm trkChamber     eIoni
+   14  -10.5 cm     -5 cm   2.51 m    90.2 keV   216 keV   321 mum  3.03 cm trkChamber     eIoni
+   15  -10.5 cm     -5 cm   2.51 m       0 eV   90.2 keV  56.9 mum  3.04 cm trkChamber     eIoni
+   16  -10.5 cm     -5 cm   2.51 m       0 eV      0 eV      0 fm   3.04 cm trkChamber   annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 123,   Parent ID = 118
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -10.5 cm     -5 cm   2.51 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -11.6 cm  -6.96 cm   2.45 m     240 keV   271 keV  6.99 cm   6.99 cm trkChamber     compt
+    2  -11.3 cm  -6.73 cm   2.45 m     229 keV  10.5 keV   3.3 mm   7.32 cm trkChamber     compt
+    3  -8.43 cm  -4.87 cm   2.42 m     229 keV     0 eV   4.12 cm   11.4 cm    TrackerTransportation
+    4   69.3 cm   44.7 cm   1.82 m     229 keV     0 eV    1.1 m    1.21 m  trkChamberTransportation
+    5     70 cm   45.2 cm   1.82 m     229 keV     0 eV   9.71 mm   1.22 m     TrackerTransportation
+    6    2.5 m     1.6 m    43.1 cm    229 keV     0 eV   2.55 m    3.77 m     WorldPVTransportation
+    7    4.5 m    2.88 m   -1.11 m     229 keV     0 eV   2.83 m     6.6 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 122,   Parent ID = 118
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -10.5 cm     -5 cm   2.51 m     511 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.91 cm  -3.79 cm   2.56 m     434 keV  77.5 keV  4.31 cm   4.31 cm trkChamber     compt
+    2   -9.4 cm  -3.84 cm   2.56 m     408 keV  25.8 keV  8.21 mm   5.14 cm trkChamber     compt
+    3   -8.8 cm  -3.45 cm   2.57 m     249 keV   159 keV   1.5 cm   6.63 cm trkChamber     compt
+    4  -9.42 cm     -3 cm   2.58 m     137 keV   112 keV  8.45 mm   7.48 cm trkChamber     compt
+    5  -2.59 cm  -3.71 cm   2.59 m    89.5 keV  47.4 keV  7.05 cm   14.5 cm trkChamber     compt
+    6  -5.27 cm  -3.61 cm   2.58 m    88.8 keV   748 eV   2.96 cm   17.5 cm trkChamber     compt
+    7  -12.3 cm  -1.09 cm   2.56 m    67.8 keV  20.9 keV  7.81 cm   25.3 cm trkChamber     compt
+    8  -10.8 cm  -1.06 cm   2.55 m    67.8 keV  67.8 keV  1.54 cm   26.8 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 121,   Parent ID = 118
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -10.6 cm  -4.93 cm   2.51 m    61.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -10.9 cm  -4.02 cm   2.52 m    50.4 keV  11.5 keV  1.01 cm   1.01 cm trkChamber     compt
+    2    -11 cm  -4.57 cm   2.51 m    44.6 keV  5.79 keV  6.23 mm   1.63 cm trkChamber     compt
+    3  -12.6 cm     -4 cm   2.52 m    38.2 keV  6.41 keV  1.99 cm   3.62 cm trkChamber     compt
+    4  -11.7 cm   -4.1 cm   2.52 m    34.2 keV  4.03 keV  9.93 mm   4.62 cm trkChamber     compt
+    5  -11.9 cm  -4.14 cm   2.52 m    34.2 keV  34.2 keV  2.73 mm   4.89 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 120,   Parent ID = 118
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -10.5 cm  -5.07 cm   2.51 m    50.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -10.9 cm  -4.83 cm   2.51 m    44.2 keV  6.31 keV  6.19 mm   6.19 mm trkChamber     compt
+    2  -10.8 cm  -5.09 cm   2.51 m    43.6 keV   610 eV   2.65 mm   8.84 mm trkChamber     compt
+    3  -10.8 cm   -5.1 cm   2.51 m    43.6 keV  43.6 keV   262 mum   9.1 mm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 119,   Parent ID = 118
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -10.3 cm  -5.11 cm   2.51 m    5.16 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -20.5 cm  -2.04 mm   2.58 m    1.33 MeV     0 eV   13.5 cm   13.5 cm trkChamber     compt
+    2  -21.6 cm   -8.3 mm    2.6 m     427 keV   900 keV  2.26 cm   15.7 cm trkChamber     compt
+    3    -21 cm  -7.06 mm    2.6 m     270 keV   158 keV  8.74 mm   16.6 cm trkChamber     compt
+    4  -21.3 cm  -2.08 mm   2.61 m     224 keV  45.7 keV  8.39 mm   17.4 cm trkChamber     compt
+    5  -21.5 cm  -2.28 mm   2.61 m     171 keV  53.4 keV  2.26 mm   17.7 cm trkChamber     compt
+    6  -22.2 cm  -2.09 cm   2.61 m     132 keV  38.1 keV     2 cm   19.7 cm trkChamber     compt
+    7  -21.5 cm  -2.92 cm   2.62 m     132 keV     0 eV   1.99 cm   21.6 cm    TrackerTransportation
+    8   3.13 cm  -32.7 cm   3.23 m     132 keV     0 eV   71.4 cm     93 cm trkChamberTransportation
+    9    3.5 cm  -33.2 cm   3.23 m    95.8 keV  36.6 keV   1.1 cm   94.1 cm trkChamber     compt
+   10   3.45 cm  -33.3 cm   3.23 m    76.2 keV  19.6 keV  2.16 mm   94.3 cm trkChamber     compt
+   11   3.68 cm  -32.5 cm   3.23 m    76.2 keV  76.2 keV  8.82 mm   95.2 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 124,   Parent ID = 119
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -20.5 cm  -2.04 mm   2.58 m    3.83 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -20.6 cm   -918 mum  2.58 m    3.05 MeV   782 keV  2.12 mm   2.12 mm trkChamber     eIoni
+    2  -20.7 cm    307 mum  2.58 m    2.48 MeV   569 keV  1.73 mm   3.85 mm trkChamber     eIoni
+    3  -20.7 cm    999 mum  2.58 m    1.94 MeV   539 keV  1.45 mm    5.3 mm trkChamber     eIoni
+    4  -20.8 cm   1.72 mm   2.58 m    1.55 MeV   388 keV  1.18 mm   6.49 mm trkChamber     eIoni
+    5  -20.9 cm   1.82 mm   2.58 m     1.2 MeV   349 keV   991 mum  7.48 mm trkChamber     eIoni
+    6  -20.9 cm   1.75 mm   2.58 m     934 keV   267 keV   814 mum  8.29 mm trkChamber     eIoni
+    7    -21 cm   1.71 mm   2.58 m     727 keV   207 keV   678 mum  8.97 mm trkChamber     eIoni
+    8  -20.9 cm   1.83 mm   2.58 m     487 keV   239 keV   570 mum  9.54 mm trkChamber     eIoni
+    9  -20.9 cm      2 mm   2.58 m     268 keV   220 keV   441 mum  9.98 mm trkChamber     eIoni
+   10  -20.9 cm   2.02 mm   2.58 m    88.1 keV   180 keV   293 mum  1.03 cm trkChamber     eIoni
+   11  -20.9 cm   2.02 mm   2.58 m       0 eV   88.1 keV  58.5 mum  1.03 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 117,   Parent ID = 99
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.94 cm   -5.3 cm   2.49 m      19 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.94 cm   -5.3 cm   2.49 m    18.8 MeV  7.72 keV  27.6 mum  27.6 mumtrkChamber     eBrem
+    2  -9.94 cm  -5.32 cm   2.49 m      18 MeV   727 keV  1.73 mm   1.76 mm trkChamber     eBrem
+    3  -9.81 cm  -5.41 cm    2.5 m    14.2 MeV   3.8 MeV  9.03 mm   1.08 cm trkChamber     eIoni
+    4  -9.61 cm  -5.44 cm   2.51 m    11.1 MeV  2.32 MeV  5.29 mm   1.61 cm trkChamber     eBrem
+    5  -9.49 cm  -5.43 cm   2.51 m    10.1 MeV   878 keV   2.5 mm   1.86 cm trkChamber     eBrem
+    6   -9.3 cm  -5.27 cm   2.51 m    8.39 MeV  1.76 MeV  5.21 mm   2.38 cm trkChamber     eIoni
+    7  -9.06 cm  -5.29 cm   2.52 m    6.86 MeV  1.53 MeV  4.36 mm   2.82 cm trkChamber     eIoni
+    8  -8.96 cm  -5.43 cm   2.52 m    5.39 MeV  1.47 MeV  3.61 mm   3.18 cm trkChamber     eIoni
+    9  -8.98 cm  -5.62 cm   2.52 m    4.36 MeV  1.03 MeV  2.89 mm   3.47 cm trkChamber     eIoni
+   10  -8.98 cm  -5.64 cm   2.52 m    2.93 MeV  82.7 keV   278 mum  3.49 cm trkChamber     eBrem
+   11  -8.95 cm   -5.8 cm   2.52 m    2.39 MeV   543 keV  1.68 mm   3.66 cm trkChamber     eIoni
+   12  -8.99 cm  -5.89 cm   2.52 m    1.92 MeV   475 keV  1.41 mm    3.8 cm trkChamber     eIoni
+   13  -9.09 cm  -5.94 cm   2.52 m    1.52 MeV   396 keV  1.17 mm   3.92 cm trkChamber     eIoni
+   14  -9.12 cm  -5.95 cm   2.52 m    1.14 MeV   377 keV   976 mum  4.02 cm trkChamber     eIoni
+   15  -9.13 cm  -5.99 cm   2.52 m     888 keV   256 keV   785 mum   4.1 cm trkChamber     eIoni
+   16  -9.14 cm  -5.95 cm   2.52 m     675 keV   213 keV   654 mum  4.16 cm trkChamber     eIoni
+   17  -9.11 cm  -5.98 cm   2.52 m     484 keV   167 keV   450 mum  4.21 cm trkChamber     eBrem
+   18  -9.11 cm  -5.98 cm   2.53 m     313 keV   171 keV   439 mum  4.25 cm trkChamber     eIoni
+   19  -9.12 cm  -5.97 cm   2.53 m     144 keV   169 keV   330 mum  4.28 cm trkChamber     eIoni
+   20  -9.13 cm  -5.97 cm   2.53 m       0 eV    144 keV   129 mum   4.3 cm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 130,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.11 cm  -5.98 cm   2.52 m    24.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.17 cm  -6.04 cm   2.53 m    24.5 keV  24.5 keV   950 mum   950 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 129,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -8.98 cm  -5.64 cm   2.52 m    1.34 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -8.38 cm  -9.89 cm   2.54 m    1.17 MeV   166 keV  4.86 cm   4.86 cm trkChamber     compt
+    2  -7.88 cm  -10.9 cm   2.55 m     603 keV   571 keV  1.22 cm   6.07 cm trkChamber     compt
+    3  -7.28 cm    -15 cm   2.52 m     476 keV   128 keV  4.95 cm     11 cm trkChamber     compt
+    4  -7.39 cm  -15.2 cm   2.52 m     346 keV   129 keV  2.08 mm   11.2 cm trkChamber     compt
+    5  -11.3 cm  -13.7 cm   2.45 m     259 keV  87.7 keV  8.34 cm   19.6 cm trkChamber     compt
+    6  -9.87 cm  -13.4 cm   2.42 m     259 keV     0 eV   2.68 cm   22.2 cm    TrackerTransportation
+    7   12.8 cm  -7.86 cm   2.07 m     199 keV     0 eV   42.6 cm   64.8 cm    Tracker     compt
+    8   1.87 m     2.5 m    2.05 m     199 keV     0 eV   3.11 m    3.76 m     WorldPVTransportation
+    9   3.22 m     4.5 m    2.04 m     199 keV     0 eV   2.41 m    6.17 m  OutOfWorldTransportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 131,   Parent ID = 129
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   12.8 cm  -7.86 cm   2.07 m    59.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   12.7 cm   -8.2 cm   2.07 m    55.4 keV  2.48 keV     5 mm      5 mm    Tracker     eIoni
+    2   12.8 cm  -8.39 cm   2.06 m    48.9 keV  3.13 keV  6.12 mm   1.11 cm    Tracker     eIoni
+    3   13.6 cm  -8.01 cm   2.06 m    41.8 keV  7.11 keV  1.09 cm    2.2 cm    Tracker     eIoni
+    4   13.7 cm  -7.73 cm   2.05 m    35.9 keV  5.95 keV  8.59 mm   3.06 cm    Tracker     eIoni
+    5   13.9 cm  -7.61 cm   2.04 m    31.7 keV  4.19 keV   6.9 mm   3.75 cm    Tracker     eIoni
+    6   13.9 cm  -7.36 cm   2.04 m      27 keV  4.71 keV  5.84 mm   4.33 cm    Tracker     eIoni
+    7     14 cm  -7.24 cm   2.04 m      24 keV  1.09 keV  2.31 mm   4.56 cm    Tracker     eIoni
+    8     14 cm   -7.1 cm   2.04 m    21.8 keV  1.02 keV  1.88 mm   4.75 cm    Tracker     eIoni
+    9   13.9 cm   -6.9 cm   2.04 m    18.6 keV  3.19 keV  3.76 mm   5.13 cm    Tracker     eIoni
+   10   13.9 cm  -6.91 cm   2.04 m    17.1 keV   130 eV    209 mum  5.15 cm    Tracker     eIoni
+   11   13.7 cm  -7.06 cm   2.04 m    13.7 keV  3.46 keV     3 mm   5.45 cm    Tracker     eIoni
+   12   13.7 cm  -6.89 cm   2.04 m      10 keV  3.64 keV  2.54 mm    5.7 cm    Tracker     eIoni
+   13   13.7 cm   -6.9 cm   2.04 m     7.1 keV  1.86 keV   452 mum  5.75 cm    Tracker     eIoni
+   14   13.6 cm  -6.88 cm   2.04 m    4.06 keV  1.72 keV  1.05 mm   5.85 cm    Tracker     eIoni
+   15   13.7 cm  -6.87 cm   2.04 m    2.56 keV   1.5 keV  1.48 mm      6 cm    Tracker     eIoni
+   16   13.7 cm  -6.87 cm   2.04 m     731 eV   1.82 keV  1.24 mm   6.12 cm    Tracker     eIoni
+   17   13.7 cm  -6.87 cm   2.04 m       0 eV    731 eV    728 mum   6.2 cm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 138,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   13.6 cm  -6.88 cm   2.04 m    1.32 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   13.6 cm  -6.87 cm   2.04 m     703 eV    620 eV    977 mum   977 mum   Tracker     eIoni
+    2   13.6 cm  -6.87 cm   2.04 m       0 eV    703 eV    712 mum  1.69 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 137,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   13.7 cm   -6.9 cm   2.04 m    1.06 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   13.6 cm   -6.9 cm   2.04 m     476 eV    587 eV    906 mum   906 mum   Tracker     eIoni
+    2   13.6 cm   -6.9 cm   2.04 m       0 eV    476 eV    573 mum  1.48 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 136,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   13.9 cm  -6.91 cm   2.04 m    1.37 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   13.9 cm   -6.9 cm   2.04 m     733 eV    633 eV    988 mum   988 mum   Tracker     eIoni
+    2   13.9 cm   -6.9 cm   2.04 m       0 eV    733 eV    730 mum  1.72 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 135,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0     14 cm   -7.1 cm   2.04 m    1.13 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1     14 cm  -7.11 cm   2.04 m     593 eV    540 eV    926 mum   926 mum   Tracker     eIoni
+    2     14 cm  -7.11 cm   2.04 m       0 eV    593 eV    645 mum  1.57 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 134,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0     14 cm  -7.24 cm   2.04 m    1.93 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1     14 cm  -7.22 cm   2.04 m    1.26 keV   668 eV   1.12 mm   1.12 mm    Tracker     eIoni
+    2     14 cm  -7.21 cm   2.04 m     810 eV    448 eV    960 mum  2.08 mm    Tracker     eIoni
+    3     14 cm  -7.21 cm   2.04 m       0 eV    810 eV    776 mum  2.85 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 133,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   12.8 cm  -8.39 cm   2.06 m    3.35 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   12.8 cm  -8.38 cm   2.06 m    1.57 keV   545 eV    953 mum   953 mum   Tracker     eIoni
+    2   12.8 cm  -8.37 cm   2.06 m     907 eV    667 eV   1.04 mm   1.99 mm    Tracker     eIoni
+    3   12.8 cm  -8.37 cm   2.06 m       0 eV    907 eV    834 mum  2.83 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 139,   Parent ID = 133
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   12.8 cm  -8.38 cm   2.06 m    1.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   12.8 cm  -8.39 cm   2.06 m    1.07 keV   160 eV    953 mum   953 mum   Tracker     eIoni
+    2   12.8 cm  -8.39 cm   2.06 m     880 eV    191 eV    909 mum  1.86 mm    Tracker     eIoni
+    3   12.8 cm  -8.38 cm   2.06 m       0 eV    880 eV    818 mum  2.68 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 132,   Parent ID = 131
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   12.7 cm   -8.2 cm   2.07 m    1.65 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   12.7 cm   -8.2 cm   2.07 m     435 eV   1.22 keV  1.06 mm   1.06 mm    Tracker     eIoni
+    2   12.7 cm   -8.2 cm   2.07 m       0 eV    435 eV    546 mum   1.6 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 128,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.49 cm  -5.43 cm   2.51 m     110 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.33 cm   -5.4 cm   2.51 m    81.7 keV  28.4 keV  2.95 mm   2.95 mm trkChamber     compt
+    2   -9.5 cm  -4.82 cm    2.5 m      80 keV  1.69 keV  8.35 mm   1.13 cm trkChamber     compt
+    3  -10.1 cm   -3.8 cm    2.5 m    73.8 keV  6.18 keV  1.23 cm   2.37 cm trkChamber     compt
+    4  -10.3 cm  -3.45 cm   2.48 m    61.4 keV  12.5 keV  2.02 cm   4.39 cm trkChamber     compt
+    5  -6.27 cm  -9.38 mm    2.5 m    61.3 keV  24.1 eV   5.23 cm   9.62 cm trkChamber     compt
+    6   -6.1 cm  -8.21 mm    2.5 m    61.3 keV  61.3 keV  2.39 mm   9.86 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 127,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.61 cm  -5.44 cm   2.51 m     757 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -8.02 cm  -4.66 cm   2.56 m     532 keV   225 keV  5.99 cm   5.99 cm trkChamber     compt
+    2  -7.18 cm  -4.95 cm   2.57 m     227 keV   305 keV  1.08 cm   7.08 cm trkChamber     compt
+    3  -6.79 cm  -4.94 cm   2.56 m     208 keV  19.1 keV  1.23 cm    8.3 cm trkChamber     compt
+    4  -5.63 cm  -5.93 cm   2.54 m     139 keV    69 keV     2 cm   10.3 cm trkChamber     compt
+    5  -5.38 cm  -5.69 cm   2.55 m     105 keV  33.3 keV  3.85 mm   10.7 cm trkChamber     compt
+    6  -4.99 cm  -7.01 cm   2.55 m    92.6 keV  12.8 keV  1.55 cm   12.2 cm trkChamber     compt
+    7  -5.01 cm  -7.19 cm   2.55 m      80 keV  12.6 keV  2.27 mm   12.5 cm trkChamber     compt
+    8  -8.08 cm  -8.31 cm   2.56 m    76.9 keV  3.11 keV  3.43 cm   15.9 cm trkChamber     compt
+    9  -8.15 cm  -8.45 cm   2.56 m    64.3 keV  12.6 keV  1.72 mm   16.1 cm trkChamber     compt
+   10  -9.65 cm  -7.13 cm   2.56 m    64.3 keV  64.3 keV  2.02 cm   18.1 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 126,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.94 cm  -5.32 cm   2.49 m    26.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -9.92 cm   -5.3 cm   2.49 m    26.9 keV  26.9 keV  2.31 mm   2.31 mm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 125,   Parent ID = 117
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -9.94 cm   -5.3 cm   2.49 m     185 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -10.2 cm  -5.65 cm   2.52 m     149 keV  35.9 keV  3.35 cm   3.35 cm trkChamber     compt
+    2  -4.24 cm  -10.3 cm   2.55 m     101 keV  48.6 keV  8.05 cm   11.4 cm trkChamber     compt
+    3  -6.38 cm  -5.35 cm   2.57 m    94.5 keV  6.25 keV  5.78 cm   17.2 cm trkChamber     compt
+    4  -5.94 cm   -3.8 cm   2.57 m    70.9 keV  23.6 keV  1.63 cm   18.8 cm trkChamber     compt
+    5  -6.38 cm  -4.21 cm   2.57 m    70.9 keV  70.9 keV  6.95 mm   19.5 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 116,   Parent ID = 99
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.64 cm   -461 mum  1.76 m    3.99 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.72 cm    214 mum  1.76 m    3.19 MeV   791 keV   2.2 mm    2.2 mm trkChamber     eIoni
+    2  -2.74 cm   1.13 mm   1.76 m    1.33 MeV   619 keV  1.75 mm   3.95 mm trkChamber     eIoni
+    3  -2.82 cm    994 mum  1.76 m       1 MeV   328 keV   881 mum  4.83 mm trkChamber     eIoni
+    4  -2.77 cm    544 mum  1.76 m     710 keV   295 keV   714 mum  5.55 mm trkChamber     eIoni
+    5  -2.73 cm    589 mum  1.76 m     520 keV   190 keV   561 mum  6.11 mm trkChamber     eIoni
+    6   -2.7 cm    881 mum  1.76 m     311 keV   208 keV   459 mum  6.57 mm trkChamber     eIoni
+    7   -2.7 cm   1.04 mm   1.76 m    98.6 keV   213 keV   329 mum   6.9 mm trkChamber     eIoni
+    8   -2.7 cm   1.03 mm   1.76 m       0 eV   98.6 keV  70.1 mum  6.97 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 140,   Parent ID = 116
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.74 cm   1.13 mm   1.76 m    1.24 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.81 cm   1.37 mm   1.76 m     786 keV   455 keV   835 mum   835 mumtrkChamber     eIoni
+    2  -2.85 cm   1.81 mm   1.76 m     577 keV   209 keV   601 mum  1.44 mm trkChamber     eIoni
+    3  -2.81 cm   1.85 mm   1.76 m     368 keV   209 keV   490 mum  1.93 mm trkChamber     eIoni
+    4  -2.78 cm   1.95 mm   1.76 m     219 keV   149 keV   369 mum   2.3 mm trkChamber     eIoni
+    5  -2.77 cm   1.87 mm   1.76 m    63.2 keV   156 keV   241 mum  2.54 mm trkChamber     eIoni
+    6  -2.77 cm   1.88 mm   1.76 m       0 eV   63.2 keV  34.6 mum  2.57 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 98,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.61 cm   -403 mum  1.75 m    12.5 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.61 cm   -409 mum  1.75 m    12.5 keV  12.5 keV   195 mum   195 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 97,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.59 cm   -355 mum  1.75 m     683 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.17 cm  -3.68 mm   1.82 m     683 keV     0 eV   7.33 cm   7.33 cm    TrackerTransportation
+    2  -7.88 cm   -3.1 cm   2.42 m     683 keV     0 eV   60.2 cm   67.6 cm trkChamberTransportation
+    3  -8.18 cm  -3.27 cm   2.46 m     609 keV  74.4 keV   3.8 cm   71.4 cm trkChamber     compt
+    4  -7.39 cm  -2.14 cm    2.5 m     450 keV   158 keV  4.06 cm   75.4 cm trkChamber     compt
+    5   2.73 mm  -7.99 mm   2.55 m     405 keV  45.9 keV  9.21 cm   84.6 cm trkChamber     compt
+    6   4.26 cm  -2.58 mm   2.62 m     405 keV     0 eV   8.49 cm   93.1 cm    TrackerTransportation
+    7   36.3 cm   4.08 cm   3.23 m     405 keV     0 eV   68.2 cm   1.61 m  trkChamberTransportation
+    8   44.1 cm   5.13 cm   3.37 m     285 keV   120 keV  16.5 cm   1.78 m  trkChamber     compt
+    9   43.5 cm   8.15 cm   3.39 m     226 keV  58.6 keV  3.69 cm   1.82 m  trkChamber     compt
+   10   41.1 cm   8.37 cm   3.41 m     135 keV  90.9 keV  3.14 cm   1.85 m  trkChamber     compt
+   11   42.1 cm   9.25 cm   3.41 m    94.1 keV  41.1 keV  1.36 cm   1.86 m  trkChamber     compt
+   12   42.1 cm   3.29 cm   3.41 m    85.8 keV  8.28 keV  5.98 cm   1.92 m  trkChamber     compt
+   13   42.4 cm   2.59 cm   3.42 m    70.4 keV  15.4 keV  1.27 cm   1.93 m  trkChamber     compt
+   14   41.6 cm   6.08 mm   3.39 m    70.4 keV  70.4 keV  3.16 cm   1.96 m  trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 96,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.54 cm   -328 mum  1.75 m    2.43 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.71 cm   -1.1 mm   1.76 m     772 keV     0 eV   1.27 cm   1.27 cm trkChamber     compt
+    2  -8.82 mm   7.63 cm   1.82 m     266 keV     0 eV   10.2 cm   11.5 cm trkChamber     compt
+    3  -4.47 cm   8.39 cm   1.81 m     191 keV  74.3 keV  3.98 cm   15.4 cm trkChamber     compt
+    4  -5.47 cm   10.6 cm   1.82 m     161 keV  30.2 keV   2.9 cm   18.3 cm trkChamber     compt
+    5  -5.48 cm   10.6 cm   1.82 m     161 keV     0 eV    810 mum  18.4 cm    TrackerTransportation
+    6  -12.2 cm   5.47 cm   2.42 m     161 keV     0 eV   60.6 cm     79 cm trkChamberTransportation
+    7  -12.3 cm   5.41 cm   2.43 m     153 keV  8.05 keV  7.03 mm   79.7 cm trkChamber     compt
+    8  -11.7 cm   2.15 cm   2.48 m     142 keV  10.9 keV  5.55 cm   85.3 cm trkChamber     compt
+    9  -11.1 cm   6.84 mm   2.48 m     119 keV    23 keV   1.6 cm   86.9 cm trkChamber     compt
+   10  -12.8 cm  -9.07 mm   2.47 m     114 keV  5.28 keV  2.42 cm   89.3 cm trkChamber     compt
+   11  -13.8 cm  -1.58 cm   2.48 m     106 keV  7.68 keV  1.28 cm   90.6 cm trkChamber     compt
+   12  -13.9 cm  -1.79 cm   2.48 m    81.3 keV  24.9 keV   3.7 mm   90.9 cm trkChamber     compt
+   13  -13.6 cm   3.51 mm   2.48 m    81.3 keV  81.3 keV  2.19 cm   93.1 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 142,   Parent ID = 96
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -8.82 mm   7.63 cm   1.82 m     506 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -8.63 mm   7.64 cm   1.82 m     386 keV  93.5 keV   283 mum   283 mumtrkChamber     eBrem
+    2   -8.6 mm   7.65 cm   1.82 m     227 keV   160 keV   381 mum   663 mumtrkChamber     eIoni
+    3  -8.57 mm   7.65 cm   1.82 m    38.2 keV   189 keV   250 mum   914 mumtrkChamber     eIoni
+    4  -8.58 mm   7.65 cm   1.82 m       0 eV   38.2 keV  16.3 mum   930 mumtrkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 143,   Parent ID = 142
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -8.63 mm   7.64 cm   1.82 m    26.1 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -8.24 mm   7.63 cm   1.82 m    26.1 keV  26.1 keV   653 mum   653 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 141,   Parent ID = 96
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.71 cm   -1.1 mm   1.76 m    1.66 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.76 cm  -1.82 mm   1.76 m     740 keV   918 keV  1.04 mm   1.04 mm trkChamber     eIoni
+    2  -2.72 cm  -2.16 mm   1.76 m     433 keV   306 keV   577 mum  1.62 mm trkChamber     eIoni
+    3  -2.75 cm  -2.06 mm   1.76 m     272 keV   161 keV   409 mum  2.03 mm trkChamber     eIoni
+    4  -2.76 cm  -1.96 mm   1.76 m    79.3 keV   193 keV   297 mum  2.33 mm trkChamber     eIoni
+    5  -2.76 cm  -1.97 mm   1.76 m       0 eV   79.3 keV  49.3 mum  2.38 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 32,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.62 mum  1.72 m    1.54 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.54 cm    497 mum  1.72 m     1.2 MeV   333 keV   984 mum   984 mumtrkChamber     eIoni
+    2  -2.59 cm    481 mum  1.72 m     950 keV   254 keV   816 mum   1.8 mm trkChamber     eIoni
+    3  -2.62 cm    641 mum  1.72 m     740 keV   210 keV   686 mum  2.49 mm trkChamber     eIoni
+    4   -2.6 cm    248 mum  1.72 m     543 keV   197 keV   577 mum  3.06 mm trkChamber     eIoni
+    5  -2.62 cm    342 mum  1.72 m     347 keV   196 keV   472 mum  3.53 mm trkChamber     eIoni
+    6  -2.61 cm    376 mum  1.72 m     203 keV   144 keV   354 mum  3.89 mm trkChamber     eIoni
+    7  -2.61 cm    334 mum  1.72 m    1.36 keV   202 keV   220 mum  4.11 mm trkChamber     eIoni
+    8  -2.61 cm    334 mum  1.72 m       0 eV   1.36 keV  1.62 mum  4.11 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 31,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.47 mum  1.68 m    1.84 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1   -2.5 cm   -272 mum  1.68 m    1.45 MeV   387 keV  1.13 mm   1.13 mm trkChamber     eIoni
+    2  -2.44 cm   -780 mum  1.68 m    1.12 MeV   327 keV   939 mum  2.07 mm trkChamber     eIoni
+    3   -2.4 cm  -1.05 mm   1.68 m     807 keV   315 keV   774 mum  2.85 mm trkChamber     eIoni
+    4  -2.44 cm   -854 mum  1.68 m     569 keV   238 keV   612 mum  3.46 mm trkChamber     eIoni
+    5  -2.44 cm   -908 mum  1.68 m     403 keV   166 keV   486 mum  3.94 mm trkChamber     eIoni
+    6  -2.45 cm  -1.08 mm   1.68 m     184 keV   219 keV   391 mum  4.33 mm trkChamber     eIoni
+    7  -2.45 cm  -1.02 mm   1.68 m       0 eV    184 keV   189 mum  4.52 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 30,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.54 mum  1.65 m     1.3 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.48 cm    559 mum  1.66 m     896 keV   405 keV   865 mum   865 mumtrkChamber     eIoni
+    2  -2.43 cm    216 mum  1.65 m     647 keV   249 keV   658 mum  1.52 mm trkChamber     eIoni
+    3  -2.39 cm    223 mum  1.65 m     468 keV   179 keV   528 mum  2.05 mm trkChamber     eIoni
+    4  -2.36 cm    123 mum  1.66 m     306 keV   161 keV   430 mum  2.48 mm trkChamber     eIoni
+    5  -2.36 cm    231 mum  1.65 m     162 keV   144 keV   325 mum  2.81 mm trkChamber     eIoni
+    6  -2.36 cm    278 mum  1.65 m       0 eV    162 keV   155 mum  2.96 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 29,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.25 mum  1.63 m    1.12 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.52 cm   -297 mum  1.63 m     843 keV   273 keV   771 mum   771 mumtrkChamber     eIoni
+    2  -2.57 cm  -30.5 mum  1.63 m     666 keV   177 keV   631 mum   1.4 mm trkChamber     eIoni
+    3  -2.58 cm    219 mum  1.63 m    18.8 keV   647 keV   538 mum  1.94 mm trkChamber     eIoni
+    4  -2.58 cm    220 mum  1.63 m       0 eV   18.8 keV  6.94 mum  1.95 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 28,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.22 mum  1.63 m    1.15 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.46 cm    333 mum  1.63 m     877 keV   269 keV   786 mum   786 mumtrkChamber     eIoni
+    2  -2.48 cm    868 mum  1.63 m     650 keV   227 keV   648 mum  1.43 mm trkChamber     eIoni
+    3  -2.44 cm    935 mum  1.63 m     457 keV   192 keV   529 mum  1.96 mm trkChamber     eIoni
+    4  -2.42 cm    941 mum  1.63 m     268 keV   189 keV   423 mum  2.39 mm trkChamber     eIoni
+    5  -2.41 cm    931 mum  1.63 m    27.7 keV   240 keV   293 mum  2.68 mm trkChamber     eIoni
+    6  -2.41 cm    931 mum  1.63 m       0 eV   27.7 keV  10.6 mum  2.69 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 27,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -3.94 mum  1.59 m    3.53 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   80.5 mum  1.59 m    1.64 keV   780 eV    109 mum   109 mum   Tracker     eIoni
+    2  -2.49 cm    209 mum  1.59 m     742 eV    902 eV   1.05 mm   1.16 mm    Tracker     eIoni
+    3  -2.49 cm    205 mum  1.59 m       0 eV    742 eV    735 mum   1.9 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 144,   Parent ID = 27
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   80.5 mum  1.59 m    1.11 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm    157 mum  1.59 m     814 eV    292 eV    918 mum   918 mum   Tracker     eIoni
+    2  -2.49 cm    163 mum  1.59 m       0 eV    814 eV    778 mum   1.7 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 26,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -2.54 mum  1.39 m    5.09 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.46 cm    423 mum  1.39 m    2.75 keV  1.09 keV  1.31 mm   1.31 mm    Tracker     eIoni
+    2  -2.43 cm    507 mum  1.39 m    1.44 keV   305 eV    597 mum  1.91 mm    Tracker     eIoni
+    3  -2.43 cm    418 mum  1.39 m     803 eV    636 eV   1.01 mm   2.91 mm    Tracker     eIoni
+    4  -2.43 cm    409 mum  1.39 m       0 eV    803 eV    772 mum  3.68 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 146,   Parent ID = 26
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.43 cm    507 mum  1.39 m       1 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.42 cm    423 mum  1.39 m     692 eV    310 eV    889 mum   889 mum   Tracker     eIoni
+    2  -2.42 cm    432 mum  1.39 m       0 eV    692 eV    705 mum  1.59 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 145,   Parent ID = 26
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.46 cm    423 mum  1.39 m    1.25 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.45 cm    399 mum  1.39 m     927 eV    326 eV    959 mum   959 mum   Tracker     eIoni
+    2  -2.44 cm    391 mum  1.39 m       0 eV    927 eV    846 mum   1.8 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 25,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -2.47 mum  1.38 m    4.77 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   -358 mum  1.38 m    2.25 keV   1.2 keV   1.4 mm    1.4 mm    Tracker     eIoni
+    2  -2.48 cm   -524 mum  1.38 m    1.39 keV   861 eV   1.18 mm   2.58 mm    Tracker     eIoni
+    3  -2.49 cm   -346 mum  1.38 m    1.27 keV   118 eV    993 mum  3.57 mm    Tracker     eIoni
+    4   -2.5 cm   -340 mum  1.38 m    1.05 keV   220 eV    962 mum  4.53 mm    Tracker     eIoni
+    5   -2.5 cm   -391 mum  1.38 m     546 eV    502 eV    902 mum  5.44 mm    Tracker     eIoni
+    6   -2.5 cm   -383 mum  1.38 m       0 eV    546 eV    617 mum  6.05 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 147,   Parent ID = 25
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -358 mum  1.38 m    1.32 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm   -421 mum  1.38 m    1.06 keV   266 eV    977 mum   977 mum   Tracker     eIoni
+    2   -2.5 cm   -496 mum  1.38 m     909 eV    149 eV    905 mum  1.88 mm    Tracker     eIoni
+    3   -2.5 cm   -502 mum  1.38 m       0 eV    909 eV    835 mum  2.72 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 24,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -2.16 mum  1.33 m    3.19 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm   6.24 mum  1.33 m    1.56 keV  1.63 keV   623 mum   623 mum   Tracker     eIoni
+    2  -2.51 cm  -73.4 mum  1.33 m    1.39 keV   169 eV   1.03 mm   1.66 mm    Tracker     eIoni
+    3  -2.51 cm  -30.6 mum  1.33 m    1.02 keV   369 eV    993 mum  2.65 mm    Tracker     eIoni
+    4  -2.51 cm   83.6 mum  1.33 m     888 eV    130 eV    894 mum  3.54 mm    Tracker     eIoni
+    5  -2.51 cm   94.4 mum  1.33 m       0 eV    888 eV    822 mum  4.37 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 23,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -1.86 mum  1.29 m    3.45 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.48 cm   -131 mum  1.29 m    1.01 keV  1.45 keV   610 mum   610 mum   Tracker     eIoni
+    2  -2.49 cm   -158 mum  1.29 m     823 eV    189 eV    892 mum   1.5 mm    Tracker     eIoni
+    3  -2.49 cm   -169 mum  1.29 m       0 eV    823 eV    784 mum  2.29 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 148,   Parent ID = 23
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.48 cm   -131 mum  1.29 m     994 eV      0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.48 cm   -137 mum  1.29 m       0 eV    994 eV    885 mum   885 mum   Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 22,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -731 nm   1.14 m    1.15 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm  -26.3 mum  1.14 m     153 eV    995 eV    930 mum   930 mum   Tracker     eIoni
+    2   -2.5 cm  -26.8 mum  1.14 m       0 eV    153 eV    337 mum  1.27 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 21,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -719 nm   1.13 m    1.27 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm  -36.6 mum  1.13 m     986 eV    284 eV    963 mum   963 mum   Tracker     eIoni
+    2  -2.49 cm  -16.4 mum  1.13 m       0 eV    986 eV    880 mum  1.84 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 20,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -14.3 nm   1.03 m    1.63 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm  -33.5 mum  1.03 m     472 eV   1.15 keV  1.05 mm   1.05 mm    Tracker     eIoni
+    2  -2.51 cm    -34 mum  1.03 m       0 eV    472 eV    570 mum  1.62 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 19,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -127 nm   95.6 cm   2.91 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.54 cm  -1.16 mm   95.7 cm    2.4 MeV   516 keV  1.67 mm   1.67 mm trkChamber     eIoni
+    2  -2.46 cm   -1.4 mm   95.8 cm    1.9 MeV   494 keV  1.41 mm   3.08 mm trkChamber     eIoni
+    3  -2.44 cm  -2.13 mm   95.9 cm   1.53 MeV   374 keV  1.17 mm   4.24 mm trkChamber     eIoni
+    4  -2.39 cm  -1.83 mm   95.9 cm   1.12 MeV   406 keV   979 mum  5.22 mm trkChamber     eIoni
+    5  -2.43 cm  -2.45 mm   95.9 cm    872 keV   248 keV   773 mum  5.99 mm trkChamber     eIoni
+    6  -2.47 cm  -2.28 mm     96 cm    652 keV   220 keV   646 mum  6.64 mm trkChamber     eIoni
+    7  -2.51 cm  -2.07 mm     96 cm    476 keV   176 keV   531 mum  7.17 mm trkChamber     eIoni
+    8  -2.55 cm  -1.95 mm     96 cm    324 keV   152 keV   434 mum  7.61 mm trkChamber     eIoni
+    9  -2.53 cm  -1.87 mm     96 cm    150 keV   174 keV   338 mum  7.94 mm trkChamber     eIoni
+   10  -2.52 cm  -1.84 mm     96 cm      0 eV    150 keV   138 mum  8.08 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 18,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   -114 nm   94.3 cm   1.55 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.49 cm    202 mum  94.4 cm   1.18 MeV   365 keV   989 mum   989 mumtrkChamber     eIoni
+    2  -2.41 cm   21.4 mum  94.4 cm    894 keV   288 keV   805 mum  1.79 mm trkChamber     eIoni
+    3  -2.39 cm    178 mum  94.3 cm    619 keV   276 keV   657 mum  2.45 mm trkChamber     eIoni
+    4  -2.36 cm    349 mum  94.3 cm    370 keV   249 keV   513 mum  2.96 mm trkChamber     eIoni
+    5  -2.36 cm    275 mum  94.3 cm   79.9 keV   290 keV   370 mum  3.33 mm trkChamber     eIoni
+    6  -2.35 cm    280 mum  94.3 cm      0 eV   79.9 keV  49.9 mum  3.38 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 17,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   48.5 nm   88.8 cm   2.96 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.58 cm   1.02 mm     89 cm    2.3 MeV   664 keV  1.69 mm   1.69 mm trkChamber     eIoni
+    2  -2.64 cm    625 mum  89.1 cm   1.88 MeV   415 keV  1.36 mm   3.05 mm trkChamber     eIoni
+    3  -2.65 cm    472 mum  89.1 cm   1.81 MeV  63.9 keV   194 mum  3.25 mm trkChamber     eBrem
+    4  -2.66 cm   -288 mum    89 cm   1.44 MeV   371 keV  1.12 mm   4.37 mm trkChamber     eIoni
+    5  -2.72 cm   -880 mum    89 cm   1.11 MeV   325 keV   934 mum   5.3 mm trkChamber     eIoni
+    6  -2.76 cm  -1.45 mm   88.9 cm    836 keV   276 keV   769 mum  6.07 mm trkChamber     eIoni
+    7  -2.77 cm  -1.98 mm   88.9 cm    638 keV   198 keV   627 mum   6.7 mm trkChamber     eIoni
+    8  -2.79 cm  -1.94 mm   88.9 cm    302 keV  93.7 keV   236 mum  6.93 mm trkChamber     eBrem
+    9   -2.8 cm  -1.82 mm   88.9 cm    135 keV   167 keV   321 mum  7.25 mm trkChamber     eIoni
+   10   -2.8 cm  -1.82 mm   88.9 cm      0 eV    135 keV   116 mum  7.37 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 150,   Parent ID = 17
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.79 cm  -1.94 mm   88.9 cm    242 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -13.2 cm   1.83 cm   1.02 m     129 keV   113 keV  17.1 cm   17.1 cm trkChamber     compt
+    2    -13 cm    1.7 cm   1.02 m     115 keV  13.7 keV   2.7 mm   17.4 cm trkChamber     compt
+    3  -13.2 cm   7.73 mm   99.8 cm    110 keV  5.37 keV  2.58 cm     20 cm trkChamber     compt
+    4  -13.5 cm   8.15 mm   99.3 cm     77 keV  33.1 keV  5.79 mm   20.5 cm trkChamber     compt
+    5  -13.5 cm   8.15 mm   99.3 cm     77 keV    77 keV  62.9 mum  20.5 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 149,   Parent ID = 17
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.65 cm    472 mum  89.1 cm   10.4 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.66 cm    339 mum  89.1 cm   10.4 keV  10.4 keV   149 mum   149 mumtrkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 16,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm    139 nm   84.6 cm   3.81 MeV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -2.52 cm    239 mum  84.8 cm   2.98 MeV   772 keV  2.02 mm   2.02 mm trkChamber     eBrem
+    2   -2.6 cm   1.22 mm   84.9 cm   2.32 MeV   653 keV   1.7 mm   3.72 mm trkChamber     eIoni
+    3   -2.7 cm    1.2 mm     85 cm   1.69 MeV   635 keV  1.37 mm   5.09 mm trkChamber     eIoni
+    4  -2.61 cm   1.36 mm     85 cm   1.18 MeV   504 keV  1.06 mm   6.15 mm trkChamber     eIoni
+    5   -2.6 cm    985 mum  85.1 cm    917 keV   267 keV   805 mum  6.96 mm trkChamber     eIoni
+    6  -2.61 cm    557 mum  85.1 cm    666 keV   250 keV   669 mum  7.62 mm trkChamber     eIoni
+    7   -2.6 cm    164 mum  85.1 cm    456 keV   211 keV   538 mum  8.16 mm trkChamber     eIoni
+    8  -2.59 cm   -113 mum  85.1 cm    263 keV   193 keV   423 mum  8.59 mm trkChamber     eIoni
+    9  -2.58 cm   -181 mum  85.1 cm   69.6 keV   194 keV   288 mum  8.87 mm trkChamber     eIoni
+   10  -2.58 cm   -190 mum  85.1 cm      0 eV   69.6 keV  40.2 mum  8.91 mm trkChamber     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 151,   Parent ID = 16
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.52 cm    239 mum  84.8 cm   58.9 keV     0 eV      0 fm      0 fm trkChamber   initStep
+    1  -3.24 cm   9.43 mm   86.9 cm   58.9 keV  58.9 keV  2.42 cm   2.42 cm trkChamber      phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 15,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm     63 nm   81.6 cm   1.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm  -19.3 mum  81.6 cm    376 eV    850 eV    951 mum   951 mum   Tracker     eIoni
+    2   -2.5 cm  -14.9 mum  81.6 cm      0 eV    376 eV    509 mum  1.46 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 14,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   53.7 nm   79.9 cm   1.04 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm   27.5 mum  79.9 cm    246 eV    799 eV    901 mum   901 mum   Tracker     eIoni
+    2  -2.51 cm   26.5 mum  79.9 cm      0 eV    246 eV    417 mum  1.32 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 13,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   34.1 nm     77 cm   1.51 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm   -153 mum    77 cm   1.04 keV   466 eV   1.02 mm   1.02 mm    Tracker     eIoni
+    2  -2.48 cm   -103 mum    77 cm    752 eV    293 eV    901 mum  1.92 mm    Tracker     eIoni
+    3  -2.48 cm   -112 mum    77 cm      0 eV    752 eV    741 mum  2.67 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 12,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm     23 nm   75.4 cm   12.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.51 cm    576 mum  75.4 cm   9.36 keV  1.27 keV   657 mum   657 mum   Tracker     eIoni
+    2  -2.61 cm    325 mum  75.3 cm   5.05 keV   3.2 keV  1.66 mm   2.32 mm    Tracker     eIoni
+    3  -2.55 cm    537 mum  75.3 cm   3.59 keV  1.46 keV  1.62 mm   3.94 mm    Tracker     eIoni
+    4   -2.6 cm    363 mum  75.3 cm   2.82 keV   763 eV   1.41 mm   5.35 mm    Tracker     eIoni
+    5  -2.59 cm    216 mum  75.3 cm   1.24 keV  1.58 keV  1.29 mm   6.63 mm    Tracker     eIoni
+    6  -2.59 cm   90.6 mum  75.3 cm   1.15 keV  94.2 eV    956 mum  7.59 mm    Tracker     eIoni
+    7  -2.59 cm   75.1 mum  75.3 cm    119 eV   1.03 keV   931 mum  8.52 mm    Tracker     eIoni
+    8  -2.59 cm   75.5 mum  75.3 cm      0 eV    119 eV    296 mum  8.82 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 153,   Parent ID = 12
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.61 cm    325 mum  75.3 cm   1.11 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.61 cm    383 mum  75.3 cm    496 eV    609 eV    918 mum   918 mum   Tracker     eIoni
+    2  -2.61 cm    379 mum  75.3 cm      0 eV    496 eV    585 mum   1.5 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 152,   Parent ID = 12
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.51 cm    576 mum  75.4 cm    1.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm    632 mum  75.4 cm   1.15 keV   359 eV   1.02 mm   1.02 mm    Tracker     eIoni
+    2  -2.48 cm    685 mum  75.4 cm    710 eV    435 eV    930 mum  1.95 mm    Tracker     eIoni
+    3  -2.48 cm    676 mum  75.4 cm      0 eV    710 eV    716 mum  2.67 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 11,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -4.06 nm   70.7 cm   6.54 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.48 cm   -623 mum  70.7 cm   3.26 keV  3.28 keV   1.8 mm    1.8 mm    Tracker     eIoni
+    2  -2.48 cm   -455 mum  70.7 cm    734 eV   2.53 keV  1.36 mm   3.16 mm    Tracker     eIoni
+    3  -2.48 cm   -446 mum  70.7 cm      0 eV    734 eV    730 mum  3.89 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 10,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -43.1 nm   65.4 cm   5.05 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.54 cm  -3.54 mum  65.5 cm   2.92 keV  2.13 keV  1.62 mm   1.62 mm    Tracker     eIoni
+    2  -2.56 cm   23.3 mum  65.5 cm   1.06 keV   830 eV    800 mum  2.42 mm    Tracker     eIoni
+    3  -2.56 cm  -69.5 mum  65.5 cm    824 eV    234 eV    905 mum  3.32 mm    Tracker     eIoni
+    4  -2.56 cm  -71.3 mum  65.5 cm      0 eV    824 eV    784 mum  4.11 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 154,   Parent ID = 10
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.56 cm   23.3 mum  65.5 cm   1.03 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.57 cm   20.7 mum  65.4 cm    927 eV    106 eV    898 mum   898 mum   Tracker     eIoni
+    2  -2.57 cm   17.3 mum  65.4 cm      0 eV    927 eV    846 mum  1.74 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -68.4 nm     60 cm   1.02 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm    124 mum    60 cm    762 eV    256 eV    894 mum   894 mum   Tracker     eIoni
+    2   -2.5 cm    115 mum    60 cm      0 eV    762 eV    747 mum  1.64 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 8,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -40.7 nm   43.7 cm   5.77 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.54 cm    323 mum  43.7 cm   2.37 keV   3.4 keV  1.71 mm   1.71 mm    Tracker     eIoni
+    2  -2.55 cm   75.8 mum  43.7 cm    1.7 keV   674 eV   1.21 mm   2.91 mm    Tracker     eIoni
+    3  -2.55 cm   42.3 mum  43.7 cm    607 eV   1.09 keV  1.07 mm   3.98 mm    Tracker     eIoni
+    4  -2.55 cm   40.5 mum  43.7 cm      0 eV    607 eV    654 mum  4.63 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -39.7 nm   22.1 cm   1.38 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm  -29.7 mum  22.1 cm    367 eV   1.01 keV   991 mum   991 mum   Tracker     eIoni
+    2  -2.49 cm  -27.1 mum  22.1 cm      0 eV    367 eV    503 mum  1.49 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm  -7.11 nm   15.9 cm   1.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1   -2.5 cm   86.5 mum  15.9 cm    810 eV    425 eV    954 mum   954 mum   Tracker     eIoni
+    2   -2.5 cm   75.5 mum  15.9 cm      0 eV    810 eV    776 mum  1.73 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 5,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm -3.19e+03 fm   9.14 cm   1.75 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm    210 mum  9.13 cm   1.61 keV   138 eV   1.08 mm   1.08 mm    Tracker     eIoni
+    2   -2.5 cm    178 mum  9.12 cm   1.02 keV   594 eV   1.05 mm   2.12 mm    Tracker     eIoni
+    3   -2.5 cm    263 mum  9.13 cm    836 eV    181 eV    893 mum  3.02 mm    Tracker     eIoni
+    4  -2.51 cm    254 mum  9.13 cm      0 eV    836 eV    791 mum  3.81 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   9.61 Ang  8.54 cm   3.81 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.47 cm    205 mum  8.57 cm   2.74 keV  1.06 keV  1.44 mm   1.44 mm    Tracker     eIoni
+    2  -2.48 cm   23.8 mum  8.55 cm   1.84 keV   909 eV   1.27 mm   2.72 mm    Tracker     eIoni
+    3  -2.48 cm  -2.42 mum  8.56 cm    275 eV   1.56 keV   1.1 mm   3.81 mm    Tracker     eIoni
+    4  -2.48 cm  -4.37 mum  8.56 cm      0 eV    275 eV    440 mum  4.25 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm   7.27 nm   4.87 cm   1.27 keV     0 eV      0 fm      0 fm    Tracker   initStep
+    1  -2.49 cm   -109 mum  4.88 cm   1.05 keV   221 eV    964 mum   964 mum   Tracker     eIoni
+    2   -2.5 cm   -156 mum  4.87 cm    581 eV    472 eV    903 mum  1.87 mm    Tracker     eIoni
+    3  -2.49 cm   -155 mum  4.87 cm      0 eV    581 eV    637 mum   2.5 mm    Tracker     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0   -2.5 cm      0 fm   2.39 mm   1.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1  -2.49 cm   27.5 mum  2.59 mm   1.02 MeV  93.6 keV   244 mum   244 mum  TargetPV     eBrem
+    2  -2.48 cm  -63.9 mum  3.25 mm    790 keV   230 keV   721 mum   965 mum  TargetPV     eIoni
+    3  -2.45 cm   -153 mum  2.83 mm    554 keV   235 keV   603 mum  1.57 mm   TargetPV     eIoni
+    4  -2.45 cm   -498 mum  2.68 mm    380 keV   174 keV   478 mum  2.05 mm   TargetPV     eIoni
+    5  -2.46 cm   -483 mum  2.41 mm    193 keV   187 keV   377 mum  2.42 mm   TargetPV     eIoni
+    6  -2.45 cm   -416 mum  2.44 mm   22.8 keV   170 keV   204 mum  2.63 mm   TargetPV     eIoni
+    7  -2.45 cm   -415 mum  2.44 mm      0 eV   22.8 keV  8.49 mum  2.64 mm   TargetPV     eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 155,   Parent ID = 2
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
+    0  -2.49 cm   27.5 mum  2.59 mm    114 keV     0 eV      0 fm      0 fm   TargetPV   initStep
+    1   -1.8 cm  -3.34 mm   1.23 cm    113 keV   163 eV   1.24 cm   1.24 cm   TargetPV     compt
+    2   -7.8 mm  -9.68 mm    2.5 cm    113 keV     0 eV   1.74 cm   2.98 cm    TrackerTransportation
+    3    2.5 m   -1.57 m    3.15 m     113 keV     0 eV    4.3 m    4.33 m     WorldPVTransportation
+    4   3.59 m   -2.25 m     4.5 m     113 keV     0 eV   1.86 m    6.19 m  OutOfWorldTransportation
 >>> Event 0
-    182 trajectories stored in this event.
+    155 trajectories stored in this event.
+### Run 2 start.
+>>> Event 0
+    95 trajectories stored in this event.
 >>> Event 1
-    82 trajectories stored in this event.
+    116 trajectories stored in this event.
 >>> Event 2
-    96 trajectories stored in this event.
->>> Event 3
-    227 trajectories stored in this event.
->>> Event 4
-    124 trajectories stored in this event.
->>> Event 5
-    99 trajectories stored in this event.
->>> Event 6
-    101 trajectories stored in this event.
->>> Event 7
-    109 trajectories stored in this event.
->>> Event 8
-    101 trajectories stored in this event.
->>> Event 9
-    92 trajectories stored in this event.
->>> Event 10
-    98 trajectories stored in this event.
->>> Event 11
-    79 trajectories stored in this event.
->>> Event 12
-    93 trajectories stored in this event.
->>> Event 13
-    161 trajectories stored in this event.
->>> Event 14
-    78 trajectories stored in this event.
->>> Event 15
-    89 trajectories stored in this event.
->>> Event 16
-    164 trajectories stored in this event.
->>> Event 17
-    74 trajectories stored in this event.
->>> Event 18
-    99 trajectories stored in this event.
->>> Event 19
-    107 trajectories stored in this event.
->>> Event 20
-    101 trajectories stored in this event.
->>> Event 21
-    99 trajectories stored in this event.
->>> Event 22
-    100 trajectories stored in this event.
->>> Event 23
-    82 trajectories stored in this event.
->>> Event 24
-    83 trajectories stored in this event.
->>> Event 25
-    86 trajectories stored in this event.
->>> Event 26
-    90 trajectories stored in this event.
->>> Event 27
-    222 trajectories stored in this event.
->>> Event 28
-    321 trajectories stored in this event.
->>> Event 29
-    115 trajectories stored in this event.
->>> Event 30
-    127 trajectories stored in this event.
->>> Event 31
     85 trajectories stored in this event.
+>>> Event 3
+    80 trajectories stored in this event.
+>>> Event 4
+    106 trajectories stored in this event.
+>>> Event 5
+    71 trajectories stored in this event.
+>>> Event 6
+    90 trajectories stored in this event.
+>>> Event 7
+    200 trajectories stored in this event.
+>>> Event 8
+    225 trajectories stored in this event.
+>>> Event 9
+    129 trajectories stored in this event.
+>>> Event 10
+    114 trajectories stored in this event.
+>>> Event 11
+    119 trajectories stored in this event.
+>>> Event 12
+    197 trajectories stored in this event.
+>>> Event 13
+    120 trajectories stored in this event.
+>>> Event 14
+    109 trajectories stored in this event.
+>>> Event 15
+    427 trajectories stored in this event.
+>>> Event 16
+    99 trajectories stored in this event.
+>>> Event 17
+    178 trajectories stored in this event.
+>>> Event 18
+    91 trajectories stored in this event.
+>>> Event 19
+    128 trajectories stored in this event.
+>>> Event 20
+    76 trajectories stored in this event.
+>>> Event 21
+    80 trajectories stored in this event.
+>>> Event 22
+    116 trajectories stored in this event.
+>>> Event 23
+    253 trajectories stored in this event.
+>>> Event 24
+    98 trajectories stored in this event.
+>>> Event 25
+    75 trajectories stored in this event.
+>>> Event 26
+    91 trajectories stored in this event.
+>>> Event 27
+    90 trajectories stored in this event.
+>>> Event 28
+    70 trajectories stored in this event.
+>>> Event 29
+    88 trajectories stored in this event.
+>>> Event 30
+    94 trajectories stored in this event.
+>>> Event 31
+    88 trajectories stored in this event.
 >>> Event 32
     163 trajectories stored in this event.
 >>> Event 33
-    86 trajectories stored in this event.
+    254 trajectories stored in this event.
 >>> Event 34
-    88 trajectories stored in this event.
+    101 trajectories stored in this event.
 >>> Event 35
-    89 trajectories stored in this event.
+    79 trajectories stored in this event.
 >>> Event 36
-    102 trajectories stored in this event.
+    127 trajectories stored in this event.
 >>> Event 37
-    150 trajectories stored in this event.
+    120 trajectories stored in this event.
 >>> Event 38
-    146 trajectories stored in this event.
+    87 trajectories stored in this event.
 >>> Event 39
-    140 trajectories stored in this event.
->>> Event 40
-    92 trajectories stored in this event.
->>> Event 41
-    84 trajectories stored in this event.
->>> Event 42
-    104 trajectories stored in this event.
->>> Event 43
     90 trajectories stored in this event.
+>>> Event 40
+    124 trajectories stored in this event.
+>>> Event 41
+    136 trajectories stored in this event.
+>>> Event 42
+    235 trajectories stored in this event.
+>>> Event 43
+    94 trajectories stored in this event.
 >>> Event 44
-    87 trajectories stored in this event.
+    156 trajectories stored in this event.
 >>> Event 45
-    152 trajectories stored in this event.
+    99 trajectories stored in this event.
 >>> Event 46
-    206 trajectories stored in this event.
+    315 trajectories stored in this event.
 >>> Event 47
-    92 trajectories stored in this event.
+    116 trajectories stored in this event.
 >>> Event 48
-    105 trajectories stored in this event.
->>> Event 49
-    87 trajectories stored in this event.
->>> Event 50
-    76 trajectories stored in this event.
->>> Event 51
-    77 trajectories stored in this event.
->>> Event 52
-    103 trajectories stored in this event.
->>> Event 53
-    105 trajectories stored in this event.
->>> Event 54
-    248 trajectories stored in this event.
->>> Event 55
-    108 trajectories stored in this event.
->>> Event 56
-    102 trajectories stored in this event.
->>> Event 57
-    143 trajectories stored in this event.
->>> Event 58
     85 trajectories stored in this event.
+>>> Event 49
+    69 trajectories stored in this event.
+>>> Event 50
+    70 trajectories stored in this event.
+>>> Event 51
+    81 trajectories stored in this event.
+>>> Event 52
+    156 trajectories stored in this event.
+>>> Event 53
+    117 trajectories stored in this event.
+>>> Event 54
+    85 trajectories stored in this event.
+>>> Event 55
+    235 trajectories stored in this event.
+>>> Event 56
+    87 trajectories stored in this event.
+>>> Event 57
+    96 trajectories stored in this event.
+>>> Event 58
+    82 trajectories stored in this event.
+>>> Event 59
+    129 trajectories stored in this event.
+>>> Event 60
+    116 trajectories stored in this event.
+>>> Event 61
+    177 trajectories stored in this event.
+>>> Event 62
+    191 trajectories stored in this event.
+>>> Event 63
+    184 trajectories stored in this event.
+>>> Event 64
+    146 trajectories stored in this event.
+>>> Event 65
+    56 trajectories stored in this event.
+>>> Event 66
+    108 trajectories stored in this event.
+>>> Event 67
+    100 trajectories stored in this event.
+>>> Event 68
+    101 trajectories stored in this event.
+>>> Event 69
+    79 trajectories stored in this event.
+>>> Event 70
+    91 trajectories stored in this event.
+>>> Event 71
+    94 trajectories stored in this event.
+>>> Event 72
+    90 trajectories stored in this event.
+>>> Event 73
+    161 trajectories stored in this event.
+>>> Event 74
+    200 trajectories stored in this event.
+>>> Event 75
+    98 trajectories stored in this event.
+>>> Event 76
+    97 trajectories stored in this event.
+>>> Event 77
+    101 trajectories stored in this event.
+>>> Event 78
+    92 trajectories stored in this event.
+>>> Event 79
+    160 trajectories stored in this event.
+>>> Event 80
+    167 trajectories stored in this event.
+>>> Event 81
+    87 trajectories stored in this event.
+>>> Event 82
+    122 trajectories stored in this event.
+>>> Event 83
+    141 trajectories stored in this event.
+>>> Event 84
+    106 trajectories stored in this event.
+>>> Event 85
+    239 trajectories stored in this event.
+>>> Event 86
+    75 trajectories stored in this event.
+>>> Event 87
+    82 trajectories stored in this event.
+>>> Event 88
+    80 trajectories stored in this event.
+>>> Event 89
+    130 trajectories stored in this event.
+>>> Event 90
+    109 trajectories stored in this event.
+>>> Event 91
+    101 trajectories stored in this event.
+>>> Event 92
+    181 trajectories stored in this event.
+>>> Event 93
+    94 trajectories stored in this event.
+>>> Event 94
+    82 trajectories stored in this event.
+>>> Event 95
+    205 trajectories stored in this event.
+>>> Event 96
+    88 trajectories stored in this event.
+>>> Event 97
+    84 trajectories stored in this event.
+>>> Event 98
+    71 trajectories stored in this event.
+>>> Event 99
+    247 trajectories stored in this event.
+### Run 3 start.
+>>> Event 0
+    136 trajectories stored in this event.
+>>> Event 1
+    201 trajectories stored in this event.
+>>> Event 2
+    76 trajectories stored in this event.
+>>> Event 3
+    246 trajectories stored in this event.
+>>> Event 4
+    125 trajectories stored in this event.
+>>> Event 5
+    388 trajectories stored in this event.
+>>> Event 6
+    130 trajectories stored in this event.
+>>> Event 7
+    331 trajectories stored in this event.
+>>> Event 8
+    335 trajectories stored in this event.
+>>> Event 9
+    107 trajectories stored in this event.
+>>> Event 10
+    423 trajectories stored in this event.
+>>> Event 11
+    72 trajectories stored in this event.
+>>> Event 12
+    140 trajectories stored in this event.
+>>> Event 13
+    838 trajectories stored in this event.
+>>> Event 14
+    88 trajectories stored in this event.
+>>> Event 15
+    228 trajectories stored in this event.
+>>> Event 16
+    90 trajectories stored in this event.
+>>> Event 17
+    85 trajectories stored in this event.
+>>> Event 18
+    119 trajectories stored in this event.
+>>> Event 19
+    185 trajectories stored in this event.
+>>> Event 20
+    222 trajectories stored in this event.
+>>> Event 21
+    150 trajectories stored in this event.
+>>> Event 22
+    204 trajectories stored in this event.
+>>> Event 23
+    170 trajectories stored in this event.
+>>> Event 24
+    166 trajectories stored in this event.
+>>> Event 25
+    118 trajectories stored in this event.
+>>> Event 26
+    210 trajectories stored in this event.
+>>> Event 27
+    275 trajectories stored in this event.
+>>> Event 28
+    102 trajectories stored in this event.
+>>> Event 29
+    119 trajectories stored in this event.
+>>> Event 30
+    292 trajectories stored in this event.
+>>> Event 31
+    1187 trajectories stored in this event.
+>>> Event 32
+    137 trajectories stored in this event.
+>>> Event 33
+    175 trajectories stored in this event.
+>>> Event 34
+    195 trajectories stored in this event.
+>>> Event 35
+    79 trajectories stored in this event.
+>>> Event 36
+    76 trajectories stored in this event.
+>>> Event 37
+    105 trajectories stored in this event.
+>>> Event 38
+    569 trajectories stored in this event.
+>>> Event 39
+    76 trajectories stored in this event.
+>>> Event 40
+    295 trajectories stored in this event.
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.2e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.953
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -27.4
+        Position - y (mm)   :                -1.42
+        Position - z (mm)   :             1.76e+03
+     Momentum Direction - x :               -0.602
+     Momentum Direction - y :                0.338
+     Momentum Direction - z :                0.724
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.23e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -27.8
+        Position - y (mm)   :                -1.21
+        Position - z (mm)   :             1.76e+03
+        Time (ns)           :                 5.86
+        Proper Time (ns)    :              0.00289
+        Momentum Direct - x :               -0.602
+        Momentum Direct - y :                0.338
+        Momentum Direct - z :                0.724
+        Kinetic Energy (MeV):                 1.11
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+>>> Event 41
+    213 trajectories stored in this event.
+>>> Event 42
+    121 trajectories stored in this event.
+>>> Event 43
+    104 trajectories stored in this event.
+>>> Event 44
+    165 trajectories stored in this event.
+>>> Event 45
+    460 trajectories stored in this event.
+>>> Event 46
+    334 trajectories stored in this event.
+>>> Event 47
+    350 trajectories stored in this event.
+>>> Event 48
+    2415 trajectories stored in this event.
+>>> Event 49
+    291 trajectories stored in this event.
+>>> Event 50
+    676 trajectories stored in this event.
+>>> Event 51
+    64 trajectories stored in this event.
+>>> Event 52
+    2226 trajectories stored in this event.
+>>> Event 53
+    159 trajectories stored in this event.
+>>> Event 54
+    102 trajectories stored in this event.
+>>> Event 55
+    124 trajectories stored in this event.
+>>> Event 56
+    1035 trajectories stored in this event.
+>>> Event 57
+    168 trajectories stored in this event.
+>>> Event 58
+    163 trajectories stored in this event.
 >>> Event 59
     78 trajectories stored in this event.
 >>> Event 60
-    207 trajectories stored in this event.
+    91 trajectories stored in this event.
 >>> Event 61
-    87 trajectories stored in this event.
->>> Event 62
-    194 trajectories stored in this event.
->>> Event 63
-    211 trajectories stored in this event.
->>> Event 64
-    102 trajectories stored in this event.
->>> Event 65
-    86 trajectories stored in this event.
->>> Event 66
-    208 trajectories stored in this event.
->>> Event 67
-    115 trajectories stored in this event.
->>> Event 68
-    87 trajectories stored in this event.
->>> Event 69
-    193 trajectories stored in this event.
->>> Event 70
-    157 trajectories stored in this event.
->>> Event 71
-    127 trajectories stored in this event.
->>> Event 72
-    111 trajectories stored in this event.
->>> Event 73
-    89 trajectories stored in this event.
->>> Event 74
-    80 trajectories stored in this event.
->>> Event 75
-    104 trajectories stored in this event.
->>> Event 76
-    187 trajectories stored in this event.
->>> Event 77
-    103 trajectories stored in this event.
->>> Event 78
-    183 trajectories stored in this event.
->>> Event 79
-    152 trajectories stored in this event.
->>> Event 80
-    222 trajectories stored in this event.
->>> Event 81
-    88 trajectories stored in this event.
->>> Event 82
-    110 trajectories stored in this event.
->>> Event 83
-    219 trajectories stored in this event.
->>> Event 84
-    85 trajectories stored in this event.
->>> Event 85
-    212 trajectories stored in this event.
->>> Event 86
-    84 trajectories stored in this event.
->>> Event 87
-    84 trajectories stored in this event.
->>> Event 88
-    79 trajectories stored in this event.
->>> Event 89
     101 trajectories stored in this event.
+>>> Event 62
+    1052 trajectories stored in this event.
+>>> Event 63
+    121 trajectories stored in this event.
+>>> Event 64
+    438 trajectories stored in this event.
+>>> Event 65
+    183 trajectories stored in this event.
+>>> Event 66
+    563 trajectories stored in this event.
+>>> Event 67
+    117 trajectories stored in this event.
+>>> Event 68
+    221 trajectories stored in this event.
+>>> Event 69
+    788 trajectories stored in this event.
+>>> Event 70
+    133 trajectories stored in this event.
+>>> Event 71
+    234 trajectories stored in this event.
+>>> Event 72
+    141 trajectories stored in this event.
+>>> Event 73
+    192 trajectories stored in this event.
+>>> Event 74
+    121 trajectories stored in this event.
+>>> Event 75
+    876 trajectories stored in this event.
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.83e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe7e48
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                0.293
+        Track Status        :                Alive
+        True Path Length (mm) :                 1.29
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                 -105
+        Position - y (mm)   :                 -232
+        Position - z (mm)   :             4.08e+03
+        Time (ns)           :                 13.8
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.429
+        Momentum Direct - y :                0.366
+        Momentum Direct - z :                0.826
+        Kinetic Energy (MeV):                 0.95
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.83e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -49.2
+        Position - y (mm)   :                 -184
+        Position - z (mm)   :             4.19e+03
+        Time (ns)           :                 14.2
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.429
+        Momentum Direct - y :                0.366
+        Momentum Direct - z :                0.826
+        Kinetic Energy (MeV):                 0.95
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xbd4fd0
+>>> Event 76
+    3500 trajectories stored in this event.
+>>> Event 77
+    142 trajectories stored in this event.
+>>> Event 78
+    662 trajectories stored in this event.
+>>> Event 79
+    381 trajectories stored in this event.
+>>> Event 80
+    91 trajectories stored in this event.
+>>> Event 81
+    624 trajectories stored in this event.
+>>> Event 82
+    1735 trajectories stored in this event.
+>>> Event 83
+    473 trajectories stored in this event.
+>>> Event 84
+    348 trajectories stored in this event.
+>>> Event 85
+    193 trajectories stored in this event.
+>>> Event 86
+    93 trajectories stored in this event.
+>>> Event 87
+    416 trajectories stored in this event.
+>>> Event 88
+    88 trajectories stored in this event.
+>>> Event 89
+    697 trajectories stored in this event.
 >>> Event 90
-    257 trajectories stored in this event.
+    104 trajectories stored in this event.
 >>> Event 91
-    103 trajectories stored in this event.
+    209 trajectories stored in this event.
 >>> Event 92
-    71 trajectories stored in this event.
+    96 trajectories stored in this event.
 >>> Event 93
-    86 trajectories stored in this event.
+    100 trajectories stored in this event.
 >>> Event 94
-    106 trajectories stored in this event.
+    124 trajectories stored in this event.
 >>> Event 95
-    80 trajectories stored in this event.
+    90 trajectories stored in this event.
 >>> Event 96
-    139 trajectories stored in this event.
+    108 trajectories stored in this event.
 >>> Event 97
-    109 trajectories stored in this event.
+    160 trajectories stored in this event.
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.97e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.708
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -23.3
+        Position - y (mm)   :                 3.09
+        Position - z (mm)   :                  952
+     Momentum Direction - x :                -0.67
+     Momentum Direction - y :                -0.34
+     Momentum Direction - z :                -0.66
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.97e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -23.6
+        Position - y (mm)   :                 2.96
+        Position - z (mm)   :                  952
+        Time (ns)           :                 3.19
+        Proper Time (ns)    :              0.00355
+        Momentum Direct - x :                -0.67
+        Momentum Direct - y :                -0.34
+        Momentum Direct - z :                -0.66
+        Kinetic Energy (MeV):                0.643
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.77e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.525
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -23.6
+        Position - y (mm)   :                 3.21
+        Position - z (mm)   :                  952
+     Momentum Direction - x :               -0.365
+     Momentum Direction - y :                0.401
+     Momentum Direction - z :                 0.84
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.77e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -23.7
+        Position - y (mm)   :                 3.32
+        Position - z (mm)   :                  952
+        Time (ns)           :                 3.19
+        Proper Time (ns)    :              0.00412
+        Momentum Direct - x :               -0.365
+        Momentum Direct - y :                0.401
+        Momentum Direct - z :                 0.84
+        Kinetic Energy (MeV):                0.475
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.81e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.431
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -23.9
+        Position - y (mm)   :                 3.36
+        Position - z (mm)   :                  952
+     Momentum Direction - x :                0.136
+     Momentum Direction - y :                0.792
+     Momentum Direction - z :               -0.596
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.81e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -23.9
+        Position - y (mm)   :                 3.46
+        Position - z (mm)   :                  952
+        Time (ns)           :                 3.19
+        Proper Time (ns)    :               0.0045
+        Momentum Direct - x :                0.136
+        Momentum Direct - y :                0.792
+        Momentum Direct - z :               -0.596
+        Kinetic Energy (MeV):                0.251
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.41e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.272
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                  -24
+        Position - y (mm)   :                 3.45
+        Position - z (mm)   :                  952
+     Momentum Direction - x :                0.394
+     Momentum Direction - y :               -0.916
+     Momentum Direction - z :               0.0695
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.41e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                  -24
+        Position - y (mm)   :                 3.43
+        Position - z (mm)   :                  952
+        Time (ns)           :                 3.19
+        Proper Time (ns)    :               0.0046
+        Momentum Direct - x :                0.394
+        Momentum Direct - y :               -0.916
+        Momentum Direct - z :               0.0695
+        Kinetic Energy (MeV):               0.0856
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.19e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :         StopButAlive
+        True Path Length (mm) :               0.0522
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                  -24
+        Position - y (mm)   :                 3.43
+        Position - z (mm)   :                  952
+     Momentum Direction - x :               -0.299
+     Momentum Direction - y :               -0.263
+     Momentum Direction - z :               -0.917
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.26e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 2.07
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -22.9
+        Position - y (mm)   :                0.252
+        Position - z (mm)   :                  946
+     Momentum Direction - x :               -0.047
+     Momentum Direction - y :               -0.715
+     Momentum Direction - z :                0.698
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.26e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                  -23
+        Position - y (mm)   :               -0.827
+        Position - z (mm)   :                  947
+        Time (ns)           :                 3.16
+        Proper Time (ns)    :              0.00153
+        Momentum Direct - x :               -0.047
+        Momentum Direct - y :               -0.715
+        Momentum Direct - z :                0.698
+        Kinetic Energy (MeV):                 2.91
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.28e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 1.67
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -22.4
+        Position - y (mm)   :                -0.95
+        Position - z (mm)   :                  947
+     Momentum Direction - x :               -0.125
+     Momentum Direction - y :               -0.992
+     Momentum Direction - z :               0.0102
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.28e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -22.6
+        Position - y (mm)   :                -2.18
+        Position - z (mm)   :                  947
+        Time (ns)           :                 3.17
+        Proper Time (ns)    :              0.00228
+        Momentum Direct - x :               -0.125
+        Momentum Direct - y :               -0.992
+        Momentum Direct - z :               0.0102
+        Kinetic Energy (MeV):                 2.37
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.07e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                  1.4
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -23.1
+        Position - y (mm)   :                -2.12
+        Position - z (mm)   :                  947
+     Momentum Direction - x :                0.181
+     Momentum Direction - y :               -0.963
+     Momentum Direction - z :                0.199
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.07e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -22.9
+        Position - y (mm)   :                -3.07
+        Position - z (mm)   :                  947
+        Time (ns)           :                 3.17
+        Proper Time (ns)    :              0.00302
+        Momentum Direct - x :                0.181
+        Momentum Direct - y :               -0.963
+        Momentum Direct - z :                0.199
+        Kinetic Energy (MeV):                 1.85
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.37e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -26.7
+        Position - y (mm)   :                  4.4
+        Position - z (mm)   :                  998
+        Time (ns)           :                 3.33
+        Proper Time (ns)    :             0.000719
+        Momentum Direct - x :               -0.221
+        Momentum Direct - y :               -0.401
+        Momentum Direct - z :                0.889
+        Kinetic Energy (MeV):                 1.52
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  2.78e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.977
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -26.3
+        Position - y (mm)   :                 4.42
+        Position - z (mm)   :                  998
+     Momentum Direction - x :               -0.612
+     Momentum Direction - y :                -0.58
+     Momentum Direction - z :                0.538
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  2.78e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -26.7
+        Position - y (mm)   :                 4.05
+        Position - z (mm)   :                  998
+        Time (ns)           :                 3.33
+        Proper Time (ns)    :              0.00141
+        Momentum Direct - x :               -0.612
+        Momentum Direct - y :                -0.58
+        Momentum Direct - z :                0.538
+        Kinetic Energy (MeV):                 1.15
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  6.2e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 2.09
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -115
+        Position - y (mm)   :                  302
+        Position - z (mm)   :             2.52e+03
+     Momentum Direction - x :                 0.59
+     Momentum Direction - y :                0.185
+     Momentum Direction - z :                0.786
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  6.2e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -115
+        Position - y (mm)   :                  302
+        Position - z (mm)   :             2.52e+03
+        Time (ns)           :                 8.53
+        Proper Time (ns)    :              0.00231
+        Momentum Direct - x :                 0.59
+        Momentum Direct - y :                0.185
+        Momentum Direct - z :                0.786
+        Kinetic Energy (MeV):                 2.64
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  5.6e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 1.53
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -115
+        Position - y (mm)   :                  303
+        Position - z (mm)   :             2.52e+03
+     Momentum Direction - x :                0.578
+     Momentum Direction - y :                0.802
+     Momentum Direction - z :                0.147
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  5.6e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -114
+        Position - y (mm)   :                  303
+        Position - z (mm)   :             2.52e+03
+        Time (ns)           :                 8.53
+        Proper Time (ns)    :              0.00305
+        Momentum Direct - x :                0.578
+        Momentum Direct - y :                0.802
+        Momentum Direct - z :                0.147
+        Kinetic Energy (MeV):                 2.09
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  2.19e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 1.26
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -114
+        Position - y (mm)   :                  303
+        Position - z (mm)   :             2.52e+03
+     Momentum Direction - x :                 0.74
+     Momentum Direction - y :                0.395
+     Momentum Direction - z :                0.545
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  2.19e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -113
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+        Time (ns)           :                 8.53
+        Proper Time (ns)    :              0.00377
+        Momentum Direct - x :                 0.74
+        Momentum Direct - y :                0.395
+        Momentum Direct - z :                0.545
+        Kinetic Energy (MeV):                  1.5
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.08e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.769
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -112
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+     Momentum Direction - x :               -0.653
+     Momentum Direction - y :               -0.349
+     Momentum Direction - z :                0.672
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.08e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -113
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+        Time (ns)           :                 8.54
+        Proper Time (ns)    :              0.00506
+        Momentum Direct - x :               -0.653
+        Momentum Direct - y :               -0.349
+        Momentum Direct - z :                0.672
+        Kinetic Energy (MeV):                0.571
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.39e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.487
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -112
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+     Momentum Direction - x :               -0.208
+     Momentum Direction - y :              -0.0524
+     Momentum Direction - z :               -0.977
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.39e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -113
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+        Time (ns)           :                 8.54
+        Proper Time (ns)    :              0.00557
+        Momentum Direct - x :               -0.208
+        Momentum Direct - y :              -0.0524
+        Momentum Direct - z :               -0.977
+        Kinetic Energy (MeV):                0.404
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  3.98e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbe3348
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.392
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -113
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+     Momentum Direction - x :                0.579
+     Momentum Direction - y :               -0.352
+     Momentum Direction - z :                0.736
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  3.98e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -113
+        Position - y (mm)   :                  304
+        Position - z (mm)   :             2.53e+03
+        Time (ns)           :                 8.54
+        Proper Time (ns)    :              0.00579
+        Momentum Direct - x :                0.579
+        Momentum Direct - y :               -0.352
+        Momentum Direct - z :                0.736
+        Kinetic Energy (MeV):                0.158
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.58e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe7e48
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):               0.0286
+        Track Status        :                Alive
+        True Path Length (mm) :                 11.2
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                -26.8
+        Position - y (mm)   :                 4.68
+        Position - z (mm)   :                  997
+        Time (ns)           :                 3.33
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.258
+        Momentum Direct - y :                0.792
+        Momentum Direct - z :                0.554
+        Kinetic Energy (MeV):                0.208
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.58e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -25.4
+        Position - y (mm)   :                 9.05
+        Position - z (mm)   :                1e+03
+        Time (ns)           :                 3.35
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.258
+        Momentum Direct - y :                0.792
+        Momentum Direct - z :                0.554
+        Kinetic Energy (MeV):                0.208
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  5.42e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 5.64
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -108
+        Position - y (mm)   :                 65.8
+        Position - z (mm)   :             1.81e+03
+     Momentum Direction - x :                0.481
+     Momentum Direction - y :               -0.202
+     Momentum Direction - z :                0.853
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  5.42e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -106
+        Position - y (mm)   :                 64.9
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.08
+        Proper Time (ns)    :              0.00481
+        Momentum Direct - x :                0.481
+        Momentum Direct - y :               -0.202
+        Momentum Direct - z :                0.853
+        Kinetic Energy (MeV):                 8.32
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  9.7e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 4.42
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -106
+        Position - y (mm)   :                 63.9
+        Position - z (mm)   :             1.82e+03
+     Momentum Direction - x :                0.906
+     Momentum Direction - y :               -0.132
+     Momentum Direction - z :                0.403
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  9.7e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -103
+        Position - y (mm)   :                 63.4
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                  6.1
+        Proper Time (ns)    :              0.00562
+        Momentum Direct - x :                0.906
+        Momentum Direct - y :               -0.132
+        Momentum Direct - z :                0.403
+        Kinetic Energy (MeV):                 6.66
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1e-08
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 3.59
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -103
+        Position - y (mm)   :                 64.2
+        Position - z (mm)   :             1.82e+03
+     Momentum Direction - x :                0.934
+     Momentum Direction - y :              -0.0628
+     Momentum Direction - z :                0.352
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1e-08
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -100
+        Position - y (mm)   :                   64
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.11
+        Proper Time (ns)    :              0.00643
+        Momentum Direct - x :                0.934
+        Momentum Direct - y :              -0.0628
+        Momentum Direct - z :                0.352
+        Kinetic Energy (MeV):                 5.42
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  9.85e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 2.97
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                 -100
+        Position - y (mm)   :                 64.3
+        Position - z (mm)   :             1.82e+03
+     Momentum Direction - x :                0.932
+     Momentum Direction - y :               0.0444
+     Momentum Direction - z :                0.359
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  9.85e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -99.4
+        Position - y (mm)   :                 64.3
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.11
+        Proper Time (ns)    :              0.00672
+        Momentum Direct - x :                0.932
+        Momentum Direct - y :               0.0444
+        Momentum Direct - z :                0.359
+        Kinetic Energy (MeV):                  4.3
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.05e-08
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.839
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -99.3
+        Position - y (mm)   :                 64.3
+        Position - z (mm)   :             1.82e+03
+     Momentum Direction - x :                0.982
+     Momentum Direction - y :                0.114
+     Momentum Direction - z :                0.149
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.05e-08
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe07e0
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    1
+        Pointer to 2ndaries :             0xd576f0
+        (Showed only 1st one)
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                0.839
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :             0.000511
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                -99.3
+        Position - y (mm)   :                 64.3
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.11
+        Proper Time (ns)    :              0.00672
+        Momentum Direct - x :                0.982
+        Momentum Direct - y :                0.114
+        Momentum Direct - z :                0.149
+        Kinetic Energy (MeV):                  3.7
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.05e-08
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -97.4
+        Position - y (mm)   :                 64.5
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.11
+        Proper Time (ns)    :              0.00751
+        Momentum Direct - x :                0.982
+        Momentum Direct - y :                0.114
+        Momentum Direct - z :                0.149
+        Kinetic Energy (MeV):                  3.7
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChangeForMSC::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  6.5e-09
+ G4ParticleChangeForMSC::CheckIt 
+ pointer : 0xbd7e68
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                 2.11
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Position - x (mm)   :                -97.3
+        Position - y (mm)   :                 63.9
+        Position - z (mm)   :             1.82e+03
+     Momentum Direction - x :                0.866
+     Momentum Direction - y :              0.00496
+     Momentum Direction - z :                  0.5
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  6.5e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -95.9
+        Position - y (mm)   :                 63.9
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.12
+        Proper Time (ns)    :               0.0083
+        Momentum Direct - x :                0.866
+        Momentum Direct - y :              0.00496
+        Momentum Direct - z :                  0.5
+        Kinetic Energy (MeV):                 2.98
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1e-08
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                  -98
+        Position - y (mm)   :                 64.1
+        Position - z (mm)   :             1.82e+03
+        Time (ns)           :                 6.11
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.987
+        Momentum Direct - y :               -0.109
+        Momentum Direct - z :                0.119
+        Kinetic Energy (MeV):               0.0353
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.6e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -110
+        Position - y (mm)   :                 63.8
+        Position - z (mm)   :              1.8e+03
+        Time (ns)           :                 6.03
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :                0.124
+        Momentum Direct - y :                0.612
+        Momentum Direct - z :                0.781
+        Kinetic Energy (MeV):               0.0729
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.3e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe7e48
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                0.015
+        Track Status        :                Alive
+        True Path Length (mm) :                 8.23
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                 -110
+        Position - y (mm)   :                 63.8
+        Position - z (mm)   :              1.8e+03
+        Time (ns)           :                 6.03
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               0.0508
+        Momentum Direct - y :              -0.0816
+        Momentum Direct - z :               -0.995
+        Kinetic Energy (MeV):               0.0579
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.3e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -109
+        Position - y (mm)   :                 63.2
+        Position - z (mm)   :             1.79e+03
+        Time (ns)           :                 6.05
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               0.0508
+        Momentum Direct - y :              -0.0816
+        Momentum Direct - z :               -0.995
+        Kinetic Energy (MeV):               0.0579
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.3e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe7e48
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):               0.0071
+        Track Status        :                Alive
+        True Path Length (mm) :                 8.97
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                -25.3
+        Position - y (mm)   :                0.237
+        Position - z (mm)   :                  958
+        Time (ns)           :                  3.2
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.637
+        Momentum Direct - y :                0.144
+        Momentum Direct - z :               -0.758
+        Kinetic Energy (MeV):               0.0425
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.3e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -26.7
+        Position - y (mm)   :                0.562
+        Position - z (mm)   :                  956
+        Time (ns)           :                  3.2
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.637
+        Momentum Direct - y :                0.144
+        Momentum Direct - z :               -0.758
+        Kinetic Energy (MeV):               0.0425
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xb154e0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.75e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbe7e48
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    1
+        Pointer to 2ndaries :             0xb0edf8
+        (Showed only 1st one)
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                  212
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    1
+        Position - x (mm)   :                 28.7
+        Position - y (mm)   :                -60.2
+        Position - z (mm)   :             1.23e+03
+        Time (ns)           :                 4.14
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.325
+        Momentum Direct - y :                0.788
+        Momentum Direct - z :               -0.522
+        Kinetic Energy (MeV):                0.228
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.75e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                  -99
+        Position - y (mm)   :                  250
+        Position - z (mm)   :             1.02e+03
+        Time (ns)           :                 5.45
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.325
+        Momentum Direct - y :                0.788
+        Momentum Direct - z :               -0.522
+        Kinetic Energy (MeV):                0.228
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xbd4fd0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.75e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                -99.2
+        Position - y (mm)   :                  250
+        Position - z (mm)   :             1.02e+03
+        Time (ns)           :                 5.45
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.325
+        Momentum Direct - y :                0.788
+        Momentum Direct - z :               -0.522
+        Kinetic Energy (MeV):                0.228
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xbd50a8
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.75e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :                 -721
+        Position - y (mm)   :             1.76e+03
+        Position - z (mm)   :                   25
+        Time (ns)           :                 11.8
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.325
+        Momentum Direct - y :                0.788
+        Momentum Direct - z :               -0.522
+        Kinetic Energy (MeV):                0.228
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xbd4fd0
+  G4ParticleChange::CheckIt  : the Momentum Change is not unit vector !!
+  Difference:  1.75e-09
+ G4ParticleChange::CheckIt 
+ pointer : 0xbd3b88
+      -----------------------------------------------
+        G4ParticleChange Information  
+      -----------------------------------------------
+        # of 2ndaries       :                    0
+      -----------------------------------------------
+        Energy Deposit (MeV):                    0
+        Track Status        :                Alive
+        True Path Length (mm) :                    0
+        Stepping Control     :                    0
+        Event Biasing        :  not used 
+        Mass (GeV)   :                    0
+        Charge (eplus)   :                    0
+        Position - x (mm)   :            -1.85e+03
+        Position - y (mm)   :              4.5e+03
+        Position - z (mm)   :            -1.79e+03
+        Time (ns)           :                 23.4
+        Proper Time (ns)    :                    0
+        Momentum Direct - x :               -0.325
+        Momentum Direct - y :                0.788
+        Momentum Direct - z :               -0.522
+        Kinetic Energy (MeV):                0.228
+        Polarization - x    :                    0
+        Polarization - y    :                    0
+        Polarization - z    :                    0
+        Touchable (pointer) :             0xbd50a8
 >>> Event 98
-    95 trajectories stored in this event.
+    1151 trajectories stored in this event.
 >>> Event 99
-    125 trajectories stored in this event.
-Idle> Idle> 
\ No newline at end of file
+    269 trajectories stored in this event.
diff --git a/examples/novice/N02/include/ExN02ChamberParameterisation.hh b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
index 5df89c85de..2e2847d1e8 100644
--- a/examples/novice/N02/include/ExN02ChamberParameterisation.hh
+++ b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02ChamberParameterisation.hh,v 1.1.10.1 1999/12/07 20:47:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02ChamberParameterisation.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  A parameterisation that describes a series of boxes along Z
diff --git a/examples/novice/N02/include/ExN02DetectorConstruction.hh b/examples/novice/N02/include/ExN02DetectorConstruction.hh
index e101e2f824..c04fdae547 100644
--- a/examples/novice/N02/include/ExN02DetectorConstruction.hh
+++ b/examples/novice/N02/include/ExN02DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02DetectorConstruction.hh,v 1.1.10.1 1999/12/07 20:47:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02DetectorConstruction.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02DetectorMessenger.hh b/examples/novice/N02/include/ExN02DetectorMessenger.hh
index 6823449b8d..3a8d7c63a9 100644
--- a/examples/novice/N02/include/ExN02DetectorMessenger.hh
+++ b/examples/novice/N02/include/ExN02DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02DetectorMessenger.hh,v 1.1.10.1 1999/12/07 20:47:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02DetectorMessenger.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02EventAction.hh b/examples/novice/N02/include/ExN02EventAction.hh
index 6fa04d771c..b4c58a1670 100644
--- a/examples/novice/N02/include/ExN02EventAction.hh
+++ b/examples/novice/N02/include/ExN02EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02EventAction.hh,v 1.2.8.1 1999/12/07 20:47:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02EventAction.hh,v 1.3 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02MagneticField.hh b/examples/novice/N02/include/ExN02MagneticField.hh
index 053b404b31..6e407122b4 100644
--- a/examples/novice/N02/include/ExN02MagneticField.hh
+++ b/examples/novice/N02/include/ExN02MagneticField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02MagneticField.hh,v 1.1.10.1 1999/12/07 20:47:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02MagneticField.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //    A class for control of the Magnetic Field of the detector.
diff --git a/examples/novice/N02/include/ExN02PhysicsList.hh b/examples/novice/N02/include/ExN02PhysicsList.hh
index ba9de50b68..fec92f774f 100644
--- a/examples/novice/N02/include/ExN02PhysicsList.hh
+++ b/examples/novice/N02/include/ExN02PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PhysicsList.hh,v 1.3.6.1 1999/12/07 20:47:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PhysicsList.hh,v 1.4 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
index 26a307ea62..36153a3250 100644
--- a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
+++ b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PrimaryGeneratorAction.hh,v 1.1.10.1 1999/12/07 20:47:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02PrimaryGeneratorMessenger.hh b/examples/novice/N02/include/ExN02PrimaryGeneratorMessenger.hh
index a3bcfb98c6..a1f5e5004f 100644
--- a/examples/novice/N02/include/ExN02PrimaryGeneratorMessenger.hh
+++ b/examples/novice/N02/include/ExN02PrimaryGeneratorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PrimaryGeneratorMessenger.hh,v 1.1.10.1 1999/12/07 20:47:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02RunAction.hh b/examples/novice/N02/include/ExN02RunAction.hh
index 4c701d9aa3..77cc6a6c02 100644
--- a/examples/novice/N02/include/ExN02RunAction.hh
+++ b/examples/novice/N02/include/ExN02RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02RunAction.hh,v 1.2.8.1 1999/12/07 20:47:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02RunAction.hh,v 1.3 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02SteppingAction.hh b/examples/novice/N02/include/ExN02SteppingAction.hh
index 71d2b9f2e3..995affe692 100644
--- a/examples/novice/N02/include/ExN02SteppingAction.hh
+++ b/examples/novice/N02/include/ExN02SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02SteppingAction.hh,v 1.2.8.1 1999/12/07 20:47:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02SteppingAction.hh,v 1.3 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/include/ExN02SteppingVerbose.hh b/examples/novice/N02/include/ExN02SteppingVerbose.hh
new file mode 100644
index 0000000000..154ab547e2
--- /dev/null
+++ b/examples/novice/N02/include/ExN02SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN02SteppingVerbose.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// ExN02SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class ExN02SteppingVerbose;
+
+#ifndef ExN02SteppingVerbose_h
+#define ExN02SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class ExN02SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  ExN02SteppingVerbose();
+ ~ExN02SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/novice/N02/include/ExN02TrackerHit.hh b/examples/novice/N02/include/ExN02TrackerHit.hh
index b946ea8cd9..07674a28d0 100644
--- a/examples/novice/N02/include/ExN02TrackerHit.hh
+++ b/examples/novice/N02/include/ExN02TrackerHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02TrackerHit.hh,v 1.1.10.1 1999/12/07 20:47:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02TrackerHit.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN02TrackerHit_h
diff --git a/examples/novice/N02/include/ExN02TrackerSD.hh b/examples/novice/N02/include/ExN02TrackerSD.hh
index 860fe191f1..5b9ca4557f 100644
--- a/examples/novice/N02/include/ExN02TrackerSD.hh
+++ b/examples/novice/N02/include/ExN02TrackerSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02TrackerSD.hh,v 1.1.10.1 1999/12/07 20:47:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02TrackerSD.hh,v 1.2 1999/12/15 14:49:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN02TrackerSD_h
diff --git a/examples/novice/N02/include/ExN02VisManager.hh b/examples/novice/N02/include/ExN02VisManager.hh
index 41d0e9dfb4..7570dc6994 100644
--- a/examples/novice/N02/include/ExN02VisManager.hh
+++ b/examples/novice/N02/include/ExN02VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02VisManager.hh,v 1.2.8.1 1999/12/07 20:47:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02VisManager.hh,v 1.3 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02ChamberParameterisation.cc b/examples/novice/N02/src/ExN02ChamberParameterisation.cc
index 5c44ba3a69..71d1620367 100644
--- a/examples/novice/N02/src/ExN02ChamberParameterisation.cc
+++ b/examples/novice/N02/src/ExN02ChamberParameterisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02ChamberParameterisation.cc,v 1.1.10.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02ChamberParameterisation.cc,v 1.2 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN02ChamberParameterisation.hh"
diff --git a/examples/novice/N02/src/ExN02DetectorConstruction.cc b/examples/novice/N02/src/ExN02DetectorConstruction.cc
index 5b229d7a89..ec13bc68b9 100644
--- a/examples/novice/N02/src/ExN02DetectorConstruction.cc
+++ b/examples/novice/N02/src/ExN02DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02DetectorConstruction.cc,v 1.2.2.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02DetectorConstruction.cc,v 1.3 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -91,8 +91,8 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
 
   // Print all the materials defined.
   //
-    G4cout << endl << "The materials defined are : " << endl << endl;
-    G4cout << *(G4Material::GetMaterialTable()) << endl;
+    G4cout << G4endl << "The materials defined are : " << G4endl << G4endl;
+    G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
 //--------- Sizes of the principal geometrical components (solids)  ---------
   
@@ -140,7 +140,7 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
 				  false,           // no boolean operations
 				  0);              // no particular field 
 
-  G4cout << "Target is " << 2*targetSize/cm << " cm of Al " << endl;
+  G4cout << "Target is " << 2*targetSize/cm << " cm of Al " << G4endl;
 
   //------------------------------ 
   // Tracker
@@ -231,7 +231,7 @@ void ExN02DetectorConstruction::setMaterial(G4String materialChoice)
          {myMaterial = pttoMaterial;
           logicTracker->SetMaterial(pttoMaterial); 
           G4cout << "Absorber is " << fDetectorLength/cm << " cm of " << materialChoice 
-               << endl;}             
+               << G4endl;}             
     }
 
 }
@@ -256,7 +256,7 @@ void ExN02DetectorConstruction::SetDetectorLength(G4double length)
   solidTracker -> SetZHalfLength(halfSize);
   
   G4cout << "Absorber is " << fDetectorLength/cm << " cm of " << myMaterial->GetName()
-       << endl;     
+       << G4endl;     
 }  
 
 void ExN02DetectorConstruction::SetMagField(G4double fieldValue)
diff --git a/examples/novice/N02/src/ExN02DetectorMessenger.cc b/examples/novice/N02/src/ExN02DetectorMessenger.cc
index ca7b61ed83..b3789837a0 100644
--- a/examples/novice/N02/src/ExN02DetectorMessenger.cc
+++ b/examples/novice/N02/src/ExN02DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02DetectorMessenger.cc,v 1.1.10.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02DetectorMessenger.cc,v 1.2 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02EventAction.cc b/examples/novice/N02/src/ExN02EventAction.cc
index 462112b42e..a56967931d 100644
--- a/examples/novice/N02/src/ExN02EventAction.cc
+++ b/examples/novice/N02/src/ExN02EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02EventAction.cc,v 1.2.8.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02EventAction.cc,v 1.4 2000/01/24 14:45:51 stesting Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -32,14 +32,19 @@ void ExN02EventAction::BeginOfEventAction(const G4Event*)
 
 void ExN02EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
-  
+  G4int event_id = evt->GetEventID();
+
   G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
   G4int n_trajectories = 0;
-  if(trajectoryContainer)
-  { n_trajectories = trajectoryContainer->entries(); }
-  G4cout << "    " << n_trajectories 
-       << " trajectories stored in this event." << endl;
+  if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
+
+  if (event_id < 100 || event_id%100 == 0) {
+
+    G4cout << ">>> Event " << evt->GetEventID() << G4endl;
+  
+    G4cout << "    " << n_trajectories 
+	   << " trajectories stored in this event." << G4endl;
+  }
 
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
 
@@ -49,6 +54,3 @@ void ExN02EventAction::EndOfEventAction(const G4Event* evt)
     { (*(evt->GetTrajectoryContainer()))[i]->DrawTrajectory(50); }
   }
 }
-
-
-
diff --git a/examples/novice/N02/src/ExN02MagneticField.cc b/examples/novice/N02/src/ExN02MagneticField.cc
index ffe20d97da..e2ebd104af 100644
--- a/examples/novice/N02/src/ExN02MagneticField.cc
+++ b/examples/novice/N02/src/ExN02MagneticField.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02MagneticField.cc,v 1.1.10.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02MagneticField.cc,v 1.2 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //   User Field class implementation.
diff --git a/examples/novice/N02/src/ExN02PhysicsList.cc b/examples/novice/N02/src/ExN02PhysicsList.cc
index 4e5713b03e..4f662449b4 100644
--- a/examples/novice/N02/src/ExN02PhysicsList.cc
+++ b/examples/novice/N02/src/ExN02PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PhysicsList.cc,v 1.3.6.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PhysicsList.cc,v 1.4 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -27,7 +27,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 
 ExN02PhysicsList::ExN02PhysicsList():  G4VUserPhysicsList(),
diff --git a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
index dad28420a5..a8fc948b39 100644
--- a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
+++ b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PrimaryGeneratorAction.cc,v 1.1.10.1 1999/12/07 20:47:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // $ Id: $
diff --git a/examples/novice/N02/src/ExN02PrimaryGeneratorMessenger.cc b/examples/novice/N02/src/ExN02PrimaryGeneratorMessenger.cc
index 489d53a1c8..71840362f0 100644
--- a/examples/novice/N02/src/ExN02PrimaryGeneratorMessenger.cc
+++ b/examples/novice/N02/src/ExN02PrimaryGeneratorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02PrimaryGeneratorMessenger.cc,v 1.1.10.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02RunAction.cc b/examples/novice/N02/src/ExN02RunAction.cc
index 15d862235c..5003e07df7 100644
--- a/examples/novice/N02/src/ExN02RunAction.cc
+++ b/examples/novice/N02/src/ExN02RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02RunAction.cc,v 1.2.8.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02RunAction.cc,v 1.3 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -30,7 +30,7 @@ void ExN02RunAction::BeginOfRunAction(const G4Run* aRun)
 {
   ((G4Run *)(aRun))->SetRunID(runIDcounter++);
    
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
 
   G4UImanager* UI = G4UImanager::GetUIpointer();
   UI->ApplyCommand("/tracking/storeTrajectory 1"); 
diff --git a/examples/novice/N02/src/ExN02SteppingAction.cc b/examples/novice/N02/src/ExN02SteppingAction.cc
index b3aeb3f795..53a45ec1b8 100644
--- a/examples/novice/N02/src/ExN02SteppingAction.cc
+++ b/examples/novice/N02/src/ExN02SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02SteppingAction.cc,v 1.2.8.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02SteppingAction.cc,v 1.3 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02SteppingVerbose.cc b/examples/novice/N02/src/ExN02SteppingVerbose.cc
new file mode 100644
index 0000000000..ad3940db0a
--- /dev/null
+++ b/examples/novice/N02/src/ExN02SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN02SteppingVerbose.cc,v 1.2 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// ExN02SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the ExN02SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "ExN02SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+ExN02SteppingVerbose::ExN02SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+ExN02SteppingVerbose::~ExN02SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void ExN02SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void ExN02SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/novice/N02/src/ExN02TrackerHit.cc b/examples/novice/N02/src/ExN02TrackerHit.cc
index ff69b72c08..e3dd24fddb 100644
--- a/examples/novice/N02/src/ExN02TrackerHit.cc
+++ b/examples/novice/N02/src/ExN02TrackerHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02TrackerHit.cc,v 1.1.10.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02TrackerHit.cc,v 1.2 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN02TrackerHit.hh"
diff --git a/examples/novice/N02/src/ExN02TrackerSD.cc b/examples/novice/N02/src/ExN02TrackerSD.cc
index 7ff96bb5b3..821e5d1c40 100644
--- a/examples/novice/N02/src/ExN02TrackerSD.cc
+++ b/examples/novice/N02/src/ExN02TrackerSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02TrackerSD.cc,v 1.1.10.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02TrackerSD.cc,v 1.2 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN02TrackerSD.hh"
diff --git a/examples/novice/N02/src/ExN02VisManager.cc b/examples/novice/N02/src/ExN02VisManager.cc
index 4d223aa42e..672fe1881e 100644
--- a/examples/novice/N02/src/ExN02VisManager.cc
+++ b/examples/novice/N02/src/ExN02VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02VisManager.cc,v 1.2.8.1 1999/12/07 20:47:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN02VisManager.cc,v 1.3 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -123,7 +123,7 @@ void ExN02VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/novice/N03/exampleN03.cc b/examples/novice/N03/exampleN03.cc
index 2680a12790..2919c1bb7c 100644
--- a/examples/novice/N03/exampleN03.cc
+++ b/examples/novice/N03/exampleN03.cc
@@ -5,19 +5,20 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN03.cc,v 1.7.8.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN03.cc,v 1.10 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
-//      GEANT 4 - exampleN02 
+//      GEANT 4 - exampleN03 
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
-// 
+//#define G4UI_USE_XM 
+//
 // --------------------------------------------------------------
 
 #include "G4RunManager.hh"
@@ -36,13 +37,16 @@
 #include "ExN03RunAction.hh"
 #include "ExN03EventAction.hh"
 #include "ExN03SteppingAction.hh"
-#include "Randomize.hh"
+#include "ExN03SteppingVerbose.hh"
 
 int main(int argc,char** argv) {
 
   // choose the Random engine
   HepRandom::setTheEngine(new RanecuEngine);
-   
+  
+  //my Verbose output class
+  G4VSteppingVerbose::SetInstance(new ExN03SteppingVerbose);
+     
   // Construct the default run manager
   G4RunManager * runManager = new G4RunManager;
 
diff --git a/examples/novice/N03/exampleN03.in b/examples/novice/N03/exampleN03.in
index 25892e0e90..c661f44b10 100644
--- a/examples/novice/N03/exampleN03.in
+++ b/examples/novice/N03/exampleN03.in
@@ -1,4 +1,4 @@
-/run/particle/dumpCutValues
+
 # e+ 300MeV 
 /gun/particle e+
 /gun/energy 300 MeV
diff --git a/examples/novice/N03/exampleN03.large_N.in b/examples/novice/N03/exampleN03.large_N.in
new file mode 100644
index 0000000000..540205c95a
--- /dev/null
+++ b/examples/novice/N03/exampleN03.large_N.in
@@ -0,0 +1,28 @@
+
+# e+ 300MeV 
+/gun/particle e+
+/gun/energy 300 MeV
+/run/beamOn 1
+#
+# list the existing physics processes
+/process/list
+#
+# switch off MultipleScattering
+/process/inactivate msc
+/run/beamOn 1
+#
+# switch on MultipleScattering
+/process/activate msc 
+#
+# change detector parameter
+/calor/setAbsMat Aluminium
+/calor/setGapMat Aerogel
+/calor/setAbsThick 2. cm
+/calor/setGapThick 5. cm
+/calor/setNbOfLayers 30
+/calor/setSizeYZ   1.5 m
+/calor/update
+/gun/particle gamma
+/gun/energy 500 MeV
+/run/beamOn 5000
+exit
diff --git a/examples/novice/N03/exampleN03.out b/examples/novice/N03/exampleN03.out
index 161e631793..8eb62032b1 100644
--- a/examples/novice/N03/exampleN03.out
+++ b/examples/novice/N03/exampleN03.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -57,8 +57,10 @@
 
 
 
- The calorimeter is made of 10 layers of: [ 10mm of Lead + 5mm of liquidArgon ] 
-ExN03PhysicsList::SetCuts:CutLength : 2 mm 
+------------------------------------------------------------
+---> The calorimeter is 10 layers of: [ 10mm of Lead + 5mm of liquidArgon ] 
+------------------------------------------------------------
+ExN03PhysicsList::SetCuts:CutLength : 1 mm 
 
 phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
         Sandia crossSection below 50 KeV
@@ -119,83 +121,24 @@ MuPairProd:  theoretical cross sections
     PhysicsTables from 1 GeV to 1e+03 PeV in 50 bins. 
 ============= The cut Energy ==============================
                             gamma              e-             mu-          proton         neutron    
-Cut in range                  2 mm            2 mm            2 mm            2 mm            2 mm 
+Cut in range                  1 mm            1 mm            1 mm            1 mm            1 mm 
 Cut in energy
-          Aluminium        9.56 keV        1.03 MeV        7.44 MeV        19.4 MeV         990 eV 
-        liquidArgon        8.59 keV         561 keV        4.78 MeV        12.3 MeV         990 eV 
-             Copper        35.7 keV        2.68 MeV        13.3 MeV        34.3 MeV         990 eV 
-               Lead         121 keV        2.61 MeV        12.6 MeV        31.8 MeV         990 eV 
-              Water        3.89 keV         568 keV        4.96 MeV        13.1 MeV         990 eV 
-       Scintillator        3.07 keV         575 keV        5.02 MeV        13.4 MeV         990 eV 
-             quartz        7.59 keV         907 keV        6.91 MeV        18.1 MeV         990 eV 
-                Air         990 eV          990 eV         82.2 keV         174 keV         990 eV 
-            Aerogel        2.32 keV         181 keV         1.9 MeV        4.84 MeV         990 eV 
-        CarbonicGas         990 eV         54.1 keV         597 keV        1.34 MeV         990 eV 
-         WaterSteam         990 eV          990 eV         29.6 keV          45 keV         990 eV 
+          Aluminium        6.89 keV         597 keV        5.02 MeV        13.1 MeV         990 eV 
+        liquidArgon        6.18 keV         343 keV        3.24 MeV        8.32 MeV         990 eV 
+             Copper        24.6 keV         1.4 MeV        8.95 MeV          23 MeV         990 eV 
+               Lead         101 keV        1.38 MeV        8.52 MeV        20.9 MeV         990 eV 
+              Water         2.9 keV         347 keV        3.39 MeV        8.95 MeV         990 eV 
+       Scintillator        2.37 keV         356 keV        3.43 MeV        9.06 MeV         990 eV 
+             quartz        5.52 keV         534 keV        4.66 MeV        12.2 MeV         990 eV 
+                Air         990 eV          990 eV         48.4 keV        83.2 keV         990 eV 
+            Aerogel        1.71 keV         119 keV        1.28 MeV        3.18 MeV         990 eV 
+        CarbonicGas         990 eV         36.5 keV         393 keV         853 keV         990 eV 
+         WaterSteam         990 eV          990 eV         11.9 keV        14.9 keV         990 eV 
            Galactic         990 eV          990 eV          990 eV          990 eV          990 eV 
                Beam         990 eV          990 eV          990 eV          990 eV          990 eV 
 ===================================================
-#
-# Macro file for the initialization phase of "exampleN03.cc"
-#
-# Sets some default verbose
-# and initializes the graphic.
-#
-/control/saveHistory
-/run/verbose 2
-#
-# Create empty scene ("world" is default)
-/vis/scene/create
-#
-# Add volume to scene
-/vis/scene/add/volume
-#
-# Create a scene handler for a specific graphics system
-# Edit the next line(s) to choose another graphic system
-#
-#/vis/sceneHandler/create DAWNFILE
-/vis/sceneHandler/create OGLIX
-#
-# Create a viewer
-/vis/viewer/create
-#
-# Draw scene
-/vis/scene/notifyHandlers
-#
-# for drawing the tracks
-# if too many tracks cause core dump => storeTrajectory 0
-/tracking/storeTrajectory 1
-#/vis/scene/include/trajectories
-#
-# Flush visualization
-/vis/viewer/update
-
-Idle> /run/particle/dumpCutValues
-============= The cut Energy ==============================
-                            gamma              e-             mu-          proton         neutron    
-Cut in range                  2 mm            2 mm            2 mm            2 mm            2 mm 
-Cut in energy
-          Aluminium        9.56 keV        1.03 MeV        7.44 MeV        19.4 MeV         990 eV 
-        liquidArgon        8.59 keV         561 keV        4.78 MeV        12.3 MeV         990 eV 
-             Copper        35.7 keV        2.68 MeV        13.3 MeV        34.3 MeV         990 eV 
-               Lead         121 keV        2.61 MeV        12.6 MeV        31.8 MeV         990 eV 
-              Water        3.89 keV         568 keV        4.96 MeV        13.1 MeV         990 eV 
-       Scintillator        3.07 keV         575 keV        5.02 MeV        13.4 MeV         990 eV 
-             quartz        7.59 keV         907 keV        6.91 MeV        18.1 MeV         990 eV 
-                Air         990 eV          990 eV         82.2 keV         174 keV         990 eV 
-            Aerogel        2.32 keV         181 keV         1.9 MeV        4.84 MeV         990 eV 
-        CarbonicGas         990 eV         54.1 keV         597 keV        1.34 MeV         990 eV 
-         WaterSteam         990 eV          990 eV         29.6 keV          45 keV         990 eV 
-           Galactic         990 eV          990 eV          990 eV          990 eV          990 eV 
-               Beam         990 eV          990 eV          990 eV          990 eV          990 eV 
-===================================================
-Idle> # e+ 300MeV 
-Idle> /gun/particle e+
-Idle> /gun/energy 300 MeV
-Idle> /run/beamOn 1
+# e+ 300MeV 
 ### Run 0 start.
-Start closing geometry.
-Start Run processing.
 
 ---> Event: 0
 
@@ -204,91 +147,57 @@ Start Run processing.
  Current couple of seeds = 9876, 54321
 ----------------------------------------
 >>> Event 0
-     9 hits are stored in ExN03CalorHitsCollection.
-   Absorber: total energy: 2.8e+02 MeV       total track length:      17 cm 
-        Gap: total energy:      13 MeV       total track length:       7 cm 
-    210 trajectories stored in this event.
-Run terminated.
-Run Summary
-  Number of events processed : 1
-  User=0.44s Real=0.57s Sys=0.05s
-Idle> #
-Idle> # list the existing physics processes
-Idle> /process/list
+    0 trajectories stored in this event.
+     10 hits are stored in ExN03CalorHitsCollection.
+   Absorber: total energy: 2.8e+02 MeV       total track length:      16 cm 
+        Gap: total energy:     3.7 MeV       total track length:     1.5 cm 
+#
+# list the existing physics processes
      Transportation,                msc,              hIoni,              eIoni
               eBrem,            annihil,               phot,              compt
                conv,             MuIoni,            MuBrems,         MuPairProd
               Decay
-Idle> #
-Idle> # switch off MultipleScattering
-Idle> /process/inactivate msc
-Idle> /run/beamOn 1
+#
+# switch off MultipleScattering
 ### Run 1 start.
-Start Run processing.
 
 ---> Event: 0
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1364523396, 538526746
+ Current couple of seeds = 1081085135, 235076861
 ----------------------------------------
 >>> Event 0
-     10 hits are stored in ExN03CalorHitsCollection.
-   Absorber: total energy: 2.9e+02 MeV       total track length:      15 cm 
-        Gap: total energy:      14 MeV       total track length:     6.3 cm 
-    216 trajectories stored in this event.
-Run terminated.
-Run Summary
-  Number of events processed : 1
-  User=0.47s Real=0.47s Sys=0s
-Idle> #
-Idle> # switch on MultipleScattering
-Idle> /process/activate msc
-Idle> #
-Idle> # change detector parameter
-Idle> /calor/setAbsMat Aluminium
+    0 trajectories stored in this event.
+     9 hits are stored in ExN03CalorHitsCollection.
+   Absorber: total energy: 2.8e+02 MeV       total track length:      17 cm 
+        Gap: total energy:      20 MeV       total track length:     9.8 cm 
+#
+# switch on MultipleScattering
+#
+# change detector parameter
 
- The calorimeter is made of 10 layers of: [ 10mm of Aluminium + 5mm of liquidArgon ] 
-Idle> /calor/setGapMat Aerogel
+------------------------------------------------------------
+---> The calorimeter is 10 layers of: [ 10mm of Aluminium + 5mm of liquidArgon ] 
+------------------------------------------------------------
 
- The calorimeter is made of 10 layers of: [ 10mm of Aluminium + 5mm of Aerogel ] 
-Idle> /calor/setAbsThick 2. cm
-Idle> /calor/setGapThick 5. cm
-Idle> /calor/setNbOfLayers 30
-Idle> /calor/setSizeYZ   1.5 m
-Idle> /calor/update
+------------------------------------------------------------
+---> The calorimeter is 10 layers of: [ 10mm of Aluminium + 5mm of Aerogel ] 
+------------------------------------------------------------
 
- The calorimeter is made of 30 layers of: [ 20mm of Aluminium + 50mm of Aerogel ] 
-Idle> /gun/particle gamma
-Idle> /gun/energy 500 MeV
-Idle> /run/beamOn 1
+------------------------------------------------------------
+---> The calorimeter is 30 layers of: [ 20mm of Aluminium + 50mm of Aerogel ] 
+------------------------------------------------------------
 ### Run 2 start.
-Start closing geometry.
-Start Run processing.
 
 ---> Event: 0
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1243028270, 582042789
+ Current couple of seeds = 1062777741, 543200454
 ----------------------------------------
 >>> Event 0
-     26 hits are stored in ExN03CalorHitsCollection.
-   Absorber: total energy: 3.7e+02 MeV       total track length:      85 cm 
-        Gap: total energy:      77 MeV       total track length:     2.1 m  
-    175 trajectories stored in this event.
-Run terminated.
-Run Summary
-  Number of events processed : 1
-  User=1.1s Real=1.2s Sys=0.08s
-Idle> G4 kernel has come to Quit state.
-Deletion of G4 kernel class start.
-UserDetectorConstruction deleted.
-UserPhysicsList deleted.
-UserRunAction deleted.
-UserPrimaryGenerator deleted.
-G4SDManager deleted.
-EventManager deleted.
-UImanager deleted.
-StateManager deleted.
-RunManager is deleting.
+    0 trajectories stored in this event.
+     30 hits are stored in ExN03CalorHitsCollection.
+   Absorber: total energy: 3.9e+02 MeV       total track length:      91 cm 
+        Gap: total energy:      81 MeV       total track length:     2.2 m  
diff --git a/examples/novice/N03/g4.xrm b/examples/novice/N03/g4.xrm
new file mode 100644
index 0000000000..e5a4c28c83
--- /dev/null
+++ b/examples/novice/N03/g4.xrm
@@ -0,0 +1,363 @@
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!! 
+!!!!  A X11 resource file to customize G4UI sessions and 
+!!!! visualization viewers based over Xt. You use it by
+!!!! setting the XENVIRONMENT environment variable to point
+!!!! to this file, for example :
+!!!!    csh> setenv XENVIRONMENT g4.xrm
+!!!!     sh> XENVIRONMENT=g4.xrm;export XENVIRONMENT
+!!!! 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*topShadowColor    :white
+*bottomShadowColor :black
+*foreground        :black
+*background        :lightgrey
+*borderColor       :lightgrey
+*fontList          :-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!! G4UIXm
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*text.background   :white
+*text.fontList     :*courier*-r-*--14-*
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!! OPACS/Xo/XoCamera widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*XoCamera.width:400
+*XoCamera.height:400
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! OpenInventor resources, copied from file :
+!  OpenInventor2.4.1/app-defaults/Inventor
+!
+!#################################################
+!       RESSOURCE FILE FOR OPEN INVENTOR         !
+!#################################################
+!
+! You must put this file in
+! /usr/lib/X11/app-defaults
+! or set up XAPPLRESDIR (see X window documentation)
+!
+!#################################################
+!!################################################
+!!                 POPUP MENU
+!!------------------------------------------------
+!!               FUNCTIONS MENU
+!!------------------------------------------------
+*IvMenu.IvFunctions1.labelString: Functions
+*IvFunctions2.IvHelp.labelString: Help
+*IvFunctions2.IvHome.labelString: Home
+*IvFunctions2.IvSetHome.labelString: Set Home
+*IvFunctions2.IvViewAll.labelString: View All
+*IvFunctions2.IvSeek.labelString: Seek
+*IvFunctions2.IvCopyView.labelString: Copy View
+*IvFunctions2.IvPasteView.labelString: Paste View
+!!------------------------------------------------
+!!               DRAW STYLE MENU
+!!------------------------------------------------
+*IvMenu.IvDrawStyle1.labelString: Draw Style
+*IvDrawStyle2.IvAsIs.labelString: as is
+*IvDrawStyle2.IvHiddenLine.labelString: hidden line
+*IvDrawStyle2.IvNoTexture.labelString: no texture
+*IvDrawStyle2.IvLowResolution.labelString: low resolution
+*IvDrawStyle2.IvWireFrame.labelString: wireframe
+*IvDrawStyle2.IvPoints.labelString: points
+*IvDrawStyle2.IvBoundingBoxNoDepth.labelString: bounding box ( no depth )
+*IvDrawStyle2.IvMoveSameAsStill.labelString: move same as still
+*IvDrawStyle2.IvMoveNoTexture.labelString:  move no texture.
+*IvDrawStyle2.IvMoveLowRes.labelString: move low res
+*IvDrawStyle2.IvMoveWireFrame.labelString: move wireframe
+*IvDrawStyle2.IvMoveLowResWireFrameNoDepth.labelString: move low res wire frame ( no depth )
+*IvDrawStyle2.IvMovePoints.labelString: move points
+*IvDrawStyle2.IvMoveLowResPointsNoDepth.labelString: move low res points ( no depth )
+*IvDrawStyle2.IvMoveBoundingBoxNoDepth.labelString: move bounding box ( no depth )
+*IvDrawStyle2.IvSingleBuffer.labelString: single buffer
+*IvDrawStyle2.IvDoubleBuffer.labelString: Double buffer
+*IvDrawStyle2.IvInteractiveBuffer.labelString: interactive buffer
+!!------------------------------------------------
+*IvMenu.IvViewing.labelString: Viewing
+!!------------------------------------------------
+*IvMenu.IvDecoration.labelString: Decoration
+!!------------------------------------------------
+*IvMenu.IvHeadlight.labelString: Headlight
+!!------------------------------------------------
+*IvMenu.IvPreferences.labelString: Preferences ...
+
+!!------------------------------------------------
+!!                 PREFERENCES
+!!------------------------------------------------
+*IvFormPreference1.IvSeekAnimationTime.labelString: Seek animation time
+*IvFormPreference1.IvSeconds.labelString: seconds
+*IvFormPreference1.IvSeekTo.labelString: Seek to:
+*IvFormPreference1.IvPoint.labelString: point
+*IvFormPreference1.IvObject.labelString: object
+*IvFormPreference2.IvSeekDistance.labelString: Seek distance:
+*IvFormPreference2.IvPercentage.labelString: percentage
+*IvFormPreference2.IvAbsolute.labelString: absolute
+*IvZoomForm.IvCameraZoom.labelString: Camera zoom
+*IvZoomForm.IvZoomSliderRangesFrom.labelString: Zoom slider ranges from:
+*IvZoomForm.IvTo.labelString: to:
+*IvZoomForm.IvZoomSlider.labelString: Zoom slider
+*IvZoomForm.IvZoomField.labelString: Zoom field
+*IvZoomForm.IvZoomFrom.labelString: Zoom from
+*IvZoomForm.IvZoomTo.labelString: Zoom to
+*IvFormPreference3.IvAutoClippingPlanes.labelString: Auto clipping planes 
+*IvFormPreference4.IvStereoViewing.labelString: Stereo Viewing
+*IvFormPreference6.IvNearPlane.labelString: near plane
+*IvFormPreference6.IvFarPlane.labelString: far plane
+*IvStereoThumbForm.IvCameraRotation.labelString: Camera rotation
+
+!!------------------------------------------------
+!! Preferences for Examiner Viewer
+!!------------------------------------------------
+*IvFormExaminer1.IvEnableSpinAnimation.labelString: Enable spin animation
+*IvFormExaminer1.IvShowPointOfRotationAxes.labelString: Show point of rotation axes
+*IvFormExaminer1.IvAxesSize.labelString: axes size
+*IvFormExaminer1.IvPixels.labelString: pixels
+!!------------------------------------------------
+!! Decorations for Examiner Viewer !!
+!!------------------------------------------------
+*IvExamTitle.labelString: Examiner Viewer
+*IvExamPrefTitle.labelString: Examiner Viewer Preference Sheet
+*IvExamPopupTitle.labelString: Examiner Viewer
+*IvExamIconTitle.labelString: Examiner Viewer
+*IvExamRotx.labelString: Rotx
+*IvExamRoty.labelString: Roty
+*IvExamZoom.labelString: Zoom
+*IvExamDolly.labelString: Dolly
+!!------------------------------------------------
+!! Decorations for Plane Viewer !!
+!!------------------------------------------------
+*IvPlaneTitle.labelString: Plane Viewer
+*IvPlanePrefTitle.labelString: Plane Viewer Preference Sheet
+*IvPlanePopupTitle.labelString: Plane Viewer
+*IvPlaneIconTitle.labelString: Plane Viewer
+*IvPlaneTransx.labelString: transX
+*IvPlaneTransy.labelString: transY
+*IvPlaneZoom.labelString: Zoom
+*IvPlaneDolly.labelString: Dolly
+!!------------------------------------------------
+!! Decorations for Fly Viewer !!
+!!------------------------------------------------
+*IvFlyTitle.labelString: Fly Viewer
+*IvFlyPrefTitle.labelString: Fly Viewer Preference Sheet
+*IvFlyPopupTitle.labelString: Fly Viewer
+*IvFlyIconTitle.labelString: Fly Viewer
+!! Same for Walk Viewer !!
+*IvFlyWalkRotate.labelString: Rotate
+!! Same for Walk Viewer !!
+*IvFlyWalkTilt.labelString: Tilt
+!! Same for Walk Viewer !!
+*IvFlyWalkDolly.labelString: Dolly
+!!------------------------------------------------
+!! Preferences for Fly Viewer !!
+!!------------------------------------------------
+*FlyPreference.FlyingSpeed.labelString: Flying speed:
+*FlyPreference.Increase.labelString: increase
+*FlyPreference.Decrease.labelString: decrease 
+!!------------------------------------------------
+!! Decorations for Walk Viewer !!
+!!------------------------------------------------
+*IvWalkTitle.labelString: Walk Viewer
+*IvWalkPrefTitle.labelString: Walk Viewer Preference Sheet
+*IvWalkPopupTitle.labelString: Walk Viewer
+*IvWalkIconTitle.labelString: Walk Viewer
+*IvLeftTrimForm.IvH.labelString: H
+!!------------------------------------------------
+!! Preferences for Walk Viewer !!
+!!------------------------------------------------
+*IvFormPreference5.IvViewerSpeed.labelString: Viewer speed
+*IvFormPreference5.IvIncrease.labelString: increase
+*IvFormPreference5.IvDecrease.labelString: decrease
+!!------------------------------------------------
+!!              EDITORS
+!!------------------------------------------------
+!! Drectional Light Editor !!
+!!------------------------------------------------      
+*IvDirectLightTitle.labelString: Dir Light Editor
+*IvDirectLightIconTitle.labelString: Dir Light Ed
+*IvDirectLightInten.labelString: Inten
+*IvDirectLightColorEditor.labelString: Directional Light Color
+*IvDLMenuBar.IvEdit.labelString: Edit
+*IvDLMenuBar*IvControlPullDown*IvColorEditor.labelString: Color Editor
+*IvDLMenuBar*IvControlPullDown*IvCopy.labelString: Copy
+*IvDLMenuBar*IvControlPullDown*IvPaste.labelString: Paste
+*IvDLMenuBar*IvControlPullDown*IvHelp.labelString: Help
+!!------------------------------------------------
+!! Color Editor !!
+!!------------------------------------------------
+*IvColorEditorTitle.labelString: Color Editor
+*IvColorEditorIconTitle.labelString: Color Editor
+*IvColorEditorR.labelString: R
+*IvColorEditorG.labelString: G
+*IvColorEditorB.labelString: B
+*IvColorEditorH.labelString: H
+*IvColorEditorS.labelString: S
+*IvColorEditorV.labelString: V
+*IvColorEditorRight.labelString: Right
+*IvColorEditorSwitch.labelString: Switch
+*IvColorEditorCont.labelString: Continuous
+*IvColorEditorManu.labelString: Manual
+*IvColorEditorWysi.labelString: WYSIWYG
+*IvColorEditorCopy.labelString: Copy
+*IvColorEditorPaste.labelString: Paste
+*IvColorEditorHelp.labelString: Help
+*IvColorEditorNone.labelString: None
+*IvColorEditorValue.labelString: Value
+*IvColorEditorRGB.labelString: RGB
+*IvColorEditorHSV.labelString: HSV
+*IvColorEditorRGBV.labelString: RGB V
+*IvColorEditorRGBHSV.labelString: RGB HSV
+
+*IvCEMenuBar.IvEdit.labelString: Edit
+*IvCEMenuBar.IvSliders.labelString: Sliders
+*IvButtonsForm.IvAccept.labelString: Accept
+!!------------------------------------------------
+!! Material Editor !!
+!!------------------------------------------------
+*IvMaterialEditorTitle.labelString: Material Editor
+*IvMaterialEditorIconTitle.labelString: Mat Editor
+*IvMaterialAmbientTitle.labelString: Material Ambient Color
+*IvMaterialDiffuseTitle.labelString: Material Diffuse Color
+*IvMaterialSpecularTitle.labelString: Material Specular Color
+*IvMaterialEmissiveTitle.labelString: -Material Emissive Color
+*IvMaterialEditorMaterial.labelString: Material / 
+*IvMaterialEditorAmb.labelString: Amb / 
+*IvMaterialEditorDiff.labelString: Diff /  
+*IvMaterialEditorSpec.labelString: Spec / 
+*IvMaterialEditorEmis.labelString: Emis / 
+*IvMaterialEditorColor.labelString: Color
+*IvMEMenuBar.IvEdit.labelString: Edit
+*IvMEMenuBar*IvEditPullDown.IvMaterialList.labelString: Material List
+*IvMEMenuBar*IvEditPullDown.IvContinuous.labelString: Continuous
+*IvMEMenuBar*IvEditPullDown.IvManual.labelString: Manual
+*IvMEMenuBar*IvEditPullDown.IvCopy.labelString: Copy
+*IvMEMenuBar*IvEditPullDown.IvPaste.labelString: Paste
+*IvMEMenuBar*IvEditPullDown.IvHelp.labelString: Help
+*IvControls.IvEditColor.labelString: Edit Color
+*IvsliderForm.IvtextForm.IvAmb.labelString: Amb:
+*IvsliderForm.IvtextForm.IvDiff.labelString: Diff
+*IvsliderForm.IvtextForm.IvSpec.labelString: Spec
+*IvsliderForm.IvtextForm.IvEmis.labelString: Emis
+*IvsliderForm.IvtextForm.IvShininess.labelString: Shininess
+*IvsliderForm.IvtextForm.IvTransp.labelString: Transp:
+*IvMETop.IvAccept.labelString: Accept
+!!------------------------------------------------
+!! Material List !!
+!!------------------------------------------------
+*IvMaterialListTitle.labelString: Material List
+*IvMaterialListeIconTitle.labelString: Mat List
+*IvMLMenuBar*IvPalettes.labelString: Palettes
+!!------------------------------------------------
+!! Print Dialog
+!!------------------------------------------------
+*IvPrintDialTitle.labelString: Print Dialog 
+*IvPrintDialIconTitle.labelString: -rint Dialog
+*IvPrintDialPrinter.labelString: Printer:
+*IvPrintDialPageOut.labelString: Page Output:
+*IvPrintDialToPrinter.labelString: To Printer
+*IvPrintDialToFile.labelString: To File
+*IvPrintDialQuit.labelString: Quit
+*IvPrintDialPrint.labelString: Print
+*IvPrintDialMessage.labelString: Message:
+*IvPrintDialFileFormat.labelString: File Format:
+*IvPrintDialPostScript.labelString: PostScript
+*IvPrintDialRGB.labelString: RGB
+*IvPrintDialPrintQuality.labelString: Print Quality:
+*IvPrintDialHigh.labelString: High
+*IvPrintDialDraft.labelString: Draft
+*IvPrintDialPageFormat.labelString: Page Format
+*IvPrintDialPortrait.labelString: Portrait
+*IvPrintDialLandscape.labelString: Landscape
+*IvPrintDialPrintSize.labelString: Print Size (inches):
+*IvPrintDialFileName.labelString: File Name:
+*IvPrintDialResolution.labelString: Resolution
+*IvPrintDialBy.labelString: by
+*IvPrintDialDpi.labelString: DPI:
+*IvPrintDialMess1.labelString: Printing in progress...
+*IvPrintDialMess2.labelString: ERROR:  Empty database.
+*IvPrintDialMess3.labelString: ERROR:  Exceeds 
+*IvPrintDialMess4.labelString: ERROR:  Could not execute print.
+*IvPrintDialMess5.labelString: ERROR:  Could not execute print.
+*IvPrintDialMess6.labelString: ERROR:  No printer.
+*IvPrintDialMess7.labelString: ERROR:  Couldn't open 
+*IvPrintDialMess8.labelString: ERROR:  No file name.
+*IvPrintDialMess9.labelString: ERROR:   Could not open file.
+*IvPrintDialMess10.labelString: ERROR:  Could not get data.
+*IvPrintDialMess11.labelString: ERROR:  Could not get data.
+*IvPrintDialMess12.labelString: Printing completed.
+
+!!------------------------------------------------
+!! Xt Component ( For Light and Material Sliders Set )
+!!------------------------------------------------
+*IvXtComponentTitle.labelString: Xt Component
+*IvTGSXtComponentTitle.labelString: TGS: Xt Component
+!!------------------------------------------------
+!! For All Sliders
+!!------------------------------------------------
+*IvSlidersMin.labelString: min
+*IvSlidersMax.labelString: max
+*IvSlidersStyle.labelString: style
+!!------------------------------------------------
+!! Light Slider Set 
+!!------------------------------------------------
+*IvLightSliderColor.labelString: COLOR
+*IvLightSliderRed.labelString: Red
+*IvLightSliderGreen.labelString: Green
+*IvLightSliderBlue.labelString: Blue
+*IvLightSliderIntensity1.labelString: INTENSITY
+*IvLightSliderIntensity2.labelString: Intensity
+!!------------------------------------------------
+!! Material Slider Set
+!!------------------------------------------------
+*IvMaterialSliderAmbient.labelString: AMBIENT
+*IvMaterialSliderAmbientRed.labelString: Ambient Red
+*IvMaterialSliderAmbientGreen.labelString: Ambient Green
+*IvMaterialSliderAmbientBleu.labelString: Ambient Blue
+*IvMaterialSliderDiffuse.labelString: DIFFUSE
+*IvMaterialSliderDiffuseRed.labelString: Diffuse Red
+*IvMaterialSliderDiffuseGreen.labelString:  Diffuse Green
+*IvMaterialSliderDiffuseBleu.labelString: Diffuse Blue
+*IvMaterialSliderSpecular.labelString: SPECULAR
+*IvMaterialSliderSpecularRed.labelString: Specular Red
+*IvMaterialSliderSpecularGreen.labelString: Specular Green
+*IvMaterialSliderSpecularBleu.labelString: Specular Blue
+*IvMaterialSliderEmissive.labelString: EMISSIVE
+*IvMaterialSliderEmissiveRed.labelString: Emissive Red
+*IvMaterialSliderEmissiveGreen.labelString: Emissive Green
+*IvMaterialSliderEmissiveBlue.labelString: Emissive Blue
+*IvMaterialSliderShininess.labelString: SHININESS
+*IvMaterialSliderShininessShininess.labelString: shininess 
+*IvMaterialSliderTransparency.labelString: TRANSPARENCY
+*IvMaterialSliderTransparencyTransparency.labelString: transparency
+!!------------------------------------------------
+!! Transform Slider Set
+!!------------------------------------------------
+*IvTransformSliderTrans.labelString: TRANSLATIONS
+*IvTransformSliderTransX.labelString: X Translation
+*IvTransformSliderTransY.labelString: Y Translation
+*IvTransformSliderTransZ.labelString: Z Translation
+*IvTransformSliderScale.labelString: SCALES
+*IvTransformSliderScaleX.labelString: X Scale
+*IvTransformSliderScaleY.labelString: Y Scale
+*IvTransformSliderScaleZ.labelString: Z Scale
+*IvTransformSliderRotate.labelString: ROTATIONS
+*IvTransformSliderRotateX.labelString: X Rotate
+*IvTransformSliderRotateY.labelString: Y Rotate
+*IvTransformSliderRotateZ.labelString: Z Rotate
+*IvTransformSliderScaleOrient.labelString: SCALE ORIENTATION
+*IvTransformSliderScaleOrientX.labelString: X Rotate
+*IvTransformSliderScaleOrientY.labelString: Y Rotate
+*IvTransformSliderScaleOrientZ.labelString: Z Rotate
+*IvTransformSliderCenter.labelString: CENTER
+*IvTransformSliderCenterX.labelString: X Center
+*IvTransformSliderCenterY.labelString: Y Center
+*IvTransformSliderCenterZ.labelString: Z Center
+*IvTransformSliderTitle.labelString: Transform Editor
+*IvTransformSliderIconTitle.labelString: Xf Editor
+
+
+!!------------------- THE END --------------------
diff --git a/examples/novice/N03/include/ExN03CalorHit.hh b/examples/novice/N03/include/ExN03CalorHit.hh
index abdc65e670..ab49dd0c11 100644
--- a/examples/novice/N03/include/ExN03CalorHit.hh
+++ b/examples/novice/N03/include/ExN03CalorHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03CalorHit.hh,v 1.1.10.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03CalorHit.hh,v 1.2 1999/12/15 14:49:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03CalorimeterSD.hh b/examples/novice/N03/include/ExN03CalorimeterSD.hh
index 1854617355..3f7ee5df1f 100644
--- a/examples/novice/N03/include/ExN03CalorimeterSD.hh
+++ b/examples/novice/N03/include/ExN03CalorimeterSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03CalorimeterSD.hh,v 1.1.10.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03CalorimeterSD.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorConstruction.hh b/examples/novice/N03/include/ExN03DetectorConstruction.hh
index 0b50cfb453..2084360c4f 100644
--- a/examples/novice/N03/include/ExN03DetectorConstruction.hh
+++ b/examples/novice/N03/include/ExN03DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03DetectorConstruction.hh,v 1.1.10.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03DetectorConstruction.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorMessenger.hh b/examples/novice/N03/include/ExN03DetectorMessenger.hh
index 7bf8ec5322..e404f62d55 100644
--- a/examples/novice/N03/include/ExN03DetectorMessenger.hh
+++ b/examples/novice/N03/include/ExN03DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03DetectorMessenger.hh,v 1.1.10.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03DetectorMessenger.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventAction.hh b/examples/novice/N03/include/ExN03EventAction.hh
index 0f699cd119..1a449973f0 100644
--- a/examples/novice/N03/include/ExN03EventAction.hh
+++ b/examples/novice/N03/include/ExN03EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03EventAction.hh,v 1.3.8.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03EventAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventActionMessenger.hh b/examples/novice/N03/include/ExN03EventActionMessenger.hh
index 8512078953..5bbd899d65 100644
--- a/examples/novice/N03/include/ExN03EventActionMessenger.hh
+++ b/examples/novice/N03/include/ExN03EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03EventActionMessenger.hh,v 1.2.8.1 1999/12/07 20:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03EventActionMessenger.hh,v 1.3 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PhysicsList.hh b/examples/novice/N03/include/ExN03PhysicsList.hh
index 5702f98276..a20e985959 100644
--- a/examples/novice/N03/include/ExN03PhysicsList.hh
+++ b/examples/novice/N03/include/ExN03PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PhysicsList.hh,v 1.4.6.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PhysicsList.hh,v 1.5 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
index 3e159b1392..f7245b9124 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PrimaryGeneratorAction.hh,v 1.1.10.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
index 0cbeb0ae86..8a25375386 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.1.10.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03RunAction.hh b/examples/novice/N03/include/ExN03RunAction.hh
index 94183e9cb9..da343bd964 100644
--- a/examples/novice/N03/include/ExN03RunAction.hh
+++ b/examples/novice/N03/include/ExN03RunAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03RunAction.hh,v 1.3.8.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03RunAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingAction.hh b/examples/novice/N03/include/ExN03SteppingAction.hh
index d4c724ff4b..97812eaea1 100644
--- a/examples/novice/N03/include/ExN03SteppingAction.hh
+++ b/examples/novice/N03/include/ExN03SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03SteppingAction.hh,v 1.2.8.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03SteppingAction.hh,v 1.3 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingVerbose.hh b/examples/novice/N03/include/ExN03SteppingVerbose.hh
new file mode 100644
index 0000000000..f4a34db281
--- /dev/null
+++ b/examples/novice/N03/include/ExN03SteppingVerbose.hh
@@ -0,0 +1,47 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN03SteppingVerbose.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//  
+//---------------------------------------------------------------
+//
+// ExN03SteppingVerbose.hh
+//
+// Description:
+//   This class manages the vervose outputs in G4SteppingManager. 
+//   
+//
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+class ExN03SteppingVerbose;
+
+#ifndef ExN03SteppingVerbose_h
+#define ExN03SteppingVerbose_h 1
+
+#include "G4SteppingVerbose.hh"
+
+class ExN03SteppingVerbose : public G4SteppingVerbose {
+public:   
+// Constructor/Destructor
+  ExN03SteppingVerbose();
+ ~ExN03SteppingVerbose();
+//
+  void StepInfo();
+  void TrackingStarted();
+//
+
+
+};
+
+#endif
diff --git a/examples/novice/N03/include/ExN03VisManager.hh b/examples/novice/N03/include/ExN03VisManager.hh
index e9205f419b..8aabf00a7e 100644
--- a/examples/novice/N03/include/ExN03VisManager.hh
+++ b/examples/novice/N03/include/ExN03VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03VisManager.hh,v 1.2.8.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03VisManager.hh,v 1.3 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/newgeom.mac b/examples/novice/N03/newgeom.mac
index 5a67727e75..0a85d871b7 100644
--- a/examples/novice/N03/newgeom.mac
+++ b/examples/novice/N03/newgeom.mac
@@ -22,7 +22,6 @@
 #
 /calor/setField 5 tesla
 #
-/vis/clear/scene
-/vis/clear/view
-/vis/draw/current
+/vis/scene/notifyHandlers
+/vis/viewer/update
 
diff --git a/examples/novice/N03/run2.mac b/examples/novice/N03/run2.mac
index a0e61a4a96..3e3c246ab1 100644
--- a/examples/novice/N03/run2.mac
+++ b/examples/novice/N03/run2.mac
@@ -1,9 +1,9 @@
-# $Id: run2.mac,v 1.2 1999/03/10 16:15:36 maire Exp $
+# $Id: run2.mac,v 1.3 1999/11/15 11:10:26 maire Exp $
 #
 # Macro file of "exampleN03.cc"
 #
 # (in iteractive it must be executed after initialization)
-# (otherwise type: /control/execute ../prerunN03.mac)
+# (otherwise type: /control/execute prerunN03.mac)
 # (graphic needed: OpenGL or Mesa) 
 #
 # 
diff --git a/examples/novice/N03/src/ExN03CalorHit.cc b/examples/novice/N03/src/ExN03CalorHit.cc
index 73e6727471..4e83cc1a14 100644
--- a/examples/novice/N03/src/ExN03CalorHit.cc
+++ b/examples/novice/N03/src/ExN03CalorHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03CalorHit.cc,v 1.1.10.1 1999/12/07 20:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03CalorHit.cc,v 1.2 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03CalorimeterSD.cc b/examples/novice/N03/src/ExN03CalorimeterSD.cc
index 606f2f9f1a..f95a6a2748 100644
--- a/examples/novice/N03/src/ExN03CalorimeterSD.cc
+++ b/examples/novice/N03/src/ExN03CalorimeterSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03CalorimeterSD.cc,v 1.2.8.1 1999/12/07 20:47:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03CalorimeterSD.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -79,7 +79,7 @@ G4bool ExN03CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
       if (physVol == Detector->GetGap     ()) calHit->AddGap(edep,stepl);
       HitID[LayerNumber] = CalCollection->insert(calHit) - 1;
       if (verboseLevel>0)
-        G4cout << " New Calorimeter Hit on layer: " << LayerNumber << endl;
+        G4cout << " New Calorimeter Hit on layer: " << LayerNumber << G4endl;
     }
   else
     { 
@@ -88,7 +88,7 @@ G4bool ExN03CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
       if (physVol == Detector->GetGap())
          (*CalCollection)[HitID[LayerNumber]]->AddGap(edep,stepl);
       if (verboseLevel>0)
-        G4cout << " Energy added to Layer: " << LayerNumber << endl; 
+        G4cout << " Energy added to Layer: " << LayerNumber << G4endl; 
     }
     
   return true;
diff --git a/examples/novice/N03/src/ExN03DetectorConstruction.cc b/examples/novice/N03/src/ExN03DetectorConstruction.cc
index d835e17637..e420d39e53 100644
--- a/examples/novice/N03/src/ExN03DetectorConstruction.cc
+++ b/examples/novice/N03/src/ExN03DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03DetectorConstruction.cc,v 1.2.8.1 1999/12/07 20:47:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03DetectorConstruction.cc,v 1.4 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -211,7 +211,7 @@ G4Material* beam = new G4Material(name="Beam", density, ncomponents=1,
                                       kStateGas,temperature,pressure);
 beam->AddMaterial(Air, fractionmass=1.);
 
-G4cout << *(G4Material::GetMaterialTable()) << endl;
+G4cout << *(G4Material::GetMaterialTable()) << G4endl;
 
   //default materials of the calorimeter
   AbsorberMaterial = Pb;
@@ -371,11 +371,12 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
 
 void ExN03DetectorConstruction::PrintCalorParameters()
 {
-  G4cout << "\n The calorimeter is made of " << NbOfLayers << " layers of: [ "
-       << AbsorberThickness/mm << "mm of " << AbsorberMaterial->GetName() 
-       << " + "
-       << GapThickness/mm << "mm of " << GapMaterial->GetName() << " ] " 
-       << endl;
+  G4cout << "\n------------------------------------------------------------"
+         << "\n---> The calorimeter is " << NbOfLayers << " layers of: [ "
+         << AbsorberThickness/mm << "mm of " << AbsorberMaterial->GetName() 
+         << " + "
+         << GapThickness/mm << "mm of " << GapMaterial->GetName() << " ] " 
+         << "\n------------------------------------------------------------\n";
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N03/src/ExN03DetectorMessenger.cc b/examples/novice/N03/src/ExN03DetectorMessenger.cc
index 63ba479855..5feaf91d66 100644
--- a/examples/novice/N03/src/ExN03DetectorMessenger.cc
+++ b/examples/novice/N03/src/ExN03DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03DetectorMessenger.cc,v 1.2.8.1 1999/12/07 20:47:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03DetectorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03EventAction.cc b/examples/novice/N03/src/ExN03EventAction.cc
index 04ed4fe755..4850268b73 100644
--- a/examples/novice/N03/src/ExN03EventAction.cc
+++ b/examples/novice/N03/src/ExN03EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03EventAction.cc,v 1.4.6.1.2.1 1999/12/07 20:47:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03EventAction.cc,v 1.8 2000/01/24 14:46:01 stesting Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -57,7 +57,7 @@ void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
  G4int evtNb = evt->GetEventID();
  if (evtNb%printModulo == 0)
    { 
-    G4cout << "\n---> Event: " << evtNb << endl;
+    G4cout << "\n---> Event: " << evtNb << G4endl;
     HepRandom::showEngineStatus();
    }
     
@@ -72,41 +72,46 @@ void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
 
 void ExN03EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
-  
-  G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
-  ExN03CalorHitsCollection* CHC = NULL;
-  if (HCE)
-      CHC = (ExN03CalorHitsCollection*)(HCE->GetHC(calorimeterCollID));
-
-  if (CHC)
-   {
-    int n_hit = CHC->entries();
-    G4cout << "     " << n_hit
-         << " hits are stored in ExN03CalorHitsCollection." << endl;
-    G4double totEAbs=0, totLAbs=0, totEGap=0, totLGap=0;
-    for (int i=0;i<n_hit;i++)
-      { totEAbs += (*CHC)[i]->GetEdepAbs(); 
-        totLAbs += (*CHC)[i]->GetTrakAbs();
-        totEGap += (*CHC)[i]->GetEdepGap(); 
-        totLGap += (*CHC)[i]->GetTrakGap();
-        
-      }
-    G4cout
-       << "   Absorber: total energy: " << setw(7) << G4BestUnit(totEAbs,"Energy")
-       << "       total track length: " << setw(7) << G4BestUnit(totLAbs,"Length")
-       << endl
-       << "        Gap: total energy: " << setw(7) << G4BestUnit(totEGap,"Energy")
-       << "       total track length: " << setw(7) << G4BestUnit(totLGap,"Length")
-       << endl;           
-    }
+  G4int event_id = evt->GetEventID();
 
   G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
   G4int n_trajectories = 0;
-  if(trajectoryContainer)
-  { n_trajectories = trajectoryContainer->entries(); }
-  G4cout << "    " << n_trajectories 
-       << " trajectories stored in this event." << endl;
+  if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
+
+  if (event_id < 100 || event_id%100 == 0) {
+
+    G4cout << ">>> Event " << evt->GetEventID() << G4endl;
+
+    G4cout << "    " << n_trajectories 
+	   << " trajectories stored in this event." << G4endl;
+
+    G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
+    ExN03CalorHitsCollection* CHC = NULL;
+    if (HCE)
+      CHC = (ExN03CalorHitsCollection*)(HCE->GetHC(calorimeterCollID));
+
+    if (CHC)
+      {
+	int n_hit = CHC->entries();
+	G4cout << "     " << n_hit
+	       << " hits are stored in ExN03CalorHitsCollection." << G4endl;
+	G4double totEAbs=0, totLAbs=0, totEGap=0, totLGap=0;
+	for (int i=0;i<n_hit;i++)
+	  {
+	    totEAbs += (*CHC)[i]->GetEdepAbs(); 
+	    totLAbs += (*CHC)[i]->GetTrakAbs();
+	    totEGap += (*CHC)[i]->GetEdepGap(); 
+	    totLGap += (*CHC)[i]->GetTrakGap();
+	  }
+	G4cout
+	  << "   Absorber: total energy: " << G4std::setw(7) << G4BestUnit(totEAbs,"Energy")
+	  << "       total track length: " << G4std::setw(7) << G4BestUnit(totLAbs,"Length")
+	  << G4endl
+	  << "        Gap: total energy: " << G4std::setw(7) << G4BestUnit(totEGap,"Energy")
+	  << "       total track length: " << G4std::setw(7) << G4BestUnit(totLGap,"Length")
+	  << G4endl;           
+      }
+  }
 
   if(G4VVisManager::GetConcreteInstance())
   {
@@ -120,5 +125,3 @@ void ExN03EventAction::EndOfEventAction(const G4Event* evt)
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-
diff --git a/examples/novice/N03/src/ExN03EventActionMessenger.cc b/examples/novice/N03/src/ExN03EventActionMessenger.cc
index de5120c855..9da2e138cb 100644
--- a/examples/novice/N03/src/ExN03EventActionMessenger.cc
+++ b/examples/novice/N03/src/ExN03EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03EventActionMessenger.cc,v 1.2.8.1 1999/12/07 20:47:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03EventActionMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PhysicsList.cc b/examples/novice/N03/src/ExN03PhysicsList.cc
index d259adfe3d..536e329ffc 100644
--- a/examples/novice/N03/src/ExN03PhysicsList.cc
+++ b/examples/novice/N03/src/ExN03PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PhysicsList.cc,v 1.4.6.1 1999/12/07 20:47:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PhysicsList.cc,v 1.6 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -28,7 +28,7 @@
 
 ExN03PhysicsList::ExN03PhysicsList():  G4VUserPhysicsList()
 {
-  currentDefaultCut = defaultCutValue = 2.0*mm;
+  currentDefaultCut = defaultCutValue = 1.0*mm;
   cutForGamma       = defaultCutValue;
   cutForElectron    = defaultCutValue;
   cutForProton      = defaultCutValue;
@@ -226,7 +226,7 @@ void ExN03PhysicsList::SetCuts()
     
   if (verboseLevel >0){
     G4cout << "ExN03PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;    
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;    
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
index 87011c2631..be438ff59f 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PrimaryGeneratorAction.cc,v 1.1.10.1 1999/12/07 20:47:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
index 48f5da2d89..d8b1dc1811 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.2.8.1 1999/12/07 20:47:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03RunAction.cc b/examples/novice/N03/src/ExN03RunAction.cc
index 2a9cb5ad2a..cfb6c2e3aa 100644
--- a/examples/novice/N03/src/ExN03RunAction.cc
+++ b/examples/novice/N03/src/ExN03RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03RunAction.cc,v 1.6.4.1 1999/12/07 20:47:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03RunAction.cc,v 1.7 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -36,7 +36,7 @@ ExN03RunAction::~ExN03RunAction()
 void ExN03RunAction::BeginOfRunAction(const G4Run* aRun)
 {
  
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
 
   if (G4VVisManager::GetConcreteInstance())
     {
diff --git a/examples/novice/N03/src/ExN03SteppingAction.cc b/examples/novice/N03/src/ExN03SteppingAction.cc
index b1a33dd787..10825f027f 100644
--- a/examples/novice/N03/src/ExN03SteppingAction.cc
+++ b/examples/novice/N03/src/ExN03SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03SteppingAction.cc,v 1.2.8.1 1999/12/07 20:47:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03SteppingAction.cc,v 1.3 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03SteppingVerbose.cc b/examples/novice/N03/src/ExN03SteppingVerbose.cc
new file mode 100644
index 0000000000..6be5a494c9
--- /dev/null
+++ b/examples/novice/N03/src/ExN03SteppingVerbose.cc
@@ -0,0 +1,170 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN03SteppingVerbose.cc,v 1.2 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+//
+//---------------------------------------------------------------
+//
+// ExN03SteppingVerbose.cc
+//
+// Description:
+//    Implementation of  the ExN03SteppingVerbose class
+// Contact:
+//   Questions and comments to this code should be sent to
+//     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
+//     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
+//
+//---------------------------------------------------------------
+
+#include "ExN03SteppingVerbose.hh"
+#include "G4SteppingManager.hh"
+
+#include "G4UnitsTable.hh"
+
+////////////////////////////////////////////////
+ExN03SteppingVerbose::ExN03SteppingVerbose()
+////////////////////////////////////////////////
+{
+}
+
+//////////////////////////////////////////////////
+ExN03SteppingVerbose::~ExN03SteppingVerbose()
+//////////////////////////////////////////////////
+{
+}
+
+/////////////////////////////////////////
+void ExN03SteppingVerbose::StepInfo()
+/////////////////////////////////////////
+{
+  CopyState();
+  
+  G4int prec = G4cout.precision(3);
+
+  if( verboseLevel >= 1 ){
+    if( verboseLevel >= 4 ) VerboseTrack();
+    if( verboseLevel >= 3 ){
+      G4cout << G4endl;    
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 6) << "X"          << "    "
+	     << G4std::setw( 6) << "Y"          << "    "  
+	     << G4std::setw( 6) << "Z"          << "    "
+	     << G4std::setw( 9) << "KineE"      << " "
+	     << G4std::setw( 9) << "dEStep"     << " "  
+	     << G4std::setw(10) << "StepLeng"     
+	     << G4std::setw(10) << "TrakLeng" 
+	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Process"   << G4endl;	          
+    }
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    // if( fStepStatus != fWorldBoundary){ 
+    if( fTrack->GetNextVolume() != 0 ) { 
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld";
+    }
+
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	->GetProcessName();
+    } else {
+      G4cout << "User Limit";
+    }
+
+    G4cout << G4endl;
+
+    if( verboseLevel == 2 ){
+      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
+	                    fN2ndariesAlongStepDoIt +
+	                    fN2ndariesPostStepDoIt;
+      if(tN2ndariesTot>0){
+	G4cout << "    :----- List of 2ndaries - "
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest="  << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
+	       << "), "
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << " ---------------"
+	       << G4endl;
+
+	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
+                        lp1<(*fSecondary).entries(); lp1++){
+	  G4cout << "    : "
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+		 << G4std::setw(6)
+		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+		 << G4std::setw(10)
+		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+	  G4cout << G4endl;
+	}
+              
+	G4cout << "    :-----------------------------"
+	       << "----------------------------------"
+	       << "-- EndOf2ndaries Info ---------------"
+	       << G4endl;
+      }
+    }
+    
+  }
+  G4cout.precision(prec);
+}
+
+////////////////////////////////////////////////
+void ExN03SteppingVerbose::TrackingStarted()
+////////////////////////////////////////////////
+{
+
+  CopyState();
+G4int prec = G4cout.precision(3);
+  if( verboseLevel > 0 ){
+
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+           << G4std::setw( 6) << "X"          << "    "
+	   << G4std::setw( 6) << "Y"          << "    "  
+	   << G4std::setw( 6) << "Z"          << "    "
+	   << G4std::setw( 9) << "KineE"      << " "
+	   << G4std::setw( 9) << "dEStep"     << " "  
+	   << G4std::setw(10) << "StepLeng"  
+	   << G4std::setw(10) << "TrakLeng"
+	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Process"    << G4endl;	     
+
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+
+    if(fTrack->GetNextVolume()){
+      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+    } else {
+      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+    }
+    G4cout << G4std::setw(10) << "initStep" << G4endl;
+  }
+  G4cout.precision(prec);
+}
diff --git a/examples/novice/N03/src/ExN03VisManager.cc b/examples/novice/N03/src/ExN03VisManager.cc
index 955b0404b9..8363e24a11 100644
--- a/examples/novice/N03/src/ExN03VisManager.cc
+++ b/examples/novice/N03/src/ExN03VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03VisManager.cc,v 1.2.8.1 1999/12/07 20:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN03VisManager.cc,v 1.3 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -123,7 +123,7 @@ void ExN03VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/examples/novice/N04/exampleN04.EMtest.in b/examples/novice/N04/exampleN04.EMtest.in
index 3d2429a0e8..77fd29298c 100644
--- a/examples/novice/N04/exampleN04.EMtest.in
+++ b/examples/novice/N04/exampleN04.EMtest.in
@@ -1,5 +1,8 @@
 /mydet/generator particleGun
 /mydet/reqmuon 1
 /mydet/isomuon 1
-/run/beamOn 10
+/run/beamOn 1
+/gun/particle mu-
+/gun/energy 10 TeV
+/run/beamOn 2
 exit
diff --git a/examples/novice/N04/exampleN04.EMtest.large_N.in b/examples/novice/N04/exampleN04.EMtest.large_N.in
new file mode 100644
index 0000000000..808eb14040
--- /dev/null
+++ b/examples/novice/N04/exampleN04.EMtest.large_N.in
@@ -0,0 +1,8 @@
+/mydet/generator particleGun
+/mydet/reqmuon 1
+/mydet/isomuon 1
+/run/beamOn 1
+/gun/particle mu-
+/gun/energy 10 TeV
+/run/beamOn 20
+exit
diff --git a/examples/novice/N04/exampleN04.EMtest.out b/examples/novice/N04/exampleN04.EMtest.out
index aad6474edd..6fdc50ef25 100644
--- a/examples/novice/N04/exampleN04.EMtest.out
+++ b/examples/novice/N04/exampleN04.EMtest.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -65,74 +65,24 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
-Idle> Idle> Idle> Idle> Stage 0->1 : 1 hits found in the muon chamber.
+Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
      25 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.286949 (GeV)
+     9 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.53644 (GeV)
+     1 hits are stored in ExN04MuonHitsCollection.
+Stage 0->1 : 1 hits found in the muon chamber.
+Stage 1->2 : 1 isolated muon found.
+>>> Event 0
+     5 hits are stored in ExN04TrackerHitsCollection.
+     13 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 3.83715 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 1
-     5 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.228803 (GeV)
+     27 hits are stored in ExN04TrackerHitsCollection.
+     23 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 27.0965 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 2
-     5 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.228142 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 3
-     17 hits are stored in ExN04TrackerHitsCollection.
-     5 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.268653 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 4
-     24 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.316491 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 5
-     18 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.301362 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 6
-     15 hits are stored in ExN04TrackerHitsCollection.
-     5 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.215446 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 7
-     10 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.324704 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 8
-     16 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.472503 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 9
-     5 hits are stored in ExN04TrackerHitsCollection.
-     7 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.381889 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Idle> 
\ No newline at end of file
diff --git a/examples/novice/N04/exampleN04.cc b/examples/novice/N04/exampleN04.cc
index 686485ca74..a8e6cf9a86 100644
--- a/examples/novice/N04/exampleN04.cc
+++ b/examples/novice/N04/exampleN04.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN04.cc,v 1.1.10.1 1999/12/07 20:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN04.cc,v 1.2 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N04/exampleN04.out b/examples/novice/N04/exampleN04.out
index cec60bf199..fa4324e788 100644
--- a/examples/novice/N04/exampleN04.out
+++ b/examples/novice/N04/exampleN04.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -65,13 +65,13 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
-Idle> #
-Idle> Idle> Idle> Idle> Stage 0->1 : 1 hits found in the muon chamber.
+#
+Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     156 hits are stored in ExN04TrackerHitsCollection.
-     55 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.810364 (GeV)
+     121 hits are stored in ExN04TrackerHitsCollection.
+     59 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.706765 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 0 hits found in the muon chamber.
 ++++++++ event aborted
@@ -81,11 +81,11 @@ Stage 0->1 : 0 hits found in the muon chamber.
      Total energy deposition in calorimeter : 0 (GeV)
      0 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
+Stage 1->2 : 0 isolated muon found.
+++++++++ event aborted
 >>> Event 2
-     89 hits are stored in ExN04TrackerHitsCollection.
-     53 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.969477 (GeV)
+     82 hits are stored in ExN04TrackerHitsCollection.
+     13 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.3424 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
-Idle> #
-Idle> 
\ No newline at end of file
+#
diff --git a/examples/novice/N04/src/ExN04CalorimeterSD.cc b/examples/novice/N04/src/ExN04CalorimeterSD.cc
index 289a60e930..147b86587a 100644
--- a/examples/novice/N04/src/ExN04CalorimeterSD.cc
+++ b/examples/novice/N04/src/ExN04CalorimeterSD.cc
@@ -58,14 +58,14 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist)
     CellID[copyIDinZ][copyIDinPhi] = icell - 1;
     if(verboseLevel>0)
     { G4cout << " New Calorimeter Hit on CellID " 
-           << copyIDinZ << " " << copyIDinPhi << endl; }
+           << copyIDinZ << " " << copyIDinPhi << G4endl; }
   }
   else
   { 
     (*CalCollection)[CellID[copyIDinZ][copyIDinPhi]]->AddEdep(edep);
     if(verboseLevel>0)
     { G4cout << " Energy added to CellID " 
-           << copyIDinZ << " " << copyIDinPhi << endl; }
+           << copyIDinZ << " " << copyIDinPhi << G4endl; }
   }
 
   return true;
diff --git a/examples/novice/N04/src/ExN04EventAction.cc b/examples/novice/N04/src/ExN04EventAction.cc
index 91329e64f0..f7a7cdf862 100644
--- a/examples/novice/N04/src/ExN04EventAction.cc
+++ b/examples/novice/N04/src/ExN04EventAction.cc
@@ -45,7 +45,7 @@ void ExN04EventAction::BeginOfEventAction(const G4Event*)
 
 void ExN04EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
+  G4cout << ">>> Event " << evt->GetEventID() << G4endl;
 
   if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return;
 
@@ -64,24 +64,24 @@ void ExN04EventAction::EndOfEventAction(const G4Event* evt)
   {
     int n_hit = THC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04TrackerHitsCollection." << endl;
+         << " hits are stored in ExN04TrackerHitsCollection." << G4endl;
   }
   if(CHC)
   {
     int n_hit = CHC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04CalorimeterHitsCollection." << endl;
+         << " hits are stored in ExN04CalorimeterHitsCollection." << G4endl;
     G4double totE = 0;
     for(int i=0;i<n_hit;i++)
     { totE += (*CHC)[i]->GetEdep(); }
     G4cout << "     Total energy deposition in calorimeter : "
-         << totE / GeV << " (GeV)" << endl;
+         << totE / GeV << " (GeV)" << G4endl;
   }
   if(MHC)
   {
     int n_hit = MHC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04MuonHitsCollection." << endl;
+         << " hits are stored in ExN04MuonHitsCollection." << G4endl;
   }
 
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
diff --git a/examples/novice/N04/src/ExN04PhysicsList.cc b/examples/novice/N04/src/ExN04PhysicsList.cc
index dce62e1b04..9b673044f1 100644
--- a/examples/novice/N04/src/ExN04PhysicsList.cc
+++ b/examples/novice/N04/src/ExN04PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN04PhysicsList.cc,v 1.6.6.1 1999/12/07 20:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN04PhysicsList.cc,v 1.7 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -28,7 +28,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>   
+#include "g4std/iomanip"   
 
 #include "G4FastSimulationManagerProcess.hh"
 
diff --git a/examples/novice/N04/src/ExN04StackingAction.cc b/examples/novice/N04/src/ExN04StackingAction.cc
index fa308947b8..87406d05a6 100644
--- a/examples/novice/N04/src/ExN04StackingAction.cc
+++ b/examples/novice/N04/src/ExN04StackingAction.cc
@@ -70,7 +70,7 @@ G4bool ExN04StackingAction::InsideRoI(const G4Track * aTrack,G4double ang)
   if(!muonHits)
   { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); }
   if(!muonHits)
-  { G4cerr << "muonCollection NOT FOUND" << endl;
+  { G4cerr << "muonCollection NOT FOUND" << G4endl;
     return true; }
 
   G4int nhits = muonHits->entries();
@@ -111,15 +111,15 @@ void ExN04StackingAction::NewStage()
     if(!muonHits)
     { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); }
     if(!muonHits)
-    { G4cerr << "muonCollection NOT FOUND" << endl;
+    { G4cerr << "muonCollection NOT FOUND" << G4endl;
       return; }
     nhits = muonHits->entries();
     G4cout << "Stage 0->1 : " << nhits << " hits found in the muon chamber."
-         << endl;
+         << G4endl;
     if(nhits<reqMuon)
     { 
       stackManager->clear();
-      G4cout << "++++++++ event aborted" << endl;
+      G4cout << "++++++++ event aborted" << G4endl;
       return;
     }
     stackManager->ReClassify();
@@ -138,7 +138,7 @@ void ExN04StackingAction::NewStage()
     if(!trkHits)
     { trkHits = (ExN04TrackerHitsCollection*)GetCollection("trackerCollection"); }
     if(!trkHits)
-    { G4cerr << "trackerCollection NOT FOUND" << endl;
+    { G4cerr << "trackerCollection NOT FOUND" << G4endl;
       return; }
     G4int nTrkhits = trkHits->entries();
     G4int isoMuon = 0;
@@ -153,11 +153,11 @@ void ExN04StackingAction::NewStage()
       }
       if(nhitIn<=reqIso) isoMuon++;
     }
-    G4cout << "Stage 1->2 : " << isoMuon << " isolated muon found." << endl;
+    G4cout << "Stage 1->2 : " << isoMuon << " isolated muon found." << G4endl;
     if(isoMuon<reqIsoMuon)
     {
       stackManager->clear();
-      G4cout << "++++++++ event aborted" << endl;
+      G4cout << "++++++++ event aborted" << G4endl;
       return;
     }
     stackManager->ReClassify();
diff --git a/examples/novice/N05/exampleN05.cc b/examples/novice/N05/exampleN05.cc
index 1c1ba8cf67..66bd14e9bd 100644
--- a/examples/novice/N05/exampleN05.cc
+++ b/examples/novice/N05/exampleN05.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN05.cc,v 1.4.2.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN05.cc,v 1.5 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
   //-------------------------------
   // Initialization of Run manager
   //-------------------------------
-  G4cout << "RunManager construction starting...." << endl;
+  G4cout << "RunManager construction starting...." << G4endl;
   G4RunManager * runManager = new G4RunManager;
 
   // Detector geometry
@@ -96,7 +96,7 @@ int main(int argc, char** argv) {
   // Visualization:
   //----------------
 #ifdef G4VIS_USE
-  G4cout << "Instantiating MyVisManager......." << endl;
+  G4cout << "Instantiating MyVisManager......." << G4endl;
   G4VisManager* visManager = new MyVisManager;
   visManager -> Initialize ();
 #endif
diff --git a/examples/novice/N05/exampleN05.large_N.in b/examples/novice/N05/exampleN05.large_N.in
new file mode 100644
index 0000000000..1ca357285d
--- /dev/null
+++ b/examples/novice/N05/exampleN05.large_N.in
@@ -0,0 +1,67 @@
+#  exampleN05.in
+#
+/gun/particle e-
+/gun/energy 1 GeV
+/gun/position 0 0 0
+#
+#/tracking/verbose 1
+#
+/gun/direction 0 .6 1.
+/run/beamOn 500
+#
+/gun/direction 0 .3 1.
+/run/beamOn 500
+#
+/gun/direction 0 -.3 1.
+/run/beamOn 500
+#
+/gun/direction 0 -.6 1.
+/run/beamOn 500 
+#
+/gun/particle pi-
+/gun/energy 1 GeV
+/gun/position 0 0 0
+#
+#
+#
+/gun/direction 0 .6 1.
+/run/beamOn 500
+#
+/gun/direction 0 .3 1.
+/run/beamOn 500
+#
+/gun/direction 0 -.3 1.
+/run/beamOn 500
+#
+/gun/direction 0 -.6 1.
+/run/beamOn 500
+#
+#
+# switch off Fast Simulation
+#
+/gun/particle e-
+#
+/process/inactivate G4FastSimulationManagerProcess
+#
+#  switch off UserLimits
+/exN05/detector/switchUserLimits off
+#
+/gun/direction 0 .6 1.
+/run/beamOn 500
+#
+#   switch on UserLimits
+/exN05/detector/switchUserLimits on
+#
+/gun/direction 0 .6 1.
+/run/beamOn 500
+#
+
+exit
+
+
+
+
+
+
+
+
diff --git a/examples/novice/N05/exampleN05.out b/examples/novice/N05/exampleN05.out
index dc580f1b39..d858bdef8f 100644
--- a/examples/novice/N05/exampleN05.out
+++ b/examples/novice/N05/exampleN05.out
@@ -1,6 +1,6 @@
 RunManager construction starting....
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -66,12 +66,12 @@ MuPairProd:  theoretical cross sections
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
 Closing FastSimulation
-Idle> #  exampleN05.in
-Idle> #
-Idle> Idle> Idle> Idle> #
-Idle> #/tracking/verbose 1
-Idle> #
-Idle> Idle> ### Run 0 start.
+#  exampleN05.in
+#
+#
+#/tracking/verbose 1
+#
+### Run 0 start.
 >>> Event 0
      11 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.989921 (GeV)
@@ -98,8 +98,8 @@ Idle> Idle> ### Run 0 start.
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 1 start.
+#
+### Run 1 start.
 >>> Event 0
      10 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.999915 (GeV)
@@ -126,8 +126,8 @@ Idle> Idle> ### Run 1 start.
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 2 start.
+#
+### Run 2 start.
 >>> Event 0
      9 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
@@ -154,8 +154,8 @@ Idle> Idle> ### Run 2 start.
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 3 start.
+#
+### Run 3 start.
 >>> Event 0
      11 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.989922 (GeV)
@@ -182,11 +182,11 @@ Idle> Idle> ### Run 3 start.
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> Idle> Idle> #
-Idle> #
-Idle> #
-Idle> Idle> ### Run 4 start.
+#
+#
+#
+#
+### Run 4 start.
 >>> Event 0
      8 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.239988 (GeV)
@@ -213,8 +213,8 @@ Idle> Idle> ### Run 4 start.
      16 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 2.55985 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 5 start.
+#
+### Run 5 start.
 >>> Event 0
      29 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.959946 (GeV)
@@ -241,8 +241,8 @@ Idle> Idle> ### Run 5 start.
      39 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 6.75964 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 6 start.
+#
+### Run 6 start.
 >>> Event 0
      41 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 1.19993 (GeV)
@@ -269,8 +269,8 @@ Idle> Idle> ### Run 6 start.
      60 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 10.7994 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> ### Run 7 start.
+#
+### Run 7 start.
 >>> Event 0
      54 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 1.47991 (GeV)
@@ -297,15 +297,15 @@ Idle> Idle> ### Run 7 start.
      77 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 12.9793 (GeV)
 number of event = 5
-Idle> #
-Idle> #
-Idle> # switch off Fast Simulation
-Idle> #
-Idle> Idle> #
-Idle> Idle> #
-Idle> #  switch off UserLimits
-Idle> Idle> #
-Idle> Idle> ### Run 8 start.
+#
+#
+# switch off Fast Simulation
+#
+#
+#
+#  switch off UserLimits
+#
+### Run 8 start.
 >>> Event 0
      28 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.994988 (GeV)
@@ -332,10 +332,10 @@ Idle> Idle> ### Run 8 start.
      2 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0.00470852 (GeV)
 number of event = 5
-Idle> #
-Idle> #   switch on UserLimits
-Idle> Idle> #
-Idle> Idle> ### Run 9 start.
+#
+#   switch on UserLimits
+#
+### Run 9 start.
 >>> Event 0
      20 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.984933 (GeV)
@@ -362,5 +362,4 @@ Idle> Idle> ### Run 9 start.
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
-Idle> #
-Idle> Idle> 
\ No newline at end of file
+#
diff --git a/examples/novice/N05/include/ExN05CalorimeterHit.hh b/examples/novice/N05/include/ExN05CalorimeterHit.hh
index 1c8291e510..f5c4e08467 100644
--- a/examples/novice/N05/include/ExN05CalorimeterHit.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05CalorimeterHit.hh,v 1.2.8.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05CalorimeterHit.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05CalorimeterHit_h
diff --git a/examples/novice/N05/include/ExN05CalorimeterSD.hh b/examples/novice/N05/include/ExN05CalorimeterSD.hh
index 9d85d6afee..48691fbacf 100644
--- a/examples/novice/N05/include/ExN05CalorimeterSD.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05CalorimeterSD.hh,v 1.1.10.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05CalorimeterSD.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05CalorimeterSD_h
diff --git a/examples/novice/N05/include/ExN05DetectorConstruction.hh b/examples/novice/N05/include/ExN05DetectorConstruction.hh
index ac786e117d..040f34d033 100644
--- a/examples/novice/N05/include/ExN05DetectorConstruction.hh
+++ b/examples/novice/N05/include/ExN05DetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05DetectorConstruction.hh,v 1.1.10.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05DetectorConstruction.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ExN05DetectorConstruction_h
 #define ExN05DetectorConstruction_h 1
diff --git a/examples/novice/N05/include/ExN05DetectorMessenger.hh b/examples/novice/N05/include/ExN05DetectorMessenger.hh
index 6c07728bf7..5f08fa4e88 100644
--- a/examples/novice/N05/include/ExN05DetectorMessenger.hh
+++ b/examples/novice/N05/include/ExN05DetectorMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05DetectorMessenger.hh,v 1.1.10.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05DetectorMessenger.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/examples/novice/N05/include/ExN05EMShowerModel.hh b/examples/novice/N05/include/ExN05EMShowerModel.hh
index 109dae312c..6047a653f0 100644
--- a/examples/novice/N05/include/ExN05EMShowerModel.hh
+++ b/examples/novice/N05/include/ExN05EMShowerModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EMShowerModel.hh,v 1.1.8.1.2.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EMShowerModel.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //----------------------------------------------
diff --git a/examples/novice/N05/include/ExN05EnergySpot.hh b/examples/novice/N05/include/ExN05EnergySpot.hh
index 5663714144..36c86228a7 100644
--- a/examples/novice/N05/include/ExN05EnergySpot.hh
+++ b/examples/novice/N05/include/ExN05EnergySpot.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EnergySpot.hh,v 1.1.8.1.2.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EnergySpot.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ExN05EnergySpot_h
 #define ExN05EnergySpot_h
diff --git a/examples/novice/N05/include/ExN05EventAction.hh b/examples/novice/N05/include/ExN05EventAction.hh
index 01a1ff030c..f7f49cbae7 100644
--- a/examples/novice/N05/include/ExN05EventAction.hh
+++ b/examples/novice/N05/include/ExN05EventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EventAction.hh,v 1.2.8.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EventAction.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05EventAction_h
diff --git a/examples/novice/N05/include/ExN05EventActionMessenger.hh b/examples/novice/N05/include/ExN05EventActionMessenger.hh
index da425f7f90..f4ab3e23e0 100644
--- a/examples/novice/N05/include/ExN05EventActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05EventActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EventActionMessenger.hh,v 1.1.10.1 1999/12/07 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EventActionMessenger.hh,v 1.2 1999/12/15 14:49:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05EventActionMessenger_h
diff --git a/examples/novice/N05/include/ExN05MaxTimeCuts.hh b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
index 51098f9f02..d38507a11e 100644
--- a/examples/novice/N05/include/ExN05MaxTimeCuts.hh
+++ b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MaxTimeCuts.hh,v 1.2.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MaxTimeCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinEkineCuts.hh b/examples/novice/N05/include/ExN05MinEkineCuts.hh
index 36461f0544..2bf3c6ed32 100644
--- a/examples/novice/N05/include/ExN05MinEkineCuts.hh
+++ b/examples/novice/N05/include/ExN05MinEkineCuts.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MinEkineCuts.hh,v 1.2.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MinEkineCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinRangeCuts.hh b/examples/novice/N05/include/ExN05MinRangeCuts.hh
index e765afc150..b4a8144fc8 100644
--- a/examples/novice/N05/include/ExN05MinRangeCuts.hh
+++ b/examples/novice/N05/include/ExN05MinRangeCuts.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MinRangeCuts.hh,v 1.2.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MinRangeCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05PhysicsList.hh b/examples/novice/N05/include/ExN05PhysicsList.hh
index 84ebd25fbc..e2a76d4023 100644
--- a/examples/novice/N05/include/ExN05PhysicsList.hh
+++ b/examples/novice/N05/include/ExN05PhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PhysicsList.hh,v 1.4.6.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PhysicsList.hh,v 1.5 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 #ifndef ExN05PhysicsList_h
diff --git a/examples/novice/N05/include/ExN05PiModel.hh b/examples/novice/N05/include/ExN05PiModel.hh
index ecf3fc866a..20c95c5c8c 100644
--- a/examples/novice/N05/include/ExN05PiModel.hh
+++ b/examples/novice/N05/include/ExN05PiModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PiModel.hh,v 1.1.10.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PiModel.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //----------------------------------------
diff --git a/examples/novice/N05/include/ExN05PionShowerModel.hh b/examples/novice/N05/include/ExN05PionShowerModel.hh
index e0e8d569ad..59ece02fcd 100644
--- a/examples/novice/N05/include/ExN05PionShowerModel.hh
+++ b/examples/novice/N05/include/ExN05PionShowerModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PionShowerModel.hh,v 1.1.8.1.2.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PionShowerModel.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //----------------------------------------------
diff --git a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
index dc1538583e..5d32ab7ddc 100644
--- a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
+++ b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PrimaryGeneratorAction.hh,v 1.1.10.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05PrimaryGeneratorAction_h
diff --git a/examples/novice/N05/include/ExN05RunAction.hh b/examples/novice/N05/include/ExN05RunAction.hh
index 555dd874b6..befe27949c 100644
--- a/examples/novice/N05/include/ExN05RunAction.hh
+++ b/examples/novice/N05/include/ExN05RunAction.hh
@@ -5,17 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05RunAction.hh,v 1.4.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05RunAction.hh,v 1.6 2000/01/06 15:06:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05RunAction_h
 #define ExN05RunAction_h 1
 
-#include "G4Timer.hh"
 #include "globals.hh"
 #include "G4UserRunAction.hh"
 
+class G4Timer;
 class G4Run;
 
 class ExN05RunAction : public G4UserRunAction
diff --git a/examples/novice/N05/include/ExN05SpecialCuts.hh b/examples/novice/N05/include/ExN05SpecialCuts.hh
index 16922f9d6c..af8bc4d691 100644
--- a/examples/novice/N05/include/ExN05SpecialCuts.hh
+++ b/examples/novice/N05/include/ExN05SpecialCuts.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SpecialCuts.hh,v 1.2.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SpecialCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05SteppingAction.hh b/examples/novice/N05/include/ExN05SteppingAction.hh
index 13caf72ec7..a72745de37 100644
--- a/examples/novice/N05/include/ExN05SteppingAction.hh
+++ b/examples/novice/N05/include/ExN05SteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SteppingAction.hh,v 1.2.8.1 1999/12/07 20:47:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SteppingAction.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05SteppingAction_h
diff --git a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
index f75262b61e..833aefee8c 100644
--- a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SteppingActionMessenger.hh,v 1.1.10.1 1999/12/07 20:47:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SteppingActionMessenger.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ExN05SteppingActionMessenger_h
diff --git a/examples/novice/N05/src/ExN05CalorimeterHit.cc b/examples/novice/N05/src/ExN05CalorimeterHit.cc
index 718cccf388..f411ae7d31 100644
--- a/examples/novice/N05/src/ExN05CalorimeterHit.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05CalorimeterHit.cc,v 1.1.10.1 1999/12/07 20:47:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05CalorimeterHit.cc,v 1.2 1999/12/15 14:49:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05CalorimeterHit.hh"
diff --git a/examples/novice/N05/src/ExN05CalorimeterSD.cc b/examples/novice/N05/src/ExN05CalorimeterSD.cc
index 405612bf74..a8c53606f3 100644
--- a/examples/novice/N05/src/ExN05CalorimeterSD.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05CalorimeterSD.cc,v 1.1.10.1 1999/12/07 20:47:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05CalorimeterSD.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05CalorimeterSD.hh"
@@ -62,13 +62,13 @@ G4bool ExN05CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist)
     int icell = CalCollection->insert( calHit );
     CellID[copyID] = icell - 1;
     if(verboseLevel>0)
-    { G4cout << " New Calorimeter Hit on CellID " << copyID << endl; }
+    { G4cout << " New Calorimeter Hit on CellID " << copyID << G4endl; }
   }
   else
   { 
     (*CalCollection)[CellID[copyID]]->AddEdep( edep );
     if(verboseLevel>0)
-    { G4cout << " Energy added to CellID " << copyID << endl; }
+    { G4cout << " Energy added to CellID " << copyID << G4endl; }
   }
 
   return true;
diff --git a/examples/novice/N05/src/ExN05DetectorConstruction.cc b/examples/novice/N05/src/ExN05DetectorConstruction.cc
index c6ea262387..4781682b1b 100644
--- a/examples/novice/N05/src/ExN05DetectorConstruction.cc
+++ b/examples/novice/N05/src/ExN05DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05DetectorConstruction.cc,v 1.1.10.1 1999/12/07 20:47:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05DetectorConstruction.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "ExN05DetectorConstruction.hh"
 #include "ExN05CalorimeterSD.hh"
@@ -48,7 +48,7 @@ ExN05DetectorConstruction::~ExN05DetectorConstruction()
 
 G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
 {
-  G4cout << "\nExN05DetectorConstruction....\n" << endl;
+  G4cout << "\nExN05DetectorConstruction....\n" << G4endl;
   
   //--------- Material definition ---------
   
diff --git a/examples/novice/N05/src/ExN05DetectorMessenger.cc b/examples/novice/N05/src/ExN05DetectorMessenger.cc
index ab66201925..843f905895 100644
--- a/examples/novice/N05/src/ExN05DetectorMessenger.cc
+++ b/examples/novice/N05/src/ExN05DetectorMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05DetectorMessenger.cc,v 1.1.10.1 1999/12/07 20:47:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05DetectorMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -16,13 +16,9 @@
 #include "G4UIcmdWithAString.hh"
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "globals.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 ExN05DetectorMessenger::ExN05DetectorMessenger(ExN05DetectorConstruction * myDet) : myDetector(myDet)
 { 
@@ -92,7 +88,7 @@ G4String ExN05DetectorMessenger::GetCurrentValue(G4UIcommand * command)
 {
   G4String returnValue('\0');
   char line[255];
-  ostrstream os(line,255);
+  G4std::ostrstream os(line,255);
   
   if( command == SwitchCmd ) { 
     if ( myDetector->IsUseUserLimits() )returnValue = "on";
diff --git a/examples/novice/N05/src/ExN05EMShowerModel.cc b/examples/novice/N05/src/ExN05EMShowerModel.cc
index 23f268a4b3..60573677af 100644
--- a/examples/novice/N05/src/ExN05EMShowerModel.cc
+++ b/examples/novice/N05/src/ExN05EMShowerModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EMShowerModel.cc,v 1.1.10.1 1999/12/07 20:47:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EMShowerModel.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "ExN05EMShowerModel.hh"
 #include "ExN05EnergySpot.hh"
diff --git a/examples/novice/N05/src/ExN05EnergySpot.cc b/examples/novice/N05/src/ExN05EnergySpot.cc
index a985452f08..4a940aca9c 100644
--- a/examples/novice/N05/src/ExN05EnergySpot.cc
+++ b/examples/novice/N05/src/ExN05EnergySpot.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EnergySpot.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EnergySpot.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "ExN05EnergySpot.hh"
 
@@ -65,7 +65,7 @@ void ExN05EnergySpot::Draw(G4Colour *color)
 
 void ExN05EnergySpot::Print()
 {
-  G4cout << " ExN05EnergySpot {E = " << Energy << "; Position = " << Point << " }"<< endl;
+  G4cout << " ExN05EnergySpot {E = " << Energy << "; Position = " << Point << " }"<< G4endl;
 }
 
 
diff --git a/examples/novice/N05/src/ExN05EventAction.cc b/examples/novice/N05/src/ExN05EventAction.cc
index d309160dfd..d11240e74b 100644
--- a/examples/novice/N05/src/ExN05EventAction.cc
+++ b/examples/novice/N05/src/ExN05EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EventAction.cc,v 1.2.6.1.2.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EventAction.cc,v 1.4 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05EventAction.hh"
@@ -53,7 +53,7 @@ void ExN05EventAction::EndOfEventAction(const G4Event* evt )
   calorimeterCollID    = SDman->GetCollectionID(colNam="CalCollection");
   hadCalorimeterCollID = SDman->GetCollectionID(colNam="HadCollection");
   
-   G4cout << ">>> Event " << evt->GetEventID() << endl;
+   G4cout << ">>> Event " << evt->GetEventID() << G4endl;
   
   G4HCofThisEvent * HCE = evt->GetHCofThisEvent();
   ExN05CalorimeterHitsCollection* CaloHC    = NULL;
@@ -68,24 +68,24 @@ void ExN05EventAction::EndOfEventAction(const G4Event* evt )
     {
       int n_hit = CaloHC->entries();
       G4cout << "     " << n_hit
-	   << " hits are stored in EM ExN05CalorimeterHitsCollection." << endl;
+	   << " hits are stored in EM ExN05CalorimeterHitsCollection." << G4endl;
       G4double totE = 0;
       for(int i=0;i<n_hit;i++)
 	{ totE += (*CaloHC)[i]->GetEdep(); }
       G4cout << "     Total energy deposition in EM calorimeter crytals : "
-	   << totE / GeV << " (GeV)" << endl;
+	   << totE / GeV << " (GeV)" << G4endl;
     }
 
   if(HadCaloHC)
     {
       int n_hit = HadCaloHC->entries();
       G4cout << "     " << n_hit
-	   << " hits are stored in HAD ExN05CalorimeterHitsCollection." << endl;
+	   << " hits are stored in HAD ExN05CalorimeterHitsCollection." << G4endl;
       G4double totE = 0;
       for(int i=0;i<n_hit;i++)
 	{ totE += (*HadCaloHC)[i]->GetEdep(); }
       G4cout << "     Total energy deposition in HAD calorimeter towers : "
-	   << totE / GeV << " (GeV)" << endl;
+	   << totE / GeV << " (GeV)" << G4endl;
     }
   
   if(drawFlag)
diff --git a/examples/novice/N05/src/ExN05EventActionMessenger.cc b/examples/novice/N05/src/ExN05EventActionMessenger.cc
index 2d58d907ae..d0beff9d88 100644
--- a/examples/novice/N05/src/ExN05EventActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05EventActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05EventActionMessenger.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05EventActionMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05EventActionMessenger.hh"
@@ -32,7 +32,7 @@ void ExN05EventActionMessenger::SetNewValue(G4UIcommand* command, G4String newVa
   {
     G4int vl;
     const char* t = newValues;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     is >> vl;
     EventAction->SetDrawFlag(vl!=0);
   }
diff --git a/examples/novice/N05/src/ExN05MaxTimeCuts.cc b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
index f509a2833a..e22a842fe1 100644
--- a/examples/novice/N05/src/ExN05MaxTimeCuts.cc
+++ b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MaxTimeCuts.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MaxTimeCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,7 +31,7 @@ ExN05MaxTimeCuts::ExN05MaxTimeCuts(const G4String& aName)
   : ExN05SpecialCuts(aName)
 {
    if (verboseLevel>1) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
    SetProcessType(fUserDefined);
 }
diff --git a/examples/novice/N05/src/ExN05MinEkineCuts.cc b/examples/novice/N05/src/ExN05MinEkineCuts.cc
index dee640a463..c6cee50df1 100644
--- a/examples/novice/N05/src/ExN05MinEkineCuts.cc
+++ b/examples/novice/N05/src/ExN05MinEkineCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MinEkineCuts.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MinEkineCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,7 +31,7 @@ ExN05MinEkineCuts::ExN05MinEkineCuts(const G4String& aName)
   : ExN05SpecialCuts(aName)
 {
    if (verboseLevel>1) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
    SetProcessType(fUserDefined);
 }
diff --git a/examples/novice/N05/src/ExN05MinRangeCuts.cc b/examples/novice/N05/src/ExN05MinRangeCuts.cc
index c3a6c26576..9e8534cd6c 100644
--- a/examples/novice/N05/src/ExN05MinRangeCuts.cc
+++ b/examples/novice/N05/src/ExN05MinRangeCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05MinRangeCuts.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05MinRangeCuts.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,7 +31,7 @@ ExN05MinRangeCuts::ExN05MinRangeCuts(const G4String& aName)
   : ExN05SpecialCuts(aName)
 {
    if (verboseLevel>1) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
    SetProcessType(fUserDefined);
 }
diff --git a/examples/novice/N05/src/ExN05PhysicsList.cc b/examples/novice/N05/src/ExN05PhysicsList.cc
index de46586572..74edf2acbe 100644
--- a/examples/novice/N05/src/ExN05PhysicsList.cc
+++ b/examples/novice/N05/src/ExN05PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PhysicsList.cc,v 1.4.6.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PhysicsList.cc,v 1.5 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -22,7 +22,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>   
+#include "g4std/iomanip"   
 
 #include "G4FastSimulationManagerProcess.hh"
 
diff --git a/examples/novice/N05/src/ExN05PiModel.cc b/examples/novice/N05/src/ExN05PiModel.cc
index 7aa8d5ac29..a169e77d58 100644
--- a/examples/novice/N05/src/ExN05PiModel.cc
+++ b/examples/novice/N05/src/ExN05PiModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PiModel.cc,v 1.1.10.1 1999/12/07 20:47:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PiModel.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "ExN05PiModel.hh"
 
@@ -38,10 +38,10 @@ G4bool ExN05PiModel::ModelTrigger(const G4FastTrack& fastTrack) {
   // are available at this level via the fastTrack parameter (allowing 
   // to check distance from boundaries, see below  to allow the decision)
   //--------------------------------------------------------------
-  G4cout << "\nExN05PiModel::ModelTrigger() called:" << endl;
-  G4cout <<   "--------------------------------" << endl;
+  G4cout << "\nExN05PiModel::ModelTrigger() called:" << G4endl;
+  G4cout <<   "--------------------------------" << G4endl;
   G4cout << "(particle is a " << fastTrack.GetPrimaryTrack()->
-    GetDefinition()->GetParticleName() << " )\n" << endl;
+    GetDefinition()->GetParticleName() << " )\n" << G4endl;
 
   // -- Examples of available informations:
 
@@ -49,14 +49,14 @@ G4bool ExN05PiModel::ModelTrigger(const G4FastTrack& fastTrack) {
   G4cout << "         Track position: " <<
     fastTrack.GetPrimaryTrack()->GetPosition()  << "(global coord.)"   <<
     fastTrack.GetPrimaryTrackLocalPosition()  << "(in envelope coord.)" 
-       << endl;
+       << G4endl;
 
   // -- direction:
   G4cout << "         Track direction:"       <<
     fastTrack.GetPrimaryTrack()->GetMomentum().unit() << 
     "(global coord.)"      <<
     fastTrack.GetPrimaryTrackLocalDirection() << "(in envelope coord.)" << 
-    endl;
+    G4endl;
 
   return true;
 }
@@ -75,7 +75,7 @@ void ExN05PiModel::DoIt(const G4FastTrack& fastTrack,
   // The primary track continues along its direction.
   // One secondary (a photon) is added:
   //------------------------------------------------
-  G4cout << "      Pion `model' applied\n" << endl;
+  G4cout << "      Pion `model' applied\n" << G4endl;
 
   //------------------------------
   // Primary:
diff --git a/examples/novice/N05/src/ExN05PionShowerModel.cc b/examples/novice/N05/src/ExN05PionShowerModel.cc
index 9f6452083a..a87dad200f 100644
--- a/examples/novice/N05/src/ExN05PionShowerModel.cc
+++ b/examples/novice/N05/src/ExN05PionShowerModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PionShowerModel.cc,v 1.1.10.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PionShowerModel.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "ExN05PionShowerModel.hh"
 #include "ExN05EnergySpot.hh"
diff --git a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
index 6055dadc40..8e8bfd77ea 100644
--- a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
+++ b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05PrimaryGeneratorAction.cc,v 1.1.10.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N05/src/ExN05RunAction.cc b/examples/novice/N05/src/ExN05RunAction.cc
index e1c6039682..35fa3989e8 100644
--- a/examples/novice/N05/src/ExN05RunAction.cc
+++ b/examples/novice/N05/src/ExN05RunAction.cc
@@ -5,12 +5,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05RunAction.cc,v 1.3.8.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05RunAction.cc,v 1.5 2000/01/06 15:06:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
-#include "ExN05RunAction.hh"
+// Make this appear first!
+#include "G4Timer.hh"
 
+#include "ExN05RunAction.hh"
 #include "G4Run.hh"
 #include "G4UImanager.hh"
 #include "G4ios.hh"
@@ -27,14 +29,14 @@ ExN05RunAction::~ExN05RunAction()
 
 void ExN05RunAction::BeginOfRunAction(const G4Run* aRun)
 {
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   //  timer->Start();
 }
 
 void ExN05RunAction::EndOfRunAction(const G4Run* aRun)
 {
   timer->Stop();
-  G4cout << "number of event = " << aRun->GetNumberOfEvent() << endl;
-  //       << " " << *timer << endl;
+  G4cout << "number of event = " << aRun->GetNumberOfEvent() << G4endl;
+  //       << " " << *timer << G4endl;
 }
 
diff --git a/examples/novice/N05/src/ExN05SpecialCuts.cc b/examples/novice/N05/src/ExN05SpecialCuts.cc
index 8924302a9f..c6c697a905 100644
--- a/examples/novice/N05/src/ExN05SpecialCuts.cc
+++ b/examples/novice/N05/src/ExN05SpecialCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SpecialCuts.cc,v 1.2.8.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SpecialCuts.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -27,7 +27,7 @@ ExN05SpecialCuts::ExN05SpecialCuts(const G4String& aName)
   : G4VProcess(aName)
 {
    if (verboseLevel>1) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
 }
 
diff --git a/examples/novice/N05/src/ExN05SteppingAction.cc b/examples/novice/N05/src/ExN05SteppingAction.cc
index 6b6678f2c0..f0a9bcc6a8 100644
--- a/examples/novice/N05/src/ExN05SteppingAction.cc
+++ b/examples/novice/N05/src/ExN05SteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SteppingAction.cc,v 1.2.8.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SteppingAction.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05SteppingAction.hh"
diff --git a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
index ceb0047533..fa9ea95422 100644
--- a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN05SteppingActionMessenger.cc,v 1.1.10.1 1999/12/07 20:47:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN05SteppingActionMessenger.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "ExN05SteppingActionMessenger.hh"
@@ -34,7 +34,7 @@ void ExN05SteppingActionMessenger::SetNewValue(G4UIcommand* command, G4String ne
   {
     G4int vl;
     const char* t = newValues;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     is >> vl;
     SteppingAction->SetDrawFlag(vl!=0);
   }
diff --git a/examples/novice/N06/exampleN06.out b/examples/novice/N06/exampleN06.out
index 9640554c15..a36e59ebab 100644
--- a/examples/novice/N06/exampleN06.out
+++ b/examples/novice/N06/exampleN06.out
@@ -1,9 +1,9 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
-PreInit> PreInit> /run/initialize
+/run/initialize
  Equal 
  Equal 
  Equal 
@@ -62,7 +62,7 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
-Idle> /run/beamOn 1
+/run/beamOn 1
 /event/verbose 1
 ### Run 0 start.
 =====================================
@@ -20784,5 +20784,5 @@ Track (trackID 1822, parentID 1) is processed with stopping code 2
      0 urgent tracks and 0 waiting tracks.
 NULL returned from G4StackManager.
 Terminate current event processing.
-number of event = 1 User=6.07s Real=7.02s Sys=0.61s
-Idle> 
\ No newline at end of file
+number of event = 1 User=5.53s Real=6.35s Sys=0.7s
+exit
diff --git a/examples/novice/N06/include/ExN06RunAction.hh b/examples/novice/N06/include/ExN06RunAction.hh
index ee56e6ea6b..a45c2852d9 100644
--- a/examples/novice/N06/include/ExN06RunAction.hh
+++ b/examples/novice/N06/include/ExN06RunAction.hh
@@ -9,10 +9,10 @@
 #ifndef ExN06RunAction_h
 #define ExN06RunAction_h 1
 
-#include "G4Timer.hh"
 #include "globals.hh"
 #include "G4UserRunAction.hh"
 
+class G4Timer;
 class G4Run;
 
 class ExN06RunAction : public G4UserRunAction
diff --git a/examples/novice/N06/src/ExN06DetectorConstruction.cc b/examples/novice/N06/src/ExN06DetectorConstruction.cc
index 3615da2366..171fdf64e0 100644
--- a/examples/novice/N06/src/ExN06DetectorConstruction.cc
+++ b/examples/novice/N06/src/ExN06DetectorConstruction.cc
@@ -206,8 +206,8 @@ G4VPhysicalVolume* ExN06DetectorConstruction::Construct()
   OpWaterSurface->SetFinish(polished);
   OpWaterSurface->SetModel(glisur);
 
-  if( WaterSurface->GetVolume1() == waterTank_phys ) G4cout << " Equal " << endl;
-  if( WaterSurface->GetVolume2() == expHall_phys   ) G4cout << " Equal " << endl;
+  if( WaterSurface->GetVolume1() == waterTank_phys ) G4cout << " Equal " << G4endl;
+  if( WaterSurface->GetVolume2() == expHall_phys   ) G4cout << " Equal " << G4endl;
 
   G4OpticalSurface * OpAirSurface =
                               new G4OpticalSurface("AirSurface");
@@ -221,16 +221,16 @@ G4VPhysicalVolume* ExN06DetectorConstruction::Construct()
   OpAirSurface->SetFinish(ground);
   OpAirSurface->SetModel(unified);
 
-  if( AirSurface->GetLogicalVolume() == bubbleAir_log ) G4cout << " Equal " << endl;
+  if( AirSurface->GetLogicalVolume() == bubbleAir_log ) G4cout << " Equal " << G4endl;
 
   G4LogicalBorderSurface * Tmp1Surface = WaterSurface->
 				 GetSurface(waterTank_phys,expHall_phys);
 
-//  if (Tmp1Surface == *WaterSurface) G4cout << " Equal "     << endl;
+//  if (Tmp1Surface == *WaterSurface) G4cout << " Equal "     << G4endl;
 
   G4LogicalSkinSurface * Tmp2Surface = AirSurface->GetSurface(bubbleAir_log);
 
-//  if (Tmp2Surface == *AirSurface  ) G4cout << " Equal "     << endl;
+//  if (Tmp2Surface == *AirSurface  ) G4cout << " Equal "     << G4endl;
 
   G4OpticalSurface * TmpOpSurface = Tmp2Surface->GetOpticalSurface();
   TmpOpSurface->DumpInfo();
diff --git a/examples/novice/N06/src/ExN06PhysicsList.cc b/examples/novice/N06/src/ExN06PhysicsList.cc
index 035a9e4015..db169e7682 100644
--- a/examples/novice/N06/src/ExN06PhysicsList.cc
+++ b/examples/novice/N06/src/ExN06PhysicsList.cc
@@ -7,7 +7,7 @@
 //
 
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 #include "globals.hh"
 #include "ExN06PhysicsList.hh"
@@ -211,7 +211,7 @@ void ExN06PhysicsList::ConstructOp()
       pmanager->AddContinuousProcess(theCerenkovProcess);
     }
     if (particleName == "opticalphoton") {
-      G4cout << " AddDiscreteProcess to OpticalPhoton " << endl;
+      G4cout << " AddDiscreteProcess to OpticalPhoton " << G4endl;
       pmanager->AddDiscreteProcess(theAbsorptionProcess);
       pmanager->AddDiscreteProcess(theRayleighScatteringProcess);
       pmanager->AddDiscreteProcess(theBoundaryProcess);
diff --git a/examples/novice/N06/src/ExN06RunAction.cc b/examples/novice/N06/src/ExN06RunAction.cc
index a4bf7d7b4e..9afc812585 100644
--- a/examples/novice/N06/src/ExN06RunAction.cc
+++ b/examples/novice/N06/src/ExN06RunAction.cc
@@ -6,6 +6,9 @@
 // and all its terms.
 //
 
+// Make this appear first!
+#include "G4Timer.hh"
+
 #include "ExN06RunAction.hh"
 
 #include "G4ios.hh"
@@ -28,7 +31,7 @@ void ExN06RunAction::BeginOfRunAction(const G4Run* aRun)
   UI->ApplyCommand("/event/verbose 1");
   //UI->ApplyCommand("/tracking/verbose 1");
 
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   timer->Start();
 }
 
@@ -36,5 +39,5 @@ void ExN06RunAction::EndOfRunAction(const G4Run* aRun)
 {
   timer->Stop();
   G4cout << "number of event = " << aRun->GetNumberOfEvent() 
-       << " " << *timer << endl;
+       << " " << *timer << G4endl;
 }
diff --git a/source/GNUmakefile b/source/GNUmakefile
index 87317b1c20..9030225c46 100644
--- a/source/GNUmakefile
+++ b/source/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.15 1999/12/05 22:36:52 morita Exp $
+# $Id: GNUmakefile,v 1.16 1999/12/15 16:36:30 stesting Exp $
 # -----------------------------------------------------------------
 # "gmake" makes default libraries for each subdomain.
 # "gmake glob" makes global libraries for each subdomain.
@@ -30,32 +30,32 @@ unique := $(shell echo $$$$)
 all:
 ifdef G4USE_HEPODBMS
 	@$(ECHO) Making granular libraries with HepODBMS option ...
-	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) cleandb); done
+	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) cleandb); done;:
 	@if [ ! -f $(G4TMPDIR)/schema/G4SCHEMA ] ; then \
 	  $(ECHO) "Temporary boot file does not exist.  Stop." ; exit 1 ; \
 	 fi
 endif
-	@for dir in $(SUBDIR1); do (cd $$dir; $(MAKE)); done
-	@for dir in $(SUBDIR2); do (cd $$dir; $(MAKE)); done
-	@for dir in $(SUBDIR3); do (cd $$dir; $(MAKE)); done
+	@for dir in $(SUBDIR1); do (cd $$dir; $(MAKE)); done;:
+	@for dir in $(SUBDIR2); do (cd $$dir; $(MAKE)); done;:
+	@for dir in $(SUBDIR3); do (cd $$dir; $(MAKE)); done;:
 ifdef G4USE_HEPODBMS
-	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE)); done
+	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE)); done;:
 endif
 	$(MAKE) libmap
 
 glob global:
 ifdef G4USE_HEPODBMS
 	@$(ECHO) Making global libraries with HepODBMS option ...
-	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) cleandb); done
+	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) cleandb); done;:
 	@if [ ! -f $(G4TMPDIR)/schema/G4SCHEMA ] ; then \
 	  $(ECHO) "Temporary boot file does not exist.  Stop." ; exit 1 ; \
 	 fi
 endif
-	@for dir in $(SUBDIR1); do (cd $$dir; $(MAKE) global); done
-	@for dir in $(SUBDIR2); do (cd $$dir; $(MAKE)); done
-	@for dir in $(SUBDIR3); do (cd $$dir; $(MAKE)); done
+	@for dir in $(SUBDIR1); do (cd $$dir; $(MAKE) global); done;:
+	@for dir in $(SUBDIR2); do (cd $$dir; $(MAKE)); done;:
+	@for dir in $(SUBDIR3); do (cd $$dir; $(MAKE)); done;:
 ifdef G4USE_HEPODBMS
-	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) global); done
+	@for dir in $(SUBDIR4); do (cd $$dir; $(MAKE) global); done;:
 endif
 
 
diff --git a/source/digits+hits/detector/include/G4HCtable.hh b/source/digits+hits/detector/include/G4HCtable.hh
index 5cf078ea73..db76d39fed 100644
--- a/source/digits+hits/detector/include/G4HCtable.hh
+++ b/source/digits+hits/detector/include/G4HCtable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HCtable.hh,v 1.2.2.1.2.1 1999/12/07 20:47:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4HCtable_H
diff --git a/source/digits+hits/detector/include/G4SDManager.hh b/source/digits+hits/detector/include/G4SDManager.hh
index f00cfee1dc..f0f257b9eb 100644
--- a/source/digits+hits/detector/include/G4SDManager.hh
+++ b/source/digits+hits/detector/include/G4SDManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SDManager.hh,v 1.2.4.1 1999/12/07 20:47:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4SDManager_h
diff --git a/source/digits+hits/detector/include/G4SDStructure.hh b/source/digits+hits/detector/include/G4SDStructure.hh
index 235e583107..48c5723528 100644
--- a/source/digits+hits/detector/include/G4SDStructure.hh
+++ b/source/digits+hits/detector/include/G4SDStructure.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SDStructure.hh,v 1.2.2.1.2.1 1999/12/07 20:47:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4SDStructure_h
diff --git a/source/digits+hits/detector/include/G4SDmessenger.hh b/source/digits+hits/detector/include/G4SDmessenger.hh
index 92eca75338..961589793f 100644
--- a/source/digits+hits/detector/include/G4SDmessenger.hh
+++ b/source/digits+hits/detector/include/G4SDmessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SDmessenger.hh,v 1.2.4.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4SDmessenger_h
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
index fb616d2207..e835f50658 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SensitiveVolumeList.hh,v 1.2.2.1.2.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1996
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
index 7d6c96d140..03e6baa89a 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SensitiveVolumeList.icc,v 1.1.8.1.2.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -----------------------------------------------------------
 //      Inline functions of GEANT 4 class header file.
diff --git a/source/digits+hits/detector/include/G4VReadOutGeometry.hh b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
index dc28991898..7737c901bb 100644
--- a/source/digits+hits/detector/include/G4VReadOutGeometry.hh
+++ b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VReadOutGeometry.hh,v 1.1.10.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/include/G4VSensitiveDetector.hh b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
index 30bd7c6770..b1797fa647 100644
--- a/source/digits+hits/detector/include/G4VSensitiveDetector.hh
+++ b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSensitiveDetector.hh,v 1.2.2.1.2.1 1999/12/07 20:47:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VSensitiveDetector_h
diff --git a/source/digits+hits/detector/src/G4HCtable.cc b/source/digits+hits/detector/src/G4HCtable.cc
index 96593dd364..525fe66f6f 100644
--- a/source/digits+hits/detector/src/G4HCtable.cc
+++ b/source/digits+hits/detector/src/G4HCtable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HCtable.cc,v 1.1.8.1.2.1 1999/12/07 20:47:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4HCtable.hh"
diff --git a/source/digits+hits/detector/src/G4SDManager.cc b/source/digits+hits/detector/src/G4SDManager.cc
index 88698852e7..07b794acfe 100644
--- a/source/digits+hits/detector/src/G4SDManager.cc
+++ b/source/digits+hits/detector/src/G4SDManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SDManager.cc,v 1.1.10.1 1999/12/07 20:47:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SDManager.cc,v 1.1.10.1.2.1 1999/12/08 17:33:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4SDManager.hh"
@@ -60,7 +60,7 @@ void G4SDManager::AddNewDetector(G4VSensitiveDetector*aSD)
   if( verboseLevel > 0 )
   {
     G4cout << "New sensitive detector <" << aSD->GetName()
-         << "> is registored at " << pathName << endl;
+         << "> is registored at " << pathName << G4endl;
   }
 }
 
@@ -94,9 +94,9 @@ G4int G4SDManager::GetCollectionID(G4String colName)
 {
   G4int id = HCtable->GetCollectionID(colName);
   if(id==-1)
-  { G4cout << "<" << colName << "> is not found." << endl; }
+  { G4cout << "<" << colName << "> is not found." << G4endl; }
   else if(id==-2)
-  { G4cout << "<" << colName << "> is ambiguous." << endl; }
+  { G4cout << "<" << colName << "> is ambiguous." << G4endl; }
   return id;
 }
 
diff --git a/source/digits+hits/detector/src/G4SDStructure.cc b/source/digits+hits/detector/src/G4SDStructure.cc
index 2a5a3c2188..fc222c5390 100644
--- a/source/digits+hits/detector/src/G4SDStructure.cc
+++ b/source/digits+hits/detector/src/G4SDStructure.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SDStructure.cc,v 1.1.8.1.2.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SDStructure.cc,v 1.1.8.1.2.1.2.1 1999/12/08 17:33:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4SDStructure
@@ -60,7 +60,7 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
     if( tgtSD != NULL )
     {
       G4cout << aSD->GetName() << " had already stored in "
-           << pathName << endl;
+           << pathName << G4endl;
     }
     else
     {
@@ -106,7 +106,7 @@ void G4SDStructure::Activate(G4String aName, G4bool sensitiveFlag)
     G4SDStructure* tgtSDS = FindSubDirectory(subD);
     if( tgtSDS == NULL )
     {  // The subdirectory is not found
-      G4cout << subD << " is not found in " << pathName << endl;
+      G4cout << subD << " is not found in " << pathName << G4endl;
     }
     else
     { 
@@ -129,7 +129,7 @@ void G4SDStructure::Activate(G4String aName, G4bool sensitiveFlag)
     G4VSensitiveDetector* tgtSD = GetSD(aPath);
     if( tgtSD == NULL )
     {  // The detector is not found.
-      G4cout << aPath << " is not found in " << pathName << endl;
+      G4cout << aPath << " is not found in " << pathName << G4endl;
     }
     else
     {
@@ -148,7 +148,7 @@ G4VSensitiveDetector* G4SDStructure::FindSensitiveDetector(G4String aName)
     G4SDStructure* tgtSDS = FindSubDirectory(subD);
     if( tgtSDS == NULL )
     {  // The subdirectory is not found
-      G4cout << subD << " is not found in " << pathName << endl;
+      G4cout << subD << " is not found in " << pathName << G4endl;
       return NULL;
     }
     else
@@ -161,7 +161,7 @@ G4VSensitiveDetector* G4SDStructure::FindSensitiveDetector(G4String aName)
     G4VSensitiveDetector* tgtSD = GetSD(aPath);
     if( tgtSD == NULL )
     {  // The detector is not found.
-      G4cout << aPath << " is not found in " << pathName << endl;
+      G4cout << aPath << " is not found in " << pathName << G4endl;
     }
     return tgtSD;
   }
@@ -199,7 +199,7 @@ void G4SDStructure::Terminate(G4HCofThisEvent*HCE)
 
 void G4SDStructure::ListTree()
 {
-  G4cout << pathName << endl;
+  G4cout << pathName << G4endl;
   for(int i=0; i<detector.entries(); i++)
   {
     G4VSensitiveDetector* sd = detector(i);
@@ -208,7 +208,7 @@ void G4SDStructure::ListTree()
     { G4cout << "   *** Active "; }
     else
     { G4cout << "   XXX Inactive "; }
-    G4cout << endl;
+    G4cout << G4endl;
   }
   for(int j=0; j<structure.entries(); j++)
   { structure(j)->ListTree(); }
diff --git a/source/digits+hits/detector/src/G4SDmessenger.cc b/source/digits+hits/detector/src/G4SDmessenger.cc
index cf2c0c1573..836d2e3204 100644
--- a/source/digits+hits/detector/src/G4SDmessenger.cc
+++ b/source/digits+hits/detector/src/G4SDmessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SDmessenger.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
index 91774dac68..5bf7f7c158 100644
--- a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
+++ b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SensitiveVolumeList.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/digits+hits/detector/src/G4VReadOutGeometry.cc b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
index dbcaeceb14..2129f13e2b 100644
--- a/source/digits+hits/detector/src/G4VReadOutGeometry.cc
+++ b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VReadOutGeometry.cc,v 1.2.6.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VReadOutGeometry.hh"
diff --git a/source/digits+hits/detector/src/G4VSensitiveDetector.cc b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
index abeb3a7008..6f0b3223c3 100644
--- a/source/digits+hits/detector/src/G4VSensitiveDetector.cc
+++ b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSensitiveDetector.cc,v 1.1.8.1.2.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VSensitiveDetector
 #include "G4VSensitiveDetector.hh"
diff --git a/source/digits+hits/digits/include/G4DCofThisEvent.hh b/source/digits+hits/digits/include/G4DCofThisEvent.hh
index 83fa6249e8..041aba35f5 100644
--- a/source/digits+hits/digits/include/G4DCofThisEvent.hh
+++ b/source/digits+hits/digits/include/G4DCofThisEvent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DCofThisEvent.hh,v 1.2.2.1.2.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4DCofThisEvent_h
diff --git a/source/digits+hits/digits/include/G4TDigiCollection.hh b/source/digits+hits/digits/include/G4TDigiCollection.hh
index afb0fbe00b..4dd494cf70 100644
--- a/source/digits+hits/digits/include/G4TDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4TDigiCollection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TDigiCollection.hh,v 1.5.2.1.2.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4TDigiCollection_h
diff --git a/source/digits+hits/digits/include/G4VDigi.hh b/source/digits+hits/digits/include/G4VDigi.hh
index 9de0520fbd..001e3c6229 100644
--- a/source/digits+hits/digits/include/G4VDigi.hh
+++ b/source/digits+hits/digits/include/G4VDigi.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigi.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VDigi_h
diff --git a/source/digits+hits/digits/include/G4VDigiCollection.hh b/source/digits+hits/digits/include/G4VDigiCollection.hh
index 8288ea9317..53d1f6e42f 100644
--- a/source/digits+hits/digits/include/G4VDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4VDigiCollection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigiCollection.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VDigiCollection_h
diff --git a/source/digits+hits/digits/src/G4DCofThisEvent.cc b/source/digits+hits/digits/src/G4DCofThisEvent.cc
index c4867d89bf..6532849bf8 100644
--- a/source/digits+hits/digits/src/G4DCofThisEvent.cc
+++ b/source/digits+hits/digits/src/G4DCofThisEvent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DCofThisEvent.cc,v 1.1.8.1.2.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4DCofThisEvent.hh"
diff --git a/source/digits+hits/digits/src/G4TDigiCollection.cc b/source/digits+hits/digits/src/G4TDigiCollection.cc
index c25d8a695d..e359ca2a62 100644
--- a/source/digits+hits/digits/src/G4TDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4TDigiCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TDigiCollection.cc,v 1.1.10.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4TDigiCollection.hh"
diff --git a/source/digits+hits/digits/src/G4VDigi.cc b/source/digits+hits/digits/src/G4VDigi.cc
index f9d8d368ac..fd5ed66c45 100644
--- a/source/digits+hits/digits/src/G4VDigi.cc
+++ b/source/digits+hits/digits/src/G4VDigi.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigi.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4VDigi
diff --git a/source/digits+hits/digits/src/G4VDigiCollection.cc b/source/digits+hits/digits/src/G4VDigiCollection.cc
index bf60bfebb3..3389b64e20 100644
--- a/source/digits+hits/digits/src/G4VDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4VDigiCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigiCollection.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4VDigiCollection
diff --git a/source/digits+hits/hits/include/G4HCofThisEvent.hh b/source/digits+hits/hits/include/G4HCofThisEvent.hh
index 1ae2346fac..cfd5688476 100644
--- a/source/digits+hits/hits/include/G4HCofThisEvent.hh
+++ b/source/digits+hits/hits/include/G4HCofThisEvent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HCofThisEvent.hh,v 1.2.2.1.2.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4HCofThisEvent_h
diff --git a/source/digits+hits/hits/include/G4THitsCollection.hh b/source/digits+hits/hits/include/G4THitsCollection.hh
index 19985c580c..50cc060730 100644
--- a/source/digits+hits/hits/include/G4THitsCollection.hh
+++ b/source/digits+hits/hits/include/G4THitsCollection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4THitsCollection.hh,v 1.4.2.1.2.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4THitsCollection_h
diff --git a/source/digits+hits/hits/include/G4VHit.hh b/source/digits+hits/hits/include/G4VHit.hh
index 04c8784d1d..a606eb4a42 100644
--- a/source/digits+hits/hits/include/G4VHit.hh
+++ b/source/digits+hits/hits/include/G4VHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHit.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VHit_h
diff --git a/source/digits+hits/hits/include/G4VHitsCollection.hh b/source/digits+hits/hits/include/G4VHitsCollection.hh
index 2136d53037..b17e34d5ac 100644
--- a/source/digits+hits/hits/include/G4VHitsCollection.hh
+++ b/source/digits+hits/hits/include/G4VHitsCollection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHitsCollection.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VHitsCollection_h
diff --git a/source/digits+hits/hits/src/G4HCofThisEvent.cc b/source/digits+hits/hits/src/G4HCofThisEvent.cc
index c8225d3e00..595fe816cc 100644
--- a/source/digits+hits/hits/src/G4HCofThisEvent.cc
+++ b/source/digits+hits/hits/src/G4HCofThisEvent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HCofThisEvent.cc,v 1.1.8.1.2.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4HCofThisEvent.hh"
diff --git a/source/digits+hits/hits/src/G4THitsCollection.cc b/source/digits+hits/hits/src/G4THitsCollection.cc
index a84d18f25d..b493491fe5 100644
--- a/source/digits+hits/hits/src/G4THitsCollection.cc
+++ b/source/digits+hits/hits/src/G4THitsCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4THitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4THitsCollection.hh"
diff --git a/source/digits+hits/hits/src/G4VHit.cc b/source/digits+hits/hits/src/G4VHit.cc
index e5ba1b8dda..eb6d90c08e 100644
--- a/source/digits+hits/hits/src/G4VHit.cc
+++ b/source/digits+hits/hits/src/G4VHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHit.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4VHit
diff --git a/source/digits+hits/hits/src/G4VHitsCollection.cc b/source/digits+hits/hits/src/G4VHitsCollection.cc
index b59e0eb465..dde56f98cd 100644
--- a/source/digits+hits/hits/src/G4VHitsCollection.cc
+++ b/source/digits+hits/hits/src/G4VHitsCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4VHitsCollection
diff --git a/source/event/History b/source/event/History
index 34b7e24d7a..cf0f5137b2 100644
--- a/source/event/History
+++ b/source/event/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 1999/11/09 00:57:22 asaim Exp $
+$Id: History,v 1.9 2000/01/26 06:42:14 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,17 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Jan 26, 00, M.Asai (tag event-V01-00-01)
+- Corrections for trajectories of suspended tracks
+- This tag requires tracking-V01-00-01
+
+Jan 12, 00, M.Asai (tag event-V01-00-00)
+- G4EventManager becomes a singleton.
+- G4EventManager keeps the pointers of all user action classes except
+ run action.
+- Null pointer protections are added for SetUserAction methods in
+ G4EventManager and G4StackManager.
+
 Nov 4, 99, M.Asai (tag event-V00-01-01)
 - Comments are enriched for the software reference manual
 
diff --git a/source/event/include/G4ClassificationOfNewTrack.hh b/source/event/include/G4ClassificationOfNewTrack.hh
index 35cfb7e76b..e35dd3e418 100644
--- a/source/event/include/G4ClassificationOfNewTrack.hh
+++ b/source/event/include/G4ClassificationOfNewTrack.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ClassificationOfNewTrack.hh,v 1.2.4.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ClassificationOfNewTrack.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/event/include/G4EvManMessenger.hh b/source/event/include/G4EvManMessenger.hh
index 6ccea9280f..e85f8a369a 100644
--- a/source/event/include/G4EvManMessenger.hh
+++ b/source/event/include/G4EvManMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EvManMessenger.hh,v 1.2.4.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EvManMessenger.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4EvManMessenger_h
diff --git a/source/event/include/G4Event.hh b/source/event/include/G4Event.hh
index de117a3dfd..a0917d91ac 100644
--- a/source/event/include/G4Event.hh
+++ b/source/event/include/G4Event.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Event.hh,v 1.2.4.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Event.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4Event_h
diff --git a/source/event/include/G4EventManager.hh b/source/event/include/G4EventManager.hh
index 6149a64d37..08c4d798cc 100644
--- a/source/event/include/G4EventManager.hh
+++ b/source/event/include/G4EventManager.hh
@@ -5,12 +5,10 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EventManager.hh,v 1.3.4.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EventManager.hh,v 1.5 2000/01/12 01:29:50 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
-//  Last Modification : 10/Dec/96 M.Asai
-//
 
 
 #ifndef G4EventManager_h
@@ -41,6 +39,12 @@ class G4SDManager;
 
 class G4EventManager 
 {
+  public: // with description
+      static G4EventManager* GetEventManager();
+      //  This method returns the singleton pointer of G4EventManager.
+
+  private:
+      static G4EventManager* fpEventManager;
 
   public:
       G4EventManager();
@@ -67,16 +71,24 @@ class G4EventManager
       int verboseLevel;
       G4SDManager* sdManager;
       G4PrimaryTransformer* transformer;
-      G4UserEventAction* userEventAction;
       G4bool tracking;
 
       G4EvManMessenger* theMessenger;
 
-  public:
+      G4UserEventAction*    userEventAction;
+      G4UserStackingAction* userStackingAction;
+      G4UserTrackingAction* userTrackingAction;
+      G4UserSteppingAction* userSteppingAction;
+
+  public: // with description
       inline const G4Event* GetConstCurrentEvent()
       { return currentEvent; }
       inline G4Event* GetNonconstCurrentEvent()
       { return currentEvent; }
+      //  These methods returns the pointers of const G4Event*
+      // and G4Event*, respectively. Null will be returned when
+      // an event is not processing.
+
   public: // with description
       inline void AbortCurrentEvent()
       { 
@@ -87,14 +99,25 @@ class G4EventManager
       // tracks are deleted. The contents of G4Event object is not completed,
       // but trajectories, hits, and/or digits which are created before the
       // moment of abortion can be used.
-  public:
+
+  public: // with description
       void SetUserAction(G4UserEventAction* userAction);
-      inline void SetUserAction(G4UserStackingAction* userAction)
-      { trackContainer->SetUserStackingAction(userAction); }
-      inline void SetUserAction(G4UserTrackingAction* userAction)
-      { trackManager->SetUserAction(userAction); }
-      inline void SetUserAction(G4UserSteppingAction* userAction)
-      { trackManager->SetUserAction(userAction); }
+      void SetUserAction(G4UserStackingAction* userAction);
+      void SetUserAction(G4UserTrackingAction* userAction);
+      void SetUserAction(G4UserSteppingAction* userAction);
+      inline G4UserEventAction* GetUserEventAction()
+      { return userEventAction; }
+      inline G4UserStackingAction* GetUserStackingAction()
+      { return userStackingAction; }
+      inline G4UserTrackingAction* GetUserTrackingAction()
+      { return userTrackingAction; }
+      inline G4UserSteppingAction* GetUserSteppingAction()
+      { return userSteppingAction; }
+      // Set and get methods for user action classes. User action classes
+      // which should belong to the other managers will be sent to the 
+      // corresponding managers.
+
+  public: // with description
       inline G4int GetVerboseLevel()
       { return verboseLevel; }
       inline void SetVerboseLevel( G4int value )
@@ -103,6 +126,7 @@ class G4EventManager
         trackContainer->SetVerboseLevel( value );
         transformer->SetVerboseLevel( value );
       }
+      // Set and get method of the verbose level
 
 };
 
diff --git a/source/event/include/G4HEPEvtInterface.hh b/source/event/include/G4HEPEvtInterface.hh
index e6be4b50ee..c792570bea 100644
--- a/source/event/include/G4HEPEvtInterface.hh
+++ b/source/event/include/G4HEPEvtInterface.hh
@@ -5,14 +5,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtInterface.hh,v 1.2.2.1.2.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPEvtInterface.hh,v 1.4 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4HEPEvtInterface_h
 #define G4HEPEvtInterface_h 1
 
-#include <fstream.h>
+#include "g4std/fstream"
 #include "g4rw/tpordvec.h"
 #include "globals.hh"
 #include "G4VPrimaryGenerator.hh"
@@ -69,7 +69,7 @@ class G4HEPEvtInterface:public G4VPrimaryGenerator
 
   private:
     G4String fileName;
-    ifstream inputFile;
+    G4std::ifstream inputFile;
     G4RWTPtrOrderedVector<G4HEPEvtParticle> HPlist;
 };
 
diff --git a/source/event/include/G4HEPEvtParticle.hh b/source/event/include/G4HEPEvtParticle.hh
index b932f7dd3e..a99fb9a802 100644
--- a/source/event/include/G4HEPEvtParticle.hh
+++ b/source/event/include/G4HEPEvtParticle.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtParticle.hh,v 1.2.4.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPEvtParticle.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/event/include/G4ParticleGun.hh b/source/event/include/G4ParticleGun.hh
index 98809143a4..7754f889f6 100644
--- a/source/event/include/G4ParticleGun.hh
+++ b/source/event/include/G4ParticleGun.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleGun.hh,v 1.2.4.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleGun.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4ParticleGun_h
diff --git a/source/event/include/G4ParticleGunMessenger.hh b/source/event/include/G4ParticleGunMessenger.hh
index f3b995a111..0eaac8784f 100644
--- a/source/event/include/G4ParticleGunMessenger.hh
+++ b/source/event/include/G4ParticleGunMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleGunMessenger.hh,v 1.2.4.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleGunMessenger.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/event/include/G4PrimaryParticle.hh b/source/event/include/G4PrimaryParticle.hh
index 8a8699b876..8d23d4838f 100644
--- a/source/event/include/G4PrimaryParticle.hh
+++ b/source/event/include/G4PrimaryParticle.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryParticle.hh,v 1.2.4.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryParticle.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/event/include/G4PrimaryTransformer.hh b/source/event/include/G4PrimaryTransformer.hh
index b3521a5350..09b37f4ff4 100644
--- a/source/event/include/G4PrimaryTransformer.hh
+++ b/source/event/include/G4PrimaryTransformer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryTransformer.hh,v 1.2.4.1 1999/12/07 20:47:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryTransformer.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PromaryTransformer_h 
diff --git a/source/event/include/G4PrimaryVertex.hh b/source/event/include/G4PrimaryVertex.hh
index 64d4abf987..9d07102ee7 100644
--- a/source/event/include/G4PrimaryVertex.hh
+++ b/source/event/include/G4PrimaryVertex.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryVertex.hh,v 1.2.4.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryVertex.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/event/include/G4StackManager.hh b/source/event/include/G4StackManager.hh
index 607a799235..319eb3e96e 100644
--- a/source/event/include/G4StackManager.hh
+++ b/source/event/include/G4StackManager.hh
@@ -5,12 +5,10 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackManager.hh,v 1.2.4.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackManager.hh,v 1.5 2000/01/26 06:42:14 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
-//  Last Modification : 09/Dec/96 M.Asai
-//
 
 
 #ifndef G4StackManager_h
@@ -24,6 +22,7 @@
 #include "G4TrackStatus.hh"
 #include "globals.hh"
 class G4StackingMessenger;
+class G4VTrajectory;
 
 // class description:
 //
@@ -55,8 +54,8 @@ class G4StackManager
       int operator!=(const G4StackManager &right) const;
 
   public:
-      G4int PushOneTrack(G4Track *newTrack);
-      G4Track * PopNextTrack();
+      G4int PushOneTrack(G4Track *newTrack, G4VTrajectory *newTrajectory = NULL);
+      G4Track * PopNextTrack(G4VTrajectory**newTrajectory);
       G4int PrepareNewEvent();
 
   public: // with description
@@ -103,9 +102,8 @@ class G4StackManager
       { verboseLevel = value; }
       inline void SetUserStackingAction(G4UserStackingAction* value)
       { 
-        if (userStackingAction) delete userStackingAction;
 	userStackingAction = value;
-	userStackingAction->SetStackManager(this);
+        if(userStackingAction) userStackingAction->SetStackManager(this);
       }
 
   private:
diff --git a/source/event/include/G4StackedTrack.hh b/source/event/include/G4StackedTrack.hh
index 42eb7c997e..ce7e809772 100644
--- a/source/event/include/G4StackedTrack.hh
+++ b/source/event/include/G4StackedTrack.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackedTrack.hh,v 1.2.4.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackedTrack.hh,v 1.4 2000/01/26 06:42:15 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
@@ -19,6 +19,7 @@
 #include "G4Track.hh"
 #include "globals.hh"
 #include "G4Allocator.hh"
+class G4VTrajectory;
 
 // class description:
 //
@@ -33,7 +34,7 @@ class G4StackedTrack
       inline void operator delete(void *aStackedTrack);
 
       G4StackedTrack();
-      G4StackedTrack(G4Track * aTrack);
+      G4StackedTrack(G4Track * aTrack, G4VTrajectory * aTrajectory = 0);
       ~G4StackedTrack();
 
       const G4StackedTrack & operator=(const G4StackedTrack &right);
@@ -42,7 +43,8 @@ class G4StackedTrack
 
   private:
       G4double priorityWeight;
-      G4Track *track;
+      G4Track * track;
+      G4VTrajectory * trajectory;
       G4StackedTrack * previousStackedTrack;
       G4StackedTrack * nextStackedTrack;
 
@@ -53,6 +55,8 @@ class G4StackedTrack
       { priorityWeight = value; }
       inline G4Track * GetTrack() const
       { return track; }
+      inline G4VTrajectory * GetTrajectory() const
+      { return trajectory; }
       inline G4StackedTrack * GetPrevious() const
       { return previousStackedTrack; }
       inline G4StackedTrack * GetNext() const
diff --git a/source/event/include/G4StackingMessenger.hh b/source/event/include/G4StackingMessenger.hh
index 2a519d53be..3f76585d9e 100644
--- a/source/event/include/G4StackingMessenger.hh
+++ b/source/event/include/G4StackingMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackingMessenger.hh,v 1.2.4.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackingMessenger.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4StackingMessenger_h
diff --git a/source/event/include/G4TrackStack.hh b/source/event/include/G4TrackStack.hh
index d58af9bf0e..b35eb8fd7c 100644
--- a/source/event/include/G4TrackStack.hh
+++ b/source/event/include/G4TrackStack.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackStack.hh,v 1.2.4.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackStack.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/include/G4TrajectoryContainer.hh b/source/event/include/G4TrajectoryContainer.hh
index 7b052e73a6..1227f92b17 100644
--- a/source/event/include/G4TrajectoryContainer.hh
+++ b/source/event/include/G4TrajectoryContainer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoryContainer.hh,v 1.3.2.1.2.1 1999/12/07 20:47:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoryContainer.hh,v 1.5 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //	G4TrajectoryContainer
diff --git a/source/event/include/G4UserEventAction.hh b/source/event/include/G4UserEventAction.hh
index 9b89e707d5..3d04d8d7f3 100644
--- a/source/event/include/G4UserEventAction.hh
+++ b/source/event/include/G4UserEventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserEventAction.hh,v 1.3.4.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserEventAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //
diff --git a/source/event/include/G4UserStackingAction.hh b/source/event/include/G4UserStackingAction.hh
index 58bb03385d..a60afa763a 100644
--- a/source/event/include/G4UserStackingAction.hh
+++ b/source/event/include/G4UserStackingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserStackingAction.hh,v 1.3.4.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserStackingAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UserStackingAction_h
diff --git a/source/event/include/G4VPrimaryGenerator.hh b/source/event/include/G4VPrimaryGenerator.hh
index 1b1ab9942b..94b7dc3187 100644
--- a/source/event/include/G4VPrimaryGenerator.hh
+++ b/source/event/include/G4VPrimaryGenerator.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPrimaryGenerator.hh,v 1.2.4.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPrimaryGenerator.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VPrimaryGenerator_h
diff --git a/source/event/include/eventgendefs.hh b/source/event/include/eventgendefs.hh
index b7926e0e8a..fa313f63cc 100644
--- a/source/event/include/eventgendefs.hh
+++ b/source/event/include/eventgendefs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: eventgendefs.hh,v 1.1.10.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: eventgendefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef EventGenerator_DEBUG
 #define EventGenerator_DEBUG
diff --git a/source/event/include/evmandefs.hh b/source/event/include/evmandefs.hh
index 5de4fbb5ce..e39fd886f7 100644
--- a/source/event/include/evmandefs.hh
+++ b/source/event/include/evmandefs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: evmandefs.hh,v 1.1.10.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: evmandefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 ///#define G4EVENTMANAGER_DEBUG 1
diff --git a/source/event/include/trajectoryControl.hh b/source/event/include/trajectoryControl.hh
index 537bb490c7..9a3d51e7a0 100644
--- a/source/event/include/trajectoryControl.hh
+++ b/source/event/include/trajectoryControl.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: trajectoryControl.hh,v 1.1.10.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: trajectoryControl.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////#define G4_STORE_TRAJECTORY 1
 
diff --git a/source/event/src/G4EvManMessenger.cc b/source/event/src/G4EvManMessenger.cc
index 5766baf9e4..df0e3fecee 100644
--- a/source/event/src/G4EvManMessenger.cc
+++ b/source/event/src/G4EvManMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EvManMessenger.cc,v 1.1.10.1 1999/12/07 20:47:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EvManMessenger.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/event/src/G4Event.cc b/source/event/src/G4Event.cc
index 1351bc00ac..4556595909 100644
--- a/source/event/src/G4Event.cc
+++ b/source/event/src/G4Event.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Event.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Event.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4Event
@@ -57,7 +57,7 @@ int G4Event::operator!=(const G4Event &right) const
 
 void G4Event::Print() const
 {
-  G4cout << "G4Event " << eventID << endl;
+  G4cout << "G4Event " << eventID << G4endl;
 }
 
 void G4Event::Draw() const
diff --git a/source/event/src/G4EventManager.cc b/source/event/src/G4EventManager.cc
index 12d08e9f70..b8f44f62ab 100644
--- a/source/event/src/G4EventManager.cc
+++ b/source/event/src/G4EventManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EventManager.cc,v 1.2.8.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EventManager.cc,v 1.5 2000/01/26 06:42:15 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //
@@ -19,15 +19,31 @@
 #include "G4UserStackingAction.hh"
 #include "G4SDManager.hh"
 
+G4EventManager* G4EventManager::fpEventManager = 0;
+G4EventManager* G4EventManager::GetEventManager()
+{ return fpEventManager; }
+
 G4EventManager::G4EventManager()
-:verboseLevel(0),trajectoryContainer(NULL),userEventAction(NULL),
+:verboseLevel(0),trajectoryContainer(NULL),
  tracking(false),currentEvent(NULL)
 {
+ if(fpEventManager)
+ {
+  G4Exception("G4EventManager::G4EventManager() has already been made.");
+ }
+ else
+ {
   trackManager = new G4TrackingManager;
   transformer = new G4PrimaryTransformer;
   trackContainer = new G4StackManager;
   theMessenger = new G4EvManMessenger(this);
   sdManager = G4SDManager::GetSDMpointerIfExist();
+  fpEventManager = this;
+  userEventAction = 0;
+  userStackingAction = 0;
+  userTrackingAction = 0;
+  userSteppingAction = 0;
+ }
 }
 
 // private -> never called
@@ -43,7 +59,8 @@ G4EventManager::~G4EventManager()
    delete transformer;
    delete trackManager;
    delete theMessenger;
-   if (userEventAction) delete userEventAction;
+   if(userEventAction) delete userEventAction;
+   fpEventManager = 0;
 }
 
 /*
@@ -63,9 +80,9 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
 #ifdef G4VERBOSE
   if ( verboseLevel > 0 )
   {
-    G4cout << "=====================================" << endl;
-    G4cout << "  G4EventManager::ProcessOneEvent()  " << endl;
-    G4cout << "=====================================" << endl;
+    G4cout << "=====================================" << G4endl;
+    G4cout << "  G4EventManager::ProcessOneEvent()  " << G4endl;
+    G4cout << "=====================================" << G4endl;
   }
 #endif
 
@@ -85,7 +102,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
   if ( verboseLevel > 1 )
   {
     G4cout << currentEvent->GetNumberOfPrimaryVertex()
-         << " vertices passed from G4Event." << endl;
+         << " vertices passed from G4Event." << G4endl;
   }
 #endif
 
@@ -95,12 +112,13 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
   if ( verboseLevel > 0 )
   {
     G4cout << trackContainer->GetNTotalTrack() << " primaries "
-         << "are passed from G4EventTransformer." << endl;
-    G4cout << "!!!!!!! Now start processing an event !!!!!!!" << endl;
+         << "are passed from G4EventTransformer." << G4endl;
+    G4cout << "!!!!!!! Now start processing an event !!!!!!!" << G4endl;
   }
 #endif
-
-  while( ( track = trackContainer->PopNextTrack() ) != NULL )
+  
+  G4VTrajectory* previousTrajectory;
+  while( ( track = trackContainer->PopNextTrack(&previousTrajectory) ) != NULL )
   {
 
 #ifdef G4VERBOSE
@@ -108,7 +126,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
     {
       G4cout << "Track " << track << " (trackID " << track->GetTrackID()
   	 << ", parentID " << track->GetParentID() 
-  	 << ") is passed to G4TrackingManager." << endl;
+  	 << ") is passed to G4TrackingManager." << G4endl;
     }
 #endif
 
@@ -122,13 +140,20 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
     {
       G4cout << "Track (trackID " << track->GetTrackID()
 	 << ", parentID " << track->GetParentID()
-         << ") is processed with stopping code " << istop << endl;
+         << ") is processed with stopping code " << istop << G4endl;
     }
 #endif
 
 #ifdef G4_STORE_TRAJECTORY
     G4VTrajectory * aTrajectory = trackManager->GimmeTrajectory();
-    if(aTrajectory)
+
+    if(previousTrajectory)
+    {
+      previousTrajectory->MergeTrajectory(aTrajectory);
+      delete aTrajectory;
+      aTrajectory = previousTrajectory;
+    }
+    if(aTrajectory&&(istop!=fStopButAlive)&&(istop!=fSuspend))
     {
       if(!trajectoryContainer)
       { trajectoryContainer = new G4TrajectoryContainer; }
@@ -141,6 +166,10 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
     {
       case fStopButAlive:
       case fSuspend:
+        trackContainer->PushOneTrack( track, aTrajectory );
+        StackTracks( secondaries );
+        break;
+
       case fPostponeToNextEvent:
         trackContainer->PushOneTrack( track );
         StackTracks( secondaries );
@@ -153,7 +182,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
 
       case fAlive:
         G4cout << "Illeagal TrackStatus returned from G4TrackingManager!"
-             << endl;
+             << G4endl;
       case fKillTrackAndSecondaries:
         if( secondaries ) secondaries->clearAndDestroy();
         delete track;
@@ -164,8 +193,8 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
 #ifdef G4VERBOSE
   if ( verboseLevel > 0 )
   {
-    G4cout << "NULL returned from G4StackManager." << endl;
-    G4cout << "Terminate current event processing." << endl;
+    G4cout << "NULL returned from G4StackManager." << G4endl;
+    G4cout << "Terminate current event processing." << G4endl;
   }
 #endif
 
@@ -202,7 +231,7 @@ void G4EventManager::StackTracks(G4TrackVector *trackVector)
         G4cout << "A new track " << newTrack 
              << " (trackID " << newTrack->GetTrackID()
 	     << ", parentID " << newTrack->GetParentID() 
-	     << ") is passed to G4StackManager." << endl;
+	     << ") is passed to G4StackManager." << G4endl;
       }
 #endif
     }
@@ -212,8 +241,26 @@ void G4EventManager::StackTracks(G4TrackVector *trackVector)
 
 void G4EventManager::SetUserAction(G4UserEventAction* userAction)
 {
-  if (userEventAction) delete userEventAction;
   userEventAction = userAction;
-  userEventAction->SetEventManager(this);
+  if(userEventAction) userEventAction->SetEventManager(this);
 }
 
+void G4EventManager::SetUserAction(G4UserStackingAction* userAction)
+{
+  userStackingAction = userAction;
+  trackContainer->SetUserStackingAction(userAction);
+}
+
+void G4EventManager::SetUserAction(G4UserTrackingAction* userAction)
+{
+  userTrackingAction = userAction;
+  trackManager->SetUserAction(userAction);
+}
+
+void G4EventManager::SetUserAction(G4UserSteppingAction* userAction)
+{
+  userSteppingAction = userAction;
+  trackManager->SetUserAction(userAction);
+}
+
+
diff --git a/source/event/src/G4HEPEvtInterface.cc b/source/event/src/G4HEPEvtInterface.cc
index 6d387b7261..7597eba142 100644
--- a/source/event/src/G4HEPEvtInterface.cc
+++ b/source/event/src/G4HEPEvtInterface.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtInterface.cc,v 1.2.8.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPEvtInterface.cc,v 1.3 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------------
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include "G4ios.hh"
 #include "G4HEPEvtInterface.hh"
diff --git a/source/event/src/G4HEPEvtParticle.cc b/source/event/src/G4HEPEvtParticle.cc
index fa81f98c52..66b378c21f 100644
--- a/source/event/src/G4HEPEvtParticle.cc
+++ b/source/event/src/G4HEPEvtParticle.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtParticle.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPEvtParticle.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/event/src/G4ParticleGun.cc b/source/event/src/G4ParticleGun.cc
index 67baed230f..377da15030 100644
--- a/source/event/src/G4ParticleGun.cc
+++ b/source/event/src/G4ParticleGun.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleGun.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleGun.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4ParticleGun
@@ -57,8 +57,8 @@ void G4ParticleGun::SetParticleMomentum(G4ParticleMomentum aMomentum)
 {
   if(particle_definition==NULL)
   {
-    G4cout <<"Particle Definition not defined yet for G4ParticleGun"<< endl;
-    G4cout <<"Zero Mass is assumed"<<endl;
+    G4cout <<"Particle Definition not defined yet for G4ParticleGun"<< G4endl;
+    G4cout <<"Zero Mass is assumed"<<G4endl;
     particle_momentum_direction =  aMomentum.unit();
     particle_energy = aMomentum.mag();
   } 
@@ -69,13 +69,13 @@ void G4ParticleGun::SetParticleMomentum(G4ParticleMomentum aMomentum)
     particle_momentum_direction =  aMomentum.unit();
     if ((particle_energy>0.0)&&(abs(particle_energy+mass-sqrt(p*p+mass*mass))>keV))
     {
-      G4cout << "G4ParticleGun::" << particle_definition->GetParticleName() << endl;
-      G4cout << "  KineticEnergy and Momentum could be inconsistent" << endl;
+      G4cout << "G4ParticleGun::" << particle_definition->GetParticleName() << G4endl;
+      G4cout << "  KineticEnergy and Momentum could be inconsistent" << G4endl;
       G4cout << " (Momentum:" << p/GeV << " GeV/c";
-      G4cout << "  Mass:" << mass/GeV << " GeV/c/c)" << endl;
+      G4cout << "  Mass:" << mass/GeV << " GeV/c/c)" << G4endl;
       G4cout << "  KineticEnergy is overwritten!! ";
       G4cout << particle_energy/GeV << "->";
-      G4cout << (sqrt(p*p+mass*mass)-mass)/GeV << "GeV" << endl;
+      G4cout << (sqrt(p*p+mass*mass)-mass)/GeV << "GeV" << G4endl;
     }
     particle_energy = sqrt(p*p+mass*mass)-mass;
   }
diff --git a/source/event/src/G4ParticleGunMessenger.cc b/source/event/src/G4ParticleGunMessenger.cc
index 8a779a9c6c..c0acbc054c 100644
--- a/source/event/src/G4ParticleGunMessenger.cc
+++ b/source/event/src/G4ParticleGunMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleGunMessenger.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleGunMessenger.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4ParticleGunMessenger.hh"
diff --git a/source/event/src/G4PrimaryParticle.cc b/source/event/src/G4PrimaryParticle.cc
index 6bb013750e..6f30e2c8ad 100644
--- a/source/event/src/G4PrimaryParticle.cc
+++ b/source/event/src/G4PrimaryParticle.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryParticle.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryParticle.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PrimaryParticle.hh"
@@ -80,20 +80,20 @@ void G4PrimaryParticle::Print() const
 {
   G4cout << "==== PDGcode " << PDGcode << "  Particle name ";
   if(G4code != NULL)
-  { G4cout << G4code->GetParticleName() << endl; }
+  { G4cout << G4code->GetParticleName() << G4endl; }
   else
-  { G4cout << "is not defined in G4." << endl; }
-  G4cout << "     Momentum ( " << Px << ", " << Py << ", " << Pz << " )" << endl;
+  { G4cout << "is not defined in G4." << G4endl; }
+  G4cout << "     Momentum ( " << Px << ", " << Py << ", " << Pz << " )" << G4endl;
   G4cout << "     Polarization ( " << polX << ", " << polY << ", "
-                                 << polZ << " )" << endl;
+                                 << polZ << " )" << G4endl;
   if(daughterParticle != NULL)
   {
-    G4cout << ">>>> Daughters" << endl;
+    G4cout << ">>>> Daughters" << G4endl;
     daughterParticle->Print();
   }
   if(nextParticle != NULL)
   { nextParticle->Print(); }
   else
-  { G4cout << "<<<< End of link" << endl; }
+  { G4cout << "<<<< End of link" << G4endl; }
 }
 
diff --git a/source/event/src/G4PrimaryTransformer.cc b/source/event/src/G4PrimaryTransformer.cc
index b676dca819..ee59c2020c 100644
--- a/source/event/src/G4PrimaryTransformer.cc
+++ b/source/event/src/G4PrimaryTransformer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryTransformer.cc,v 1.1.10.1 1999/12/07 20:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryTransformer.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PrimaryTransformer.hh"
@@ -52,7 +52,7 @@ void G4PrimaryTransformer::GenerateTracks(G4PrimaryVertex* primaryVertex)
            << X0 / mm << "(mm),"
            << Y0 / mm << "(mm),"
            << Z0 / mm << "(mm),"
-           << T0 / nanosecond << "(nsec))" << endl;
+           << T0 / nanosecond << "(nsec))" << G4endl;
   }
 #endif
 
@@ -76,7 +76,7 @@ void G4PrimaryTransformer::GenerateSingleTrack
     if(verboseLevel>2)
     {
       G4cout << "Primary particle (PDGcode " << primaryParticle->GetPDGcode()
-             << ") --- Ignored" << endl;
+             << ") --- Ignored" << G4endl;
     }
 #endif 
     G4PrimaryParticle* daughter = primaryParticle->GetDaughter();
@@ -96,7 +96,7 @@ void G4PrimaryTransformer::GenerateSingleTrack
     {
       G4cout << "Primary particle (" << partDef->GetParticleName()
              << ") --- Transfered with momentum " << primaryParticle->GetMomentum()
-             << endl;
+             << G4endl;
     }
 #endif
     G4DynamicParticle* DP = 
@@ -135,7 +135,7 @@ void G4PrimaryTransformer::SetDecayProducts
       if(verboseLevel>2)
       {
         G4cout << " >> Decay product (PDGcode " << daughter->GetPDGcode()
-               << ") --- Ignored" << endl;
+               << ") --- Ignored" << G4endl;
       }
 #endif 
       SetDecayProducts(daughter,motherDP);
@@ -147,7 +147,7 @@ void G4PrimaryTransformer::SetDecayProducts
       {
         G4cout << " >> Decay product (" << partDef->GetParticleName()
                << ") --- Attached with momentum " << daughter->GetMomentum()
-               << endl;
+               << G4endl;
       }
 #endif
       G4DynamicParticle*DP 
diff --git a/source/event/src/G4PrimaryVertex.cc b/source/event/src/G4PrimaryVertex.cc
index b9107112cd..4be1fe84d0 100644
--- a/source/event/src/G4PrimaryVertex.cc
+++ b/source/event/src/G4PrimaryVertex.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PrimaryVertex.cc,v 1.1.10.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PrimaryVertex.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PrimaryVertex.hh"
@@ -53,8 +53,8 @@ int G4PrimaryVertex::operator!=(const G4PrimaryVertex &right) const
 void G4PrimaryVertex::Print() const
 {
   G4cout << "Vertex  ( "
-       << X0 << ", " << Y0 << ", " << Z0 << ", " << T0 << " )" << endl;
-  G4cout << "#### Primary particles" << endl;
+       << X0 << ", " << Y0 << ", " << Z0 << ", " << T0 << " )" << G4endl;
+  G4cout << "#### Primary particles" << G4endl;
   G4PrimaryParticle* aPrim = theParticle;
   if(aPrim != NULL)
   {
diff --git a/source/event/src/G4StackManager.cc b/source/event/src/G4StackManager.cc
index 02c4a2ab93..d34926bcc2 100644
--- a/source/event/src/G4StackManager.cc
+++ b/source/event/src/G4StackManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackManager.cc,v 1.1.10.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackManager.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
@@ -14,6 +14,7 @@
 
 #include "G4StackManager.hh"
 #include "G4StackingMessenger.hh"
+#include "G4VTrajectory.hh"
 #include "evmandefs.hh"
 #include "G4ios.hh"
 
@@ -42,7 +43,7 @@ const{ return false; }
 int G4StackManager::operator!=(const G4StackManager &) 
 const{ return true; }
 
-G4int G4StackManager::PushOneTrack(G4Track *newTrack)
+G4int G4StackManager::PushOneTrack(G4Track *newTrack,G4VTrajectory *newTrajectory)
 {
   G4ClassificationOfNewTrack classification;
   if(userStackingAction) 
@@ -57,14 +58,15 @@ G4int G4StackManager::PushOneTrack(G4Track *newTrack)
     {
       G4cout << "   ---> G4Track " << newTrack << " (trackID "
 	 << newTrack->GetTrackID() << ", parentID "
-	 << newTrack->GetParentID() << ") is not to be stored." << endl;
+	 << newTrack->GetParentID() << ") is not to be stored." << G4endl;
     }
 #endif
     delete newTrack;
+    delete newTrajectory;
   }
   else
   {
-    G4StackedTrack * newStackedTrack = new G4StackedTrack( newTrack );
+    G4StackedTrack * newStackedTrack = new G4StackedTrack( newTrack, newTrajectory );
     switch (classification)
     {
       case fUrgent:
@@ -85,13 +87,13 @@ G4int G4StackManager::PushOneTrack(G4Track *newTrack)
 }
 
 
-G4Track * G4StackManager::PopNextTrack()
+G4Track * G4StackManager::PopNextTrack(G4VTrajectory**newTrajectory)
 {
 #ifdef G4VERBOSE
   if( verboseLevel > 0 )
   {
     G4cout << "### pop requested out of " 
-         << GetNUrgentTrack() << " stacked tracks." << endl;
+         << GetNUrgentTrack() << " stacked tracks." << G4endl;
   }
 #endif
 
@@ -99,20 +101,21 @@ G4Track * G4StackManager::PopNextTrack()
   {
 #ifdef G4VERBOSE
     if( verboseLevel > 0 ) G4cout << "### " << GetNWaitingTrack()
-                      << " waiting tracks are re-classified to" << endl;
+                      << " waiting tracks are re-classified to" << G4endl;
 #endif
     waitingStack->TransferTo(urgentStack);
     if(userStackingAction) userStackingAction->NewStage();
 #ifdef G4VERBOSE
     if( verboseLevel > 0 ) G4cout << "     " << GetNUrgentTrack()
                       << " urgent tracks and " << GetNWaitingTrack()
-                      << " waiting tracks." << endl;
+                      << " waiting tracks." << G4endl;
 #endif
     if( ( GetNUrgentTrack()==0 ) && ( GetNWaitingTrack()==0 ) ) return NULL;
   }
 
   G4StackedTrack * selectedStackedTrack = urgentStack->PopFromStack();
   G4Track * selectedTrack = selectedStackedTrack->GetTrack();
+  *newTrajectory = selectedStackedTrack->GetTrajectory();
 
 #ifdef G4VERBOSE
   if( verboseLevel > 1 )
@@ -121,7 +124,7 @@ G4Track * G4StackManager::PopNextTrack()
          << " with G4Track " << selectedStackedTrack->GetTrack()
 	 << " (trackID " << selectedStackedTrack->GetTrack()->GetTrackID()
 	 << ", parentID " << selectedStackedTrack->GetTrack()->GetParentID()
-	 << ")" << endl;
+	 << ")" << G4endl;
   }
 #endif
 
@@ -146,6 +149,7 @@ void G4StackManager::ReClassify()
     {
       case fKill:
         delete aStackedTrack->GetTrack();
+        delete aStackedTrack->GetTrajectory();
         delete aStackedTrack;
         break;
       case fUrgent:
@@ -173,7 +177,7 @@ G4int G4StackManager::PrepareNewEvent()
     if( verboseLevel > 0 )
     {
       G4cout << GetNPostponedTrack() 
-           << " postponed tracked are now shifted to the stack." << endl;
+           << " postponed tracked are now shifted to the stack." << G4endl;
     }
 #endif
 
@@ -185,6 +189,7 @@ G4int G4StackManager::PrepareNewEvent()
     while( (aStackedTrack=tmpStack.PopFromStack()) != NULL )
     {
       G4Track* aTrack = aStackedTrack->GetTrack();
+      G4VTrajectory* aTrajectory = aStackedTrack->GetTrajectory();
       aTrack->SetParentID(-1);
       G4ClassificationOfNewTrack classification;
       if(userStackingAction) 
diff --git a/source/event/src/G4StackedTrack.cc b/source/event/src/G4StackedTrack.cc
index 71cce29fa7..db60a4b3c6 100644
--- a/source/event/src/G4StackedTrack.cc
+++ b/source/event/src/G4StackedTrack.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackedTrack.cc,v 1.1.10.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackedTrack.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
@@ -17,10 +17,12 @@
 G4Allocator<G4StackedTrack> aStackedTrackAllocator;
 
 G4StackedTrack::G4StackedTrack() 
+:track(NULL),trajectory(NULL),priorityWeight(0.),
+ previousStackedTrack(NULL),nextStackedTrack(NULL)
 { }
 
-G4StackedTrack::G4StackedTrack(G4Track * newTrack) 
-:track(newTrack),priorityWeight(0.),
+G4StackedTrack::G4StackedTrack(G4Track * newTrack, G4VTrajectory * aTrajectory) 
+:track(newTrack),trajectory(aTrajectory),priorityWeight(0.),
  previousStackedTrack(NULL),nextStackedTrack(NULL)
 { }
 
diff --git a/source/event/src/G4StackingMessenger.cc b/source/event/src/G4StackingMessenger.cc
index 87ebe8a388..06a145c139 100644
--- a/source/event/src/G4StackingMessenger.cc
+++ b/source/event/src/G4StackingMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StackingMessenger.cc,v 1.1.10.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StackingMessenger.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------------
 
@@ -50,11 +50,11 @@ void G4StackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
 {
   if( command==statusCmd )
   {
-    G4cout << "========================== Current status of the stack =====" << endl;
-    G4cout << " Number of tracks in the stack" << endl;
-    G4cout << "    Urgent stack    : " << fContainer->GetNUrgentTrack() << endl;
-    G4cout << "    Waiting stack   : " << fContainer->GetNWaitingTrack() << endl;
-    G4cout << "    Postponed stack : " << fContainer->GetNPostponedTrack() << endl;
+    G4cout << "========================== Current status of the stack =====" << G4endl;
+    G4cout << " Number of tracks in the stack" << G4endl;
+    G4cout << "    Urgent stack    : " << fContainer->GetNUrgentTrack() << G4endl;
+    G4cout << "    Waiting stack   : " << fContainer->GetNWaitingTrack() << G4endl;
+    G4cout << "    Postponed stack : " << fContainer->GetNPostponedTrack() << G4endl;
   }
   if( command==clearCmd )
   {
diff --git a/source/event/src/G4TrackStack.cc b/source/event/src/G4TrackStack.cc
index cba178726e..110651c64b 100644
--- a/source/event/src/G4TrackStack.cc
+++ b/source/event/src/G4TrackStack.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackStack.cc,v 1.1.10.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackStack.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/src/G4UserEventAction.cc b/source/event/src/G4UserEventAction.cc
index 20c312e92c..1fbb6adbac 100644
--- a/source/event/src/G4UserEventAction.cc
+++ b/source/event/src/G4UserEventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserEventAction.cc,v 1.2.8.1 1999/12/07 20:47:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserEventAction.cc,v 1.3 1999/12/15 14:49:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UserEventAction.hh"
diff --git a/source/event/src/G4UserStackingAction.cc b/source/event/src/G4UserStackingAction.cc
index c77331322d..fe89481046 100644
--- a/source/event/src/G4UserStackingAction.cc
+++ b/source/event/src/G4UserStackingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserStackingAction.cc,v 1.2.8.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserStackingAction.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UserStackingAction.hh"
diff --git a/source/event/src/G4VPrimaryGenerator.cc b/source/event/src/G4VPrimaryGenerator.cc
index 58ec3d6636..fe9a6d0032 100644
--- a/source/event/src/G4VPrimaryGenerator.cc
+++ b/source/event/src/G4VPrimaryGenerator.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPrimaryGenerator.cc,v 1.1.10.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPrimaryGenerator.cc,v 1.2 1999/12/15 14:49:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4VPrimaryGenerator
diff --git a/source/g3tog4/History b/source/g3tog4/History
index a2115f7db2..8aac053f14 100644
--- a/source/g3tog4/History
+++ b/source/g3tog4/History
@@ -1,8 +1,34 @@
-$Id: History,v 1.26 1999/12/05 17:49:58 gcosmo Exp $
+$Id: History,v 1.31 2000/03/07 10:51:40 stesting Exp $
 
 G3toG4 Modification History (reverse chronological order, please !)
 --------------------------------------------------------------------
 
+g3tog4-V01-00-00a 07-Mar-2000 J.Allison
+- Changed char* to const char* where ISO compiler warned.
+
+g3tog4-V01-00-00 02-Mar-2000 G.Cosmo
+- included fixes by Ivana:
+  o G3VolTable:
+  - added tests VTD.size()>0
+  - corrected G3VolTable::GetVTE() 
+  - added back G3VolTable::Clear()
+  o G3Pos:
+  - added G3Pos::GetOnly() 
+  o G3Division:
+  - corrected G3Division::CreateSolid() for
+    the case ( shape == "TUBS") && ( fIAxis == 1 )
+- fixed warnings for extraneous semicolons on DEC (ISO mode).
+- syncronized with HEAD (mainly CVS headers changed from the recent
+  ISO-ANSI C++ migration.
+
+06-Dec-1999 W.Lockman
+- removed G3fillParams.cc
+- G3Eletable.cc: cast double Z to int
+- added G3toG4Debug() global function (yuch)
+- removed G4.cc.omit
+- made sure all header files are protected with #ifndef ... #endif
+- G3toG4BuildTree.cc: avoid placement of the top-level logical volume
+
 g3tog4-V00-01-cand03 05-Dec-1999  G.Cosmo
 - Merged HEAD of main trunk with tag "wsl-991205" which now includes
   updates by Ivana&Pedro, as well as RW->G4RW migration, STL map
diff --git a/source/g3tog4/include/G3CalcParams.hh b/source/g3tog4/include/G3CalcParams.hh
index eb85f2c3d0..d3f7ce285a 100644
--- a/source/g3tog4/include/G3CalcParams.hh
+++ b/source/g3tog4/include/G3CalcParams.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3CalcParams.hh,v 1.2 1999/12/05 17:50:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3CalcParams.hh,v 1.3 1999/12/09 01:27:41 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G3CalcParams
 //
@@ -17,7 +17,7 @@
 // 03.09.96 T. Wenaus  Initial version
 
 #ifndef G3CALCPARAMS_HH
-#define G3CALCPARAMS_HH
+#define G3CALCPARAMS_HH 1
 
 #include <math.h>
 #include "globals.hh"
diff --git a/source/g3tog4/include/G3DetTable.hh b/source/g3tog4/include/G3DetTable.hh
index eccfe12191..17a30caf5e 100644
--- a/source/g3tog4/include/G3DetTable.hh
+++ b/source/g3tog4/include/G3DetTable.hh
@@ -1,5 +1,3 @@
-#ifndef G3DETTABLE
-#define G3DETTABLE 1
 // This code implementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -7,18 +5,21 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3DetTable.hh,v 1.4 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3DetTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G3DetTable class
 
+#ifndef G3DETTABLE_HH
+#define G3DETTABLE_HH 1
+
 #include "g4std/map"
 #include "globals.hh"
 #include "G3DetTableEntry.hh"
 
 class G3DetTable {
 private:
-  G4std::map<G4String, G3DetTableEntry*, less<G4String> > DTD;
+  G4std::map<G4String, G3DetTableEntry*, G4std::less<G4String> > DTD;
   G4String MakeHash(G4String& set, G4String& det);
 
 public:
diff --git a/source/g3tog4/include/G3DetTableEntry.hh b/source/g3tog4/include/G3DetTableEntry.hh
index b67590c6ac..c93615ba99 100644
--- a/source/g3tog4/include/G3DetTableEntry.hh
+++ b/source/g3tog4/include/G3DetTableEntry.hh
@@ -1,5 +1,3 @@
-#ifndef DETTABLEENTRY
-#define DETTABLEENTRY 1
 // This code implementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -7,11 +5,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3DetTableEntry.hh,v 1.2 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3DetTableEntry.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G3DetTableEntry class
 
+#ifndef DETTABLEENTRY_HH
+#define DETTABLEENTRY_HH 1
+
 #include "g4std/map"
 #include "globals.hh"
 #include "G4VSensitiveDetector.hh"
diff --git a/source/g3tog4/include/G3Division.hh b/source/g3tog4/include/G3Division.hh
index c1e3ebdafc..4aa1d2a838 100644
--- a/source/g3tog4/include/G3Division.hh
+++ b/source/g3tog4/include/G3Division.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3Division.hh,v 1.2 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3Division.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 27 Sep 99
 
-#ifndef G3_DIVISION_H
-#define G3_DIVISION_H
+#ifndef G3DIVISION_HH
+#define G3DIVISION_HH 1
 
 #include "globals.hh"
 #include "geomdefs.hh"
diff --git a/source/g3tog4/include/G3EleTable.hh b/source/g3tog4/include/G3EleTable.hh
index d3ebf1b8a3..6280a3eedf 100644
--- a/source/g3tog4/include/G3EleTable.hh
+++ b/source/g3tog4/include/G3EleTable.hh
@@ -1,5 +1,3 @@
-#ifndef _G4ELETABLE_
-#define _G4ELETABLE_ 1
 // This code implementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -7,9 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3EleTable.hh,v 1.3 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3EleTable.hh,v 1.4 1999/12/09 01:27:42 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
+
+#ifndef G4ELETABLE_HH
+#define G4ELETABLE_HH 1
+
 #include "g4rw/ctoken.h"
 #include "g4rw/tpordvec.h"
 #include "globals.hh"
diff --git a/source/g3tog4/include/G3G4Interface.hh b/source/g3tog4/include/G3G4Interface.hh
index 1c685a87c8..f6c6cc9560 100644
--- a/source/g3tog4/include/G3G4Interface.hh
+++ b/source/g3tog4/include/G3G4Interface.hh
@@ -5,13 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3G4Interface.hh,v 1.5 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
-//
+// $Id: G3G4Interface.hh,v 1.7 1999/12/09 01:27:42 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //   Interfaces for G3 equivalent routines
 //
 
+#ifndef G3G4INTERFACE_HH
+#define G3G4INTERFACE_HH 1
+
 #include "globals.hh"
 
 class G4LogicalVolume;
@@ -85,6 +87,11 @@ void G4gsdetu(G4String chset, G4String chdet, G4int nupar, G4double* upar);
 void G4ggclos();
 
 G4LogicalVolume* G4BuildGeom(G4String& inFile);
+#endif
+
+
+
+
 
 
 
diff --git a/source/g3tog4/include/G3MatTable.hh b/source/g3tog4/include/G3MatTable.hh
index b7251d3e84..a4e18a7185 100644
--- a/source/g3tog4/include/G3MatTable.hh
+++ b/source/g3tog4/include/G3MatTable.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3MatTable.hh,v 1.7 1999/12/05 17:50:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3MatTable.hh,v 1.8 1999/12/09 01:27:42 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_MAT_TABLE_H
-#define G3_MAT_TABLE_H
+#ifndef G3MATTABLE_HH
+#define G3MATTABLE_HH 1
 
 #include "G3MatTableEntry.hh"
 
@@ -41,4 +41,4 @@ class G3MatTable
 
 extern G3MatTable G3Mat;
 
-#endif //G3_MAT_TABLE_H
+#endif
diff --git a/source/g3tog4/include/G3MatTableEntry.hh b/source/g3tog4/include/G3MatTableEntry.hh
index f836d48a54..bd4049572f 100644
--- a/source/g3tog4/include/G3MatTableEntry.hh
+++ b/source/g3tog4/include/G3MatTableEntry.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3MatTableEntry.hh,v 1.2 1999/12/05 17:50:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3MatTableEntry.hh,v 1.3 1999/12/09 01:27:43 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_MAT_TABLE_ENTRY_H
-#define G3_MAT_TABLE_ENTRY_H
+#ifndef G3MATTABLEENTRY_HH
+#define G3MATTABLEENTRY_HH 1
 
 #include "globals.hh"
 
@@ -47,4 +47,4 @@ inline G4int G3MatTableEntry::GetID() const
 inline G4Material* G3MatTableEntry::GetMaterial() const
 { return fMaterial; }
 
-#endif //G3_MAT_TABLE_ENTRY_H
+#endif
diff --git a/source/g3tog4/include/G3MedTable.hh b/source/g3tog4/include/G3MedTable.hh
index 108d3472f9..c2f44c9b7a 100644
--- a/source/g3tog4/include/G3MedTable.hh
+++ b/source/g3tog4/include/G3MedTable.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3MedTable.hh,v 1.6 1999/12/05 17:50:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3MedTable.hh,v 1.7 1999/12/09 01:27:43 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_MED_TABLE_H
-#define G3_MED_TABLE_H
+#ifndef G3MEDTABLE_HH
+#define G3MEDTABLE_HH 1
 
 #include "G3MedTableEntry.hh"
 
@@ -42,5 +42,4 @@ class G3MedTable
 };
 
 extern G3MedTable G3Med;
-
-#endif //G3_MED_TABLE_H
+#endif
diff --git a/source/g3tog4/include/G3MedTableEntry.hh b/source/g3tog4/include/G3MedTableEntry.hh
index 00bc3e23f2..422ba56d3b 100644
--- a/source/g3tog4/include/G3MedTableEntry.hh
+++ b/source/g3tog4/include/G3MedTableEntry.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3MedTableEntry.hh,v 1.2 1999/12/05 17:50:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3MedTableEntry.hh,v 1.3 1999/12/09 01:27:43 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_MED_TABLE_ENTRY_H
-#define G3_MED_TABLE_ENTRY_H
+#ifndef G3MEDTABLEENTRYH_HH
+#define G3MEDTABLEENTRYH_HH 1
 
 #include "globals.hh"
 
@@ -85,4 +85,4 @@ inline G4UserLimits* G3MedTableEntry::GetLimits() const
 inline G4int G3MedTableEntry::GetISVOL() const
 { return fISVOL; }
 
-#endif //G3_MAT_TABLE_ENTRY_H
+#endif
diff --git a/source/g3tog4/include/G3PartTable.hh b/source/g3tog4/include/G3PartTable.hh
index 7f0aa408a9..34a66297f4 100644
--- a/source/g3tog4/include/G3PartTable.hh
+++ b/source/g3tog4/include/G3PartTable.hh
@@ -5,20 +5,22 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3PartTable.hh,v 1.4 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3PartTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G3 materials table.
 // Maps G3 material indices to their G4 material object counterparts.
 // Maintains a linked List of G3 material index/G4 material pointer pairs.
 
+#ifndef G3PARTTABLE_HH
+#define G3PARTTABLE_HH 1
 #include "g4std/map"
 #include "G4ParticleDefinition.hh"
 
 class G3PartTable {
 private:
-  G4std::map<G4String, G4ParticleDefinition*, less<G4String> > PTD;
+  G4std::map<G4String, G4ParticleDefinition*, G4std::less<G4String> > PTD;
   void HashID(G4int partid, G4String* _HID);
   void HashID(G4int partid, G4String& _HID);
 public:
@@ -28,5 +30,5 @@ public:
   void Put(G4int partid, G4ParticleDefinition* partpt);
   void PrintAll();
 };
-
 extern G3PartTable G3Part;
+#endif
diff --git a/source/g3tog4/include/G3Pos.hh b/source/g3tog4/include/G3Pos.hh
index d772c5442f..d215c8fc66 100644
--- a/source/g3tog4/include/G3Pos.hh
+++ b/source/g3tog4/include/G3Pos.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3Pos.hh,v 1.6 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3Pos.hh,v 1.8 2000/03/02 17:54:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
-#ifndef _G3POS_
-#define _G3POS_ 1
+#ifndef G3POS_HH
+#define G3POS_HH 1
 
 #include "G4ThreeVector.hh"
 
@@ -38,6 +38,8 @@ public:
   G4ThreeVector* GetPos();
 
   G4int GetCopy();
+
+  G4String& GetOnly();
 };
 #endif
 
diff --git a/source/g3tog4/include/G3RotTable.hh b/source/g3tog4/include/G3RotTable.hh
index e0b53789fd..bf0eb8104f 100644
--- a/source/g3tog4/include/G3RotTable.hh
+++ b/source/g3tog4/include/G3RotTable.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3RotTable.hh,v 1.9 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3RotTable.hh,v 1.10 1999/12/09 01:27:46 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_ROT_TABLE_H
-#define G3_ROT_TABLE_H
+#ifndef G3ROTTABLEH_HH
+#define G3ROTTABLEH_HH 1
 
 #include "G3RotTableEntry.hh"
 
@@ -43,4 +43,4 @@ class G3RotTable
 
 extern G3RotTable G3Rot;
 
-#endif //G3_ROT_TABLE_H
+#endif
diff --git a/source/g3tog4/include/G3RotTableEntry.hh b/source/g3tog4/include/G3RotTableEntry.hh
index c752409c2b..d054c7ca28 100644
--- a/source/g3tog4/include/G3RotTableEntry.hh
+++ b/source/g3tog4/include/G3RotTableEntry.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3RotTableEntry.hh,v 1.2 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3RotTableEntry.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
-#ifndef G3_ROT_TABLE_ENTRY_H
-#define G3_ROT_TABLE_ENTRY_H
+#ifndef G3ROTTABLEENTRY_HH
+#define G3ROTTABLEENTRY_HH 1
 
 #include "globals.hh"
 #include "G4RotationMatrix.hh"
@@ -48,4 +48,4 @@ inline G4int G3RotTableEntry::GetID() const
 inline G4RotationMatrix* G3RotTableEntry::GetMatrix() const
 { return fMatrix; }
 
-#endif //G3_ROT_TABLE_ENTRY_H
+#endif
diff --git a/source/g3tog4/include/G3SensVolVector.hh b/source/g3tog4/include/G3SensVolVector.hh
index f4b6588aac..242c2bc6ac 100644
--- a/source/g3tog4/include/G3SensVolVector.hh
+++ b/source/g3tog4/include/G3SensVolVector.hh
@@ -5,17 +5,21 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3SensVolVector.hh,v 1.2 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3SensVolVector.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // vector of logical volumes that were defined with
 // tracking medium with ISVOL=1
 //
 // by I.Hrivnacova, 27 Sep 99
 
+#ifndef G3SENSVOLVECTOR_HH
+#define G3SENSVOLVECTOR_HH 1
+
 #include "g4rw/tpordvec.h"
 #include "G4LogicalVolume.hh"
 
 typedef G4RWTPtrOrderedVector<G4LogicalVolume> G3SensVolVector;
 
 extern G3SensVolVector G3SensVol;
+#endif
diff --git a/source/g3tog4/include/G3VolTable.hh b/source/g3tog4/include/G3VolTable.hh
index ae8bf929a9..aa480c858c 100644
--- a/source/g3tog4/include/G3VolTable.hh
+++ b/source/g3tog4/include/G3VolTable.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3VolTable.hh,v 1.11 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3VolTable.hh,v 1.14 2000/03/02 17:54:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
-#ifndef _G3VOLTABLE_
-#define _G3VOLTABLE_ 1
+#ifndef G3VOLTABLE_HH
+#define G3VOLTABLE_HH 1
 
 #include "g4std/map"
 #include "G3VolTableEntry.hh"
@@ -24,7 +24,7 @@ class G3VolTable{
 private:
   G3VolTableEntry* G3toG4TopVTE;
   G4String _FirstKey;
-  G4std::map<G4String, G3VolTableEntry*, less<G4String> > VTD;
+  G4std::map<G4String, G3VolTableEntry*, G4std::less<G4String> > VTD;
   G4int _NG3Pos;
 
 public:
@@ -38,18 +38,7 @@ public:
   void SetFirstVTE();
   void VTEStat();
   void CountG3Pos();
+  void Clear();
 };
 extern G3VolTable G3Vol;
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/g3tog4/include/G3VolTableEntry.hh b/source/g3tog4/include/G3VolTableEntry.hh
index 49395cc498..617b32a25a 100644
--- a/source/g3tog4/include/G3VolTableEntry.hh
+++ b/source/g3tog4/include/G3VolTableEntry.hh
@@ -5,18 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3VolTableEntry.hh,v 1.2 1999/12/05 17:50:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3VolTableEntry.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
-#ifndef G3_VOL_TABLE_ENTRY_H
-#define G3_VOL_TABLE_ENTRY_H
+#ifndef G3VOLTABLEENTRY_HH
+#define G3VOLTABLEENTRY_HH 1
 
 #include "globals.hh"
 #include "G3Pos.hh"
 #include "G3Division.hh"
-
 #include "g4rw/tpordvec.h"
 
 class G4LogicalVolume;
@@ -100,4 +99,15 @@ inline void G3VolTableEntry::SetDivision(G3Division* division)
 inline G3Division* G3VolTableEntry::GetDivision()
 { return fDivision; }
 
-#endif //G3_VOL_TABLE_ENTRY_H
+#endif
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/g3tog4/include/G3toG4.hh b/source/g3tog4/include/G3toG4.hh
index 42a21cee4d..f0db11e18e 100644
--- a/source/g3tog4/include/G3toG4.hh
+++ b/source/g3tog4/include/G3toG4.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4.hh,v 1.4 1999/12/05 17:50:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4.hh,v 1.6 2000/03/07 10:51:40 stesting Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 27 Sep 99
 
-#ifndef _G3TOG4_
-#define _G3TOG4_
+#ifndef G3TOG4_HH
+#define G3TOG4_HH 1
 
 #include "globals.hh"
 
@@ -23,7 +23,7 @@ extern G4String Spar[1000];
 
 //extern G4double min(G4double, G4double);
 
-void G3fillParams(G4String *tokens, char *ptypes);
+void G3fillParams(G4String *tokens, const char *ptypes);
 // G4bool G3NegVolPars(G4double pars[], G4int* np, G4String vol, G4String moth,
 //               char* routine);
 
@@ -56,5 +56,4 @@ void G3fillParams(G4String *tokens, char *ptypes);
 #define PTgsdeth "ssiSIRR"
 #define PTgsdetd "ssiSI"
 #define PTgsdetu "ssiR"
-
 #endif
diff --git a/source/g3tog4/include/G3toG4.inc b/source/g3tog4/include/G3toG4.inc
index 5e627b26ac..edea864be5 100644
--- a/source/g3tog4/include/G3toG4.inc
+++ b/source/g3tog4/include/G3toG4.inc
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: G3toG4.inc,v 1.2 1999/12/05 17:50:04 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
       integer maxlines
       parameter (maxlines = 750) ! max no. of cmd lines per C++ source file
diff --git a/source/g3tog4/include/G3toG4BuildTree.hh b/source/g3tog4/include/G3toG4BuildTree.hh
index 30dd5227c0..e5c43f3b54 100644
--- a/source/g3tog4/include/G3toG4BuildTree.hh
+++ b/source/g3tog4/include/G3toG4BuildTree.hh
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4BuildTree.hh,v 1.3 1999/12/05 17:50:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4BuildTree.hh,v 1.4 1999/12/09 01:27:47 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
-#ifndef _G3TOG4BUILDTREE_
-#define _G3TOG4BUILDTREE_ 1
+#ifndef G3TOG4BUILDTREE_HH
+#define G3TOG4BUILDTREE_HH 1
 
 #include "G3VolTableEntry.hh"
 
diff --git a/source/g3tog4/include/G3toG4Debug.hh b/source/g3tog4/include/G3toG4Debug.hh
new file mode 100644
index 0000000000..411a874ee8
--- /dev/null
+++ b/source/g3tog4/include/G3toG4Debug.hh
@@ -0,0 +1,5 @@
+#ifndef G3TOG4DEBUG_HH
+#define G3TOG4DEBUG_HH 1
+#include "globals.hh"
+G4int G3toG4Debug();
+#endif
diff --git a/source/g3tog4/include/G3toG4MakeSolid.hh b/source/g3tog4/include/G3toG4MakeSolid.hh
index 77b1410306..afbce3378b 100644
--- a/source/g3tog4/include/G3toG4MakeSolid.hh
+++ b/source/g3tog4/include/G3toG4MakeSolid.hh
@@ -5,11 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4MakeSolid.hh,v 1.3 1999/12/05 17:50:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4MakeSolid.hh,v 1.4 1999/12/09 01:27:47 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
-#ifndef _G3TOG4MAKESOLID_
-#define _G3TOG4MAKESOLID_ 1
+#ifndef G3TOG4MAKESOLID_HH
+#define G3TOG4MAKESOLID_HH 1
+
 G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape, 
 			  const G4double* Rpar, const G4int npar, 
 			  G4bool& NegVolPars, G4bool& Deferred, 
diff --git a/source/g3tog4/include/G3toG4RotationMatrix.hh b/source/g3tog4/include/G3toG4RotationMatrix.hh
index 8a7f199560..dfb07d5c7f 100644
--- a/source/g3tog4/include/G3toG4RotationMatrix.hh
+++ b/source/g3tog4/include/G3toG4RotationMatrix.hh
@@ -5,11 +5,11 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4RotationMatrix.hh,v 1.2 1999/12/05 17:50:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4RotationMatrix.hh,v 1.3 1999/12/09 01:27:47 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
-#ifndef _G3toG4ROTATION_
-#define _G3toG4ROTATION_
+#ifndef G3TOG4ROTATION_HH
+#define G3TOG4ROTATION_HH 1
 
 #include "G4RotationMatrix.hh"
 #include "globals.hh"
@@ -29,5 +29,4 @@ public:
     
     ~G3toG4RotationMatrix();
 };
-
 #endif    
diff --git a/source/g3tog4/include/gcbank.inc b/source/g3tog4/include/gcbank.inc
index 27c4e38e75..628220c640 100644
--- a/source/g3tog4/include/gcbank.inc
+++ b/source/g3tog4/include/gcbank.inc
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: gcbank.inc,v 1.2 1999/12/05 17:50:05 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
       INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG
       INTEGER KWBANK,KWWORK,IWS
diff --git a/source/g3tog4/src/G3CalcParams.cc b/source/g3tog4/src/G3CalcParams.cc
index d65fdbabe4..55a150f00c 100644
--- a/source/g3tog4/src/G3CalcParams.cc
+++ b/source/g3tog4/src/G3CalcParams.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3CalcParams.cc,v 1.2 1999/12/05 17:50:08 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-01-00 $ 
+// $Id: G3CalcParams.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $ 
+// GEANT4 tag $Name: geant4-01-01 $ 
 //
 // Change: G3CalcParamsFn returns true only in case
 // the parameters *after* processing this method
@@ -114,7 +114,7 @@ G4bool G3CalcParamsFn(G4double *Rpar, G4int npar, G4double *Rparm,
 	if (Rpar[2] < 0) NegPresent = TRUE;
       }
       if (Rpar[0] < 0) {
-        if (Rparm != 0) Rpar[0] = min(Rparm[0],Rparm[1]) +
+        if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
                                   abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[3];
 	if (Rpar[0] < 0) NegPresent = TRUE;
       }
@@ -125,12 +125,12 @@ G4bool G3CalcParamsFn(G4double *Rpar, G4int npar, G4double *Rparm,
         if (Rpar[2]<0) NegPresent = TRUE;
       }
       if (Rpar[0] < 0) {
-        if (Rparm != 0) Rpar[0] = min(Rparm[0],Rparm[1]) +
+        if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
                                   abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[4];
         if (Rpar[0]<0) NegPresent = TRUE;
       }
       if (Rpar[1] < 0) {
-        if (Rparm != 0) Rpar[1] = min(Rparm[2],Rparm[3]) +
+        if (Rparm != 0) Rpar[1] = G4std::min(Rparm[2],Rparm[3]) +
                                   abs(Rparm[2]-Rparm[3])*.5*Rpar[2]/Rparm[4];
         if (Rpar[1]<0) NegPresent = TRUE;
       }
@@ -142,16 +142,16 @@ G4bool G3CalcParamsFn(G4double *Rpar, G4int npar, G4double *Rparm,
       }
       if (Rpar[0] < 0) {
         if (Rparm != 0) {
-          G4double xlo = min(Rparm[4],Rparm[8]) +
+          G4double xlo = G4std::min(Rparm[4],Rparm[8]) +
             abs(Rparm[4]-Rparm[8])*.5*Rpar[2]/Rparm[0];
-          G4double xhi = min(Rparm[5],Rparm[9]) +
+          G4double xhi = G4std::min(Rparm[5],Rparm[9]) +
             abs(Rparm[5]-Rparm[9])*.5*Rpar[2]/Rparm[0];
-          Rpar[0] = min(xlo,xhi);
+          Rpar[0] = G4std::min(xlo,xhi);
         }
         if (Rpar[0] < 0) NegPresent = TRUE;
       }
       if (Rpar[1] < 0) {
-        if (Rparm != 0) Rpar[1] = min(Rparm[3],Rparm[7]) +
+        if (Rparm != 0) Rpar[1] = G4std::min(Rparm[3],Rparm[7]) +
                         abs(Rparm[3]-Rparm[7])*.5*Rpar[2]/Rparm[0];
         if (Rpar[1] < 0) NegPresent = TRUE;
       }
diff --git a/source/g3tog4/src/G3DetTable.cc b/source/g3tog4/src/G3DetTable.cc
index 0bfedde094..caa3397a6e 100644
--- a/source/g3tog4/src/G3DetTable.cc
+++ b/source/g3tog4/src/G3DetTable.cc
@@ -5,13 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3DetTable.cc,v 1.7 1999/12/05 17:50:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3DetTable.cc,v 1.9 2000/03/02 17:54:05 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "globals.hh"
 #include "G3DetTable.hh"
 
-typedef G4std::map<G4String, G3DetTableEntry*, less<G4String> >
+typedef G4std::map<G4String, G3DetTableEntry*, G4std::less<G4String> >
 ::iterator DTDiterator;
 
 G4String 
@@ -24,13 +24,13 @@ G3DetTable::G3DetTable(){
 
 G3DetTable::~G3DetTable(){
   if (DTD.size() > 0) {
-    //    G4cout << "Deleting DTD" << endl;
+    //    G4cout << "Deleting DTD" << G4endl;
     for (DTDiterator i=DTD.begin(); i != DTD.end(); i++) {
       delete (*i).second;
     }
     DTD.clear();
   }
-};
+}
 
 G4VSensitiveDetector* 
 G3DetTable::GetSD(G4String& set, G4String& det){
@@ -70,7 +70,7 @@ G3DetTable::Put(G4String& set, G4String& det, G4int id,
   // make hash ID
   G4String ShashID = MakeHash(set, det);
   G3DetTableEntry* DTE = new G3DetTableEntry(set, det, id, D);
-  G4cout << "Inserted DTE with id " << ShashID << endl;
+  G4cout << "Inserted DTE with id " << ShashID << G4endl;
   DTD[ShashID] = DTE;
 }
 
@@ -78,12 +78,12 @@ void
 G3DetTable::PrintAll(){
   if (DTD.size()>0){
     G4int count=0;
-    G4cout << "Dump of DTD - " << DTD.size() << " entries:" << endl;
+    G4cout << "Dump of DTD - " << DTD.size() << " entries:" << G4endl;
     for (DTDiterator i=DTD.begin(); i != DTD.end(); i++) {
       count++;
       G3DetTableEntry* DTE = (*i).second;
-      G4cout << "DTD entry " << setw(3) << count << " sensitive detector name: " 
-	     << DTE->GetSD()->GetName() << endl;
+      G4cout << "DTD entry " << G4std::setw(3) << count << " sensitive detector name: " 
+	     << DTE->GetSD()->GetName() << G4endl;
     }
   }
 }
diff --git a/source/g3tog4/src/G3DetTableEntry.cc b/source/g3tog4/src/G3DetTableEntry.cc
index 3d75ed3234..5b0a80aca9 100644
--- a/source/g3tog4/src/G3DetTableEntry.cc
+++ b/source/g3tog4/src/G3DetTableEntry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3DetTableEntry.cc,v 1.2 1999/12/05 17:50:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3DetTableEntry.cc,v 1.3 2000/03/02 17:54:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "globals.hh"
 #include "G3DetTableEntry.hh"
@@ -18,7 +18,7 @@ G3DetTableEntry::G3DetTableEntry(G4String& set, G4String& det, G4int id,
   _det = det;
   _id  = id;
   _detpt = D;
-};
+}
 
 G3DetTableEntry::~G3DetTableEntry(){;}
 
diff --git a/source/g3tog4/src/G3Division.cc b/source/g3tog4/src/G3Division.cc
index bc532063ed..e6d6981f57 100644
--- a/source/g3tog4/src/G3Division.cc
+++ b/source/g3tog4/src/G3Division.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3Division.cc,v 1.2 1999/12/05 17:50:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3Division.cc,v 1.6 2000/03/02 17:54:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi 13.10.99
 
@@ -14,7 +14,7 @@
 #include "G3VolTableEntry.hh"
 #include "G3toG4MakeSolid.hh"
 #include "G3Pos.hh"
-
+#include "G3toG4Debug.hh"
 #include "G4LogicalVolume.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4PVPlacement.hh"
@@ -109,7 +109,13 @@ G4VPhysicalVolume* G3Division::CreatePVReplica()
   
   G4PVReplica* pvol 
     = new G4PVReplica(name, lv, mlv, fAxis, fNofDivisions, fWidth, fOffset);
-
+  if (G3toG4Debug() != 0) {
+    G4cout << "Create G4PVReplica name " << name << " logical volume name " 
+	   << lv->GetName() << " mother logical volme name "
+	   << mlv->GetName() << " axis " << fAxis << " ndivisions " 
+	   << fNofDivisions << " width " << fWidth << " Offset "
+	   << fOffset << G4endl;
+  }
   return pvol;
 }
 
@@ -141,7 +147,7 @@ void G3Division::SetRangeAndAxis()
     }
     else if ( shape == "TRD1" ) {
       if (fIAxis == 1){
-        fHighRange = max(Rpar[0]*cm, Rpar[1]*cm);
+        fHighRange = G4std::max(Rpar[0]*cm, Rpar[1]*cm);
       }
       else if( fIAxis == 2) {
        fHighRange = Rpar[2]*cm;
@@ -153,10 +159,10 @@ void G3Division::SetRangeAndAxis()
     }
     else if ( shape == "TRD2" ) {
       if (fIAxis == 1){
-        fHighRange = max(Rpar[0]*cm, Rpar[1]*cm);
+        fHighRange = G4std::max(Rpar[0]*cm, Rpar[1]*cm);
       }
       else if( fIAxis == 2) {
-        fHighRange = max(Rpar[2]*cm, Rpar[3]*cm);
+        fHighRange = G4std::max(Rpar[2]*cm, Rpar[3]*cm);
       }
       else if( fIAxis == 3) {
        fHighRange = Rpar[4]*cm;
@@ -204,8 +210,8 @@ void G3Division::SetRangeAndAxis()
     }
     else if ( shape == "CONE" ) {
       if (fIAxis == 1){
-        fHighRange = max(Rpar[2]*cm,Rpar[4]*cm);
-        fLowRange = max(Rpar[1]*cm,Rpar[3]*cm);
+        fHighRange = G4std::max(Rpar[2]*cm,Rpar[4]*cm);
+        fLowRange = G4std::max(Rpar[1]*cm,Rpar[3]*cm);
         fAxis = kRho;
       }
       else if( fIAxis == 2) {
@@ -221,8 +227,8 @@ void G3Division::SetRangeAndAxis()
     }
     else if ( shape == "CONS" ) {
       if (fIAxis == 1){
-        fHighRange = max(Rpar[2]*cm,Rpar[4]*cm);
-        fLowRange = max(Rpar[1]*cm,Rpar[3]*cm);
+        fHighRange = G4std::max(Rpar[2]*cm,Rpar[4]*cm);
+        fLowRange = G4std::max(Rpar[1]*cm,Rpar[3]*cm);
         fAxis = kRho;
       }
       else if( fIAxis == 2) {
@@ -245,13 +251,13 @@ void G3Division::SetRangeAndAxis()
         fAxis = kRho;
       }
       else if( fIAxis == 2) {
-       fLowRange = min(Rpar[2]*deg,Rpar[3]*deg);
-       fHighRange = max(Rpar[2]*deg,Rpar[3]*deg);
+       fLowRange = G4std::min(Rpar[2]*deg,Rpar[3]*deg);
+       fHighRange = G4std::max(Rpar[2]*deg,Rpar[3]*deg);
        fAxis = kPhi;
       }
       else if( fIAxis == 3) {
-       fLowRange = min(Rpar[4]*deg,Rpar[5]*deg);
-       fHighRange = max(Rpar[4]*deg,Rpar[5]*deg);
+       fLowRange = G4std::min(Rpar[4]*deg,Rpar[5]*deg);
+       fHighRange = G4std::max(Rpar[4]*deg,Rpar[5]*deg);
        fAxis = kPhi; // ?????? 
       }
     }
@@ -285,10 +291,10 @@ void G3Division::SetRangeAndAxis()
             DzArray[i] = Rpar[i4]*cm;
             Rmin[i] = Rpar[i5]*cm;
             Rmax[i] = Rpar[i6]*cm;
-            rangelo[0] = min(rangelo[0], Rmin[i]);
-            rangehi[0] = max(rangehi[0], Rmax[i]);
-            rangelo[2] = min(rangelo[2], DzArray[i]);
-            rangehi[2] = max(rangehi[2], DzArray[i]);
+            rangelo[0] = G4std::min(rangelo[0], Rmin[i]);
+            rangehi[0] = G4std::max(rangehi[0], Rmax[i]);
+            rangelo[2] = G4std::min(rangelo[2], DzArray[i]);
+            rangehi[2] = G4std::max(rangehi[2], DzArray[i]);
         }
         for (i=0;i<nz;i++){
             assert(Rmin[i]>=0 && Rmax[i]>=Rmin[i]);
@@ -331,10 +337,10 @@ void G3Division::SetRangeAndAxis()
             DzArray[i] = Rpar[i4]*cm;
             Rmin[i] = Rpar[i5]*cm;
             Rmax[i] = Rpar[i6]*cm;
-            rangelo[0] = min(rangelo[0], Rmin[i]);
-            rangehi[0] = max(rangehi[0], Rmax[i]);
-            rangelo[2] = min(rangelo[2], DzArray[i]);
-            rangehi[2] = max(rangehi[2], DzArray[i]);
+            rangelo[0] = G4std::min(rangelo[0], Rmin[i]);
+            rangehi[0] = G4std::max(rangehi[0], Rmax[i]);
+            rangelo[2] = G4std::min(rangelo[2], DzArray[i]);
+            rangehi[2] = G4std::max(rangehi[2], DzArray[i]);
         }
         for (i=0;i<nz;i++){
             assert(Rmin[i]>=0 && Rmax[i]>=Rmin[i]);
@@ -361,8 +367,10 @@ void G3Division::SetRangeAndAxis()
     }  
 
     // verbose
-    //G4cout << "SetRangeAndAxis: " 
-    //       << fLowRange << " " << fHighRange << " " << fAxis << endl;
+    if (G3toG4Debug() != 0) {
+      G4cout << "Shape " << shape << " SetRangeAndAxis: " 
+	     << fLowRange << " " << fHighRange << " " << fAxis << G4endl;
+    }
 }
 
 G3VolTableEntry* G3Division::CreateEnvelope(G4String shape, G4double hi, 
@@ -374,7 +382,7 @@ G3VolTableEntry* G3Division::CreateEnvelope(G4String shape, G4double hi,
     // G4cout << "  G3Division::CreateEnvelope " << "fIAaxis= " << fIAxis
     //        << " hi= " << hi
     //        << " lo= " << lo
-    //        << endl;
+    //        << G4endl;
 
     G4double *Rpar = new G4double[npar+2];
     for (G4int i=0; i<npar; ++i){ Rpar[i] = par[i];}
@@ -551,10 +559,10 @@ void G3Division::CreateSolid(G4String shape, G4double par[], G4int npar)
 
     // verbose
     // G4cout << "G3Division::CreateSolid volume before: " 
-    //        << fVTE->GetName() << " " << shape << endl;    
+    //        << fVTE->GetName() << " " << shape << G4endl;    
     // G4cout << " npar,Rpar: " << npar;
     // for (G4int ii = 0; ii < npar; ++ii) G4cout << " " << Rpar[ii];
-    // G4cout << endl;
+    // G4cout << G4endl;
   
     if ( shape == "BOX" ) {
       if      ( fIAxis == 1 ) Rpar[0] = fWidth/2./cm;
@@ -603,6 +611,7 @@ void G3Division::CreateSolid(G4String shape, G4double par[], G4int npar)
     else if ( shape == "TUBS" ) {
       if ( fIAxis == 1 ) {
         Rpar[1] = Rpar[0] + fWidth/cm;
+        fOffset = Rpar[0]*cm;
       }
       else if ( fIAxis == 2 ) {
          fOffset = Rpar[3]*deg; 
@@ -686,10 +695,10 @@ void G3Division::CreateSolid(G4String shape, G4double par[], G4int npar)
 
     // verbose
     // G4cout << "G3Division::CreateSolid volume after: " 
-    //        << fVTE->GetName() << " " << shape << endl;    
+    //        << fVTE->GetName() << " " << shape << G4endl;    
     // G4cout << " npar,Rpar: " << npar;
     // for (G4int iii = 0; iii < npar; ++iii) G4cout << " " << Rpar[iii];
-    // G4cout << endl;
+    // G4cout << G4endl;
 }
 
 
diff --git a/source/g3tog4/src/G3EleTable.cc b/source/g3tog4/src/G3EleTable.cc
index bc4138c701..e32920ebf7 100644
--- a/source/g3tog4/src/G3EleTable.cc
+++ b/source/g3tog4/src/G3EleTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3EleTable.cc,v 1.6 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3EleTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4strstreambuf.hh"
@@ -23,13 +23,13 @@ G3EleTable::G3EleTable() :_MaxEle(109){
 G3EleTable::~G3EleTable(){
   delete [] _EleNames;
   delete [] _Ele;
-};
+}
 
 G4Element* 
 G3EleTable::GetEle(G4double Z){
   G4double A;
   char name[20], sym[3];
-  G4int index = Z-1;
+  G4int index = (G4int) Z-1;
   if (!parse(Z, name, sym, A)) {
     G4String nm(name);
     G4String sy(sym);
@@ -45,14 +45,14 @@ int
 G3EleTable::parse(G4double& Z, char* name, char* sym, G4double& A){ 
  int rc = 0;
   if (Z>0 && Z <=_MaxEle){
-    G4int z = Z-1;
-    istrstream in(_EleNames[z]);
+    G4int z = (G4int) Z-1;
+    G4std::istrstream in(_EleNames[z]);
     in >> name >> sym >> A;
   } else {
     rc = -1;
   }
   return rc;
-};
+}
 
 void
 G3EleTable::LoadUp(){
diff --git a/source/g3tog4/src/G3MatTable.cc b/source/g3tog4/src/G3MatTable.cc
index a1f08bf197..134c14d56f 100644
--- a/source/g3tog4/src/G3MatTable.cc
+++ b/source/g3tog4/src/G3MatTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MatTable.cc,v 1.12 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MatTableEntry.cc b/source/g3tog4/src/G3MatTableEntry.cc
index ca3c778e56..c328273997 100644
--- a/source/g3tog4/src/G3MatTableEntry.cc
+++ b/source/g3tog4/src/G3MatTableEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MatTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MedTable.cc b/source/g3tog4/src/G3MedTable.cc
index ceb43e0468..b95919e7a9 100644
--- a/source/g3tog4/src/G3MedTable.cc
+++ b/source/g3tog4/src/G3MedTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MedTable.cc,v 1.10 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MedTableEntry.cc b/source/g3tog4/src/G3MedTableEntry.cc
index dcbed16466..a1fc05a07d 100644
--- a/source/g3tog4/src/G3MedTableEntry.cc
+++ b/source/g3tog4/src/G3MedTableEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MedTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3NegVolPars.cc b/source/g3tog4/src/G3NegVolPars.cc
index fc024b31a0..2c9fbc3c07 100644
--- a/source/g3tog4/src/G3NegVolPars.cc
+++ b/source/g3tog4/src/G3NegVolPars.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3NegVolPars.cc,v 1.5 1999/12/05 17:50:09 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3NegVolPars.cc,v 1.6 2000/03/07 10:51:40 stesting Exp $ 
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
@@ -20,7 +20,7 @@ G4bool G3CalcParamsFn(G4double* Rpar, G4int npar, G4double* Rparm,
                                   G4String shape, G4String shapem);
 
 G4bool G3NegVolPars(G4double pars[], G4int *nparpt, 
-          G3VolTableEntry* vte, G3VolTableEntry* mvte,  char routine[])
+          G3VolTableEntry* vte, G3VolTableEntry* mvte,  const char routine[])
 {
   G4bool NegPresent = FALSE;
 
diff --git a/source/g3tog4/src/G3PartTable.cc b/source/g3tog4/src/G3PartTable.cc
index ee55d304a9..68c288d065 100644
--- a/source/g3tog4/src/G3PartTable.cc
+++ b/source/g3tog4/src/G3PartTable.cc
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3PartTable.cc,v 1.7 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3PartTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "g4std/strstream"
 #include "g4std/iomanip"
 #include "G3PartTable.hh"
 
-typedef G4std::map<G4String, G4ParticleDefinition*, less<G4String> >
+typedef G4std::map<G4String, G4ParticleDefinition*, G4std::less<G4String> >
 ::iterator PTDiterator;
 
 G3PartTable::G3PartTable(){
@@ -21,7 +21,7 @@ G3PartTable::G3PartTable(){
 
 G3PartTable::~G3PartTable(){
   if (PTD.size()>0){
-    //    G4cout << "Deleting PTD" << endl;
+    //    G4cout << "Deleting PTD" << G4endl;
     for (PTDiterator i=PTD.begin(); i != PTD.end(); i++) {
       delete (*i).second;
     }
@@ -35,38 +35,38 @@ G3PartTable::Get(G4int partid){
   HashID(partid, ShashID);
   PTDiterator i = PTD.find(ShashID);
   return (*i).second;
-};
+}
 
 void 
 G3PartTable::Put(G4int partid, G4ParticleDefinition *partpt){
   G4String ShashID; // static
   HashID(partid, ShashID);
   PTD[ShashID]=partpt;
-};
+}
 
 void
 G3PartTable::HashID(G4int partid, G4String& theHashID){
   char s[20];
-  ostrstream ostr(s, sizeof s);
-  ostr << "Part" << partid << ends;
+  G4std::ostrstream ostr(s, sizeof s);
+  ostr << "Part" << partid << G4std::ends;
   theHashID = s;
-};
+}
 
 void 
 G3PartTable::HashID(G4int partid, G4String* theHashID){
   HashID(partid, *theHashID);
-};
+}
 
 void
 G3PartTable::PrintAll(){
   if (PTD.size()>0){
     G4int count=0;
-    G4cout << "Dump of PTD - " << PTD.size() << " entries: " << endl;
+    G4cout << "Dump of PTD - " << PTD.size() << " entries: " << G4endl;
     for (PTDiterator i=PTD.begin(); i != PTD.end(); i++) {
       count++;
       G4ParticleDefinition* aPTD = (*i).second;
-      G4cout << "PTD entry " << setw(3) << count << " particle name: " 
-	     << aPTD->GetParticleName() << endl;
+      G4cout << "PTD entry " << G4std::setw(3) << count << " particle name: " 
+	     << aPTD->GetParticleName() << G4endl;
     }
   }
 }
diff --git a/source/g3tog4/src/G3Pos.cc b/source/g3tog4/src/G3Pos.cc
index 6d21c9472e..9ce8a97742 100644
--- a/source/g3tog4/src/G3Pos.cc
+++ b/source/g3tog4/src/G3Pos.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3Pos.cc,v 1.5 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3Pos.cc,v 1.7 2000/03/02 17:54:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
@@ -25,36 +25,38 @@ G3Pos::G3Pos(G4String motherName, G4int C, G4ThreeVector* Position, G4int irot,
     // warning when MANY position is created
     G4String text = "G3Pos warning: Not supported MANY option has been encountered.\n";
     text = text +   "               It may cause overlapping volumes.";
-    G4cerr << text << endl;;
+    G4cerr << text << G4endl;
   }
-};
+}
 
-G3Pos::~G3Pos(){;};
+G3Pos::~G3Pos(){;}
 
 G4bool 
 G3Pos::operator == ( const G3Pos& lv) const {
   return (this==&lv) ? true : false;
-};
+}
 
 G4String&
 G3Pos::GetMotherName() {
   return _MotherName;
-};
+}
 
 G4int
 G3Pos::GetIrot() {
   return _Irot;
-};
+}
 
 G4int
 G3Pos::GetCopy() {
   return _Copy;
-};
+}
 
 G4ThreeVector* 
 G3Pos::GetPos() {
   return _Position;
-};
-
-
+}
 
+G4String&
+G3Pos::GetOnly() {
+  return _Only;
+}
diff --git a/source/g3tog4/src/G3RotTable.cc b/source/g3tog4/src/G3RotTable.cc
index 2d8a14693a..03a0b9e180 100644
--- a/source/g3tog4/src/G3RotTable.cc
+++ b/source/g3tog4/src/G3RotTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3RotTable.cc,v 1.11 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3RotTableEntry.cc b/source/g3tog4/src/G3RotTableEntry.cc
index 4baa0d7e17..50c66aadaf 100644
--- a/source/g3tog4/src/G3RotTableEntry.cc
+++ b/source/g3tog4/src/G3RotTableEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3RotTableEntry.cc,v 1.2 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3VolTable.cc b/source/g3tog4/src/G3VolTable.cc
index 2ab999e6ad..1cdb6d1f0b 100644
--- a/source/g3tog4/src/G3VolTable.cc
+++ b/source/g3tog4/src/G3VolTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3VolTable.cc,v 1.17 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3VolTable.cc,v 1.19 2000/03/02 17:54:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
@@ -15,40 +15,41 @@
 #include "G3VolTable.hh"
 #include "G3Pos.hh"
 
-typedef G4std::map<G4String, G3VolTableEntry*, less<G4String> >
+typedef G4std::map<G4String, G3VolTableEntry*, G4std::less<G4String> >
 ::iterator VTDiterator;
 
 G3VolTable::G3VolTable() 
   : G3toG4TopVTE(0), _FirstKey("UnDefined"), _NG3Pos(0){
-};
+}
 
 G3VolTable::~G3VolTable(){
   if (VTD.size()>0){
-    //    G4cout << "Deleting VTD" << endl;
+    //    G4cout << "Deleting VTD" << G4endl;
     for (VTDiterator i=VTD.begin(); i != VTD.end(); i++) {
       delete (*i).second;
     }
     VTD.clear();
   }
-};
+}
 
 G3VolTableEntry*
 G3VolTable::GetVTE(const G4String& Vname) {
   VTDiterator i = VTD.find(Vname);
-  return (*i).second;
-};
+  if (i == VTD.end()) return 0;
+  else                return (*i).second;
+}
 
 void 
 G3VolTable::PrintAll(){
   if (VTD.size()){
     G4int i=0;
-    G4cout << "Dump of VTD - " << VTD.size() << " entries:" << endl;
+    G4cout << "Dump of VTD - " << VTD.size() << " entries:" << G4endl;
     VTEStat();
     for (VTDiterator v=VTD.begin(); v != VTD.end(); v++){
       G3VolTableEntry* VTE = (*v).second;
-      G4cout << "G3VolTable element " << setw(3) << i++ << " name "
+      G4cout << "G3VolTable element " << G4std::setw(3) << i++ << " name "
 	     << VTE->GetName() << " has " << VTE->GetNoDaughters() 
-	     << " daughters" << endl;
+	     << " daughters" << G4endl;
     }
   }
 }
@@ -67,7 +68,7 @@ G3VolTable::PutVTE(G3VolTableEntry* aG3VolTableEntry){
     VTD[HashID] = aG3VolTableEntry;
   }
   return GetVTE(aG3VolTableEntry->GetName());
-};
+}
 
 void 
 G3VolTable::CountG3Pos(){
@@ -87,11 +88,24 @@ G3VolTable::SetFirstVTE(){
 G3VolTableEntry*
 G3VolTable::GetFirstVTE() {
   return G3toG4TopVTE;
-};
+}
 
 void
 G3VolTable::VTEStat() {
   G4cout << "Instantiated " << VTD.size() << 
     " volume table entries \n" 
- 	 << "                      " << _NG3Pos << " positions." << endl;
+ 	 << "                      " << _NG3Pos << " positions." << G4endl;
 }
+
+void 
+G3VolTable::Clear() {
+  if (VTD.size()>0){
+    for (VTDiterator i=VTD.begin(); i != VTD.end(); i++) {
+      delete (*i).second;
+    }
+    VTD.clear();
+  }
+  G3toG4TopVTE = 0;
+  _FirstKey = "UnDefined";
+  _NG3Pos = 0;
+}  
diff --git a/source/g3tog4/src/G3VolTableEntry.cc b/source/g3tog4/src/G3VolTableEntry.cc
index 1cc56e0222..b302130b6e 100644
--- a/source/g3tog4/src/G3VolTableEntry.cc
+++ b/source/g3tog4/src/G3VolTableEntry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3VolTableEntry.cc,v 1.2 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3VolTableEntry.cc,v 1.4 2000/03/02 17:54:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
@@ -38,7 +38,7 @@ G3VolTableEntry::~G3VolTableEntry(){
 inline G4bool 
 G3VolTableEntry::operator == ( const G3VolTableEntry& lv) const {
   return (this==&lv) ? true : false;
-};
+}
 
 void 
 G3VolTableEntry::AddG3Pos(G3Pos* aG3Pos){
@@ -105,7 +105,7 @@ G3VolTableEntry::FindDaughter(const G4String& Dname){
     if (GetDaughter(idau)->GetName() == Dname) return GetDaughter(idau);
   }
   return 0;
-};
+}
 
 G3VolTableEntry*
 G3VolTableEntry::FindMother(const G4String& Mname){
@@ -114,7 +114,7 @@ G3VolTableEntry::FindMother(const G4String& Mname){
     if (mvte->GetName() == Mname) return mvte;
   }
   return 0;
-};
+}
 
 G3VolTableEntry*
 G3VolTableEntry::FindClone(const G4String& Cname){
@@ -123,29 +123,29 @@ G3VolTableEntry::FindClone(const G4String& Cname){
     if (cvte->GetName() == Cname) return cvte;
   }
   return 0;
-};
+}
 
 void G3VolTableEntry::PrintSolidInfo() {
 // only parameters related to solid definition
 // are printed
-  G4cout << "VTE: " << fVname << " " << this << endl;
-  G4cout << "Solid: " << fSolid << endl;
+  G4cout << "VTE: " << fVname << " " << this << G4endl;
+  G4cout << "Solid: " << fSolid << G4endl;
   G4cout << "Parameters (npar = " << fNpar << ") fRpar: ";
   for (G4int i=0; i<fNpar; i++) G4cout << fRpar[i] << " ";
-  G4cout << endl;
-  G4cout << "HasNegPars: " << fHasNegPars << endl;
-  G4cout << "================================= " << endl;
+  G4cout << G4endl;
+  G4cout << "HasNegPars: " << fHasNegPars << G4endl;
+  G4cout << "================================= " << G4endl;
 }
 
 void
 G3VolTableEntry::SetName(G4String name){
   fVname = name;
-};
+}
 
 void
 G3VolTableEntry::SetLV(G4LogicalVolume* lv){
   fLV = lv;
-};
+}
 
 void 
 G3VolTableEntry::SetSolid(G4VSolid* solid){
@@ -172,32 +172,32 @@ void G3VolTableEntry::SetHasNegPars(G4bool hasNegPars) {
 G4String
 G3VolTableEntry::GetName() {
   return fVname;
-};
+}
 
 G4String
 G3VolTableEntry::GetShape() {
   return fShape;
-};
+}
 
 G4int
 G3VolTableEntry::GetNmed() {
   return fNmed;
-};
+}
 
 G4int 
 G3VolTableEntry::GetNpar() {
   return fNpar;
-};
+}
 
 G4double* 
 G3VolTableEntry::GetRpar() {
   return fRpar;
-};
+}
 
 G4int 
 G3VolTableEntry::NPCopies() {
   return fG3Pos.entries();
-};
+}
 
 G3Pos* 
 G3VolTableEntry::GetG3PosCopy(G4int copy) {
@@ -210,22 +210,22 @@ G3VolTableEntry::GetG3PosCopy(G4int copy) {
 G4bool 
 G3VolTableEntry::HasNegPars(){
   return fHasNegPars;
-};
+}
 
 G4VSolid*
 G3VolTableEntry::GetSolid() {
   return fSolid;
-};
+}
 
 G4LogicalVolume* 
 G3VolTableEntry::GetLV() {
   return fLV;
-};
+}
 
 G4int
 G3VolTableEntry::GetNoDaughters() {
   return fDaughters.entries();
-};
+}
 
 G4int
 G3VolTableEntry::GetNoMothers() {
@@ -243,7 +243,7 @@ G3VolTableEntry::GetDaughter(G4int i) {
     return fDaughters[i];
   else 
     return 0;
-};
+}
 
 G3VolTableEntry*
 G3VolTableEntry::GetMother(G4int i){
@@ -251,7 +251,7 @@ G3VolTableEntry::GetMother(G4int i){
     return fMothers[i];
   else
     return 0;
-};
+}
 
 // to be removed
 G3VolTableEntry*
@@ -260,7 +260,7 @@ G3VolTableEntry::GetMother(){
     return fMothers[0];
   else
     return 0;  
-};
+}
 
 G3VolTableEntry*
 G3VolTableEntry::GetClone(G4int i){
@@ -268,7 +268,7 @@ G3VolTableEntry::GetClone(G4int i){
     return fClones[i];
   else
     return 0;
-};
+}
 
 G3VolTableEntry*
 G3VolTableEntry::GetMasterClone(){
@@ -282,4 +282,4 @@ G3VolTableEntry::GetMasterClone(){
     master = this;
 
   return master;
-};
+}
diff --git a/source/g3tog4/src/G3fillParams.cc b/source/g3tog4/src/G3fillParams.cc.archive
similarity index 94%
rename from source/g3tog4/src/G3fillParams.cc
rename to source/g3tog4/src/G3fillParams.cc.archive
index 158ec52bbc..365c0f1ad2 100644
--- a/source/g3tog4/src/G3fillParams.cc
+++ b/source/g3tog4/src/G3fillParams.cc.archive
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3fillParams.cc,v 1.2 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3fillParams.cc.archive,v 1.1 1999/12/06 19:19:57 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // extracted from clparse.cc by I. Hrivnacova, 30.7.99
 
diff --git a/source/g3tog4/src/G3toG4BuildTree.cc b/source/g3tog4/src/G3toG4BuildTree.cc
index c498d994b3..9f8d71faf3 100644
--- a/source/g3tog4/src/G3toG4BuildTree.cc
+++ b/source/g3tog4/src/G3toG4BuildTree.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4BuildTree.cc,v 1.8 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4BuildTree.cc,v 1.11 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I. Hrivnacova, 2.8.99 
 
@@ -19,6 +19,7 @@
 #include "G4LogicalVolume.hh"
 #include "G4PVPlacement.hh"
 #include "globals.hh"
+#include "G3toG4Debug.hh"
 
 void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
 {
@@ -60,7 +61,7 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
     else {  	    
        mothLV = 0;
     }  
- 
+    
     // positions in motherVTE
     for (G4int i=0; i<curVTE->NPCopies(); i++){
 
@@ -76,29 +77,35 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
         // (in G3 numbering starts from 1 but in G4 from 0)
         G4int copyNo = theG3Pos->GetCopy() - 1;
       
-        // position it
-        new G4PVPlacement(theMatrix,          // rotation matrix
-                      *(theG3Pos->GetPos()),  // its position
-                      curLog,                 // its LogicalVolume 
-                      curVTE->GetName(),      // PV name
-                      mothLV,                 // Mother LV
-                      0,                      // only
-                      copyNo);                // copy
-		      
+        // position it if not top-level volume
+	if (mothLV != 0) {
+	  new G4PVPlacement(theMatrix,          // rotation matrix
+			    *(theG3Pos->GetPos()),  // its position
+			    curLog,                 // its LogicalVolume 
+			    curVTE->GetName(),      // PV name
+			    mothLV,                 // Mother LV
+			    0,                      // only
+			    copyNo);                // copy
+	
         // verbose
-	// G4cout << "PV: " << i << "th copy of " << curVTE->GetName()
-        //       << "  in " << motherVTE->GetName() << "  copyNo: " 
-        //       << copyNo << "  irot: " << irot << "  pos: " 
-        //       << *(theG3Pos->GetPos()) << endl;
+	  
+	  if (G3toG4Debug() != 0) 
+	    G4cout << "PV: " << i << "th copy of " << curVTE->GetName()
+		   << "  in " << motherVTE->GetName() << "  copyNo: " 
+		   << copyNo << "  irot: " << irot << "  pos: " 
+		   << *(theG3Pos->GetPos()) << G4endl;
+	}
       }
     }
 
     // divisions     
     if (curVTE->GetDivision()) {
-       curVTE->GetDivision()->CreatePVReplica();
-       // verbose
-       // G4cout << "PVReplica: " << curVTE->GetName() 
-       //        << " in "  << motherVTE->GetName() << endl;
+      curVTE->GetDivision()->CreatePVReplica();
+      // verbose
+      if (G3toG4Debug() != 0) {
+	G4cout << "CreatePVReplica: " << curVTE->GetName() 
+	       << " in "  << motherVTE->GetName() << G4endl;
+      }
     }
   }
   else {
diff --git a/source/g3tog4/src/G3toG4Debug.cc b/source/g3tog4/src/G3toG4Debug.cc
new file mode 100644
index 0000000000..336df23259
--- /dev/null
+++ b/source/g3tog4/src/G3toG4Debug.cc
@@ -0,0 +1,17 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G3toG4Debug.cc,v 1.1 1999/12/09 01:27:49 lockman Exp $
+// GEANT4 tag $Name: geant4-01-01 $
+//
+
+#include "G3toG4Debug.hh"
+G4int
+G3toG4Debug()
+{
+  return 0;
+}
diff --git a/source/g3tog4/src/G3toG4MakeSolid.cc b/source/g3tog4/src/G3toG4MakeSolid.cc
index b134f69058..cb38b397eb 100644
--- a/source/g3tog4/src/G3toG4MakeSolid.cc
+++ b/source/g3tog4/src/G3toG4MakeSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4MakeSolid.cc,v 1.3 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4MakeSolid.cc,v 1.4 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 
 
@@ -273,7 +273,7 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
 
   } else if ( shape == "ELTU" ) {
     // $$$ not implemented.
-    G4cerr << "ELTU not supported" << endl;
+    G4cerr << "ELTU not supported" << G4endl;
 
   } else if ( shape == "HYPE" ) {
     G4double pRmin = Rpar[0]*cm;
@@ -287,16 +287,16 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
       solid = new G4Hype(vname, pRmin, pRmax, pThet, pThet, pDz);
     } else {
       G4cerr << "Negative length parameters not supported for shape " 
-	     << shape << endl;
+	     << shape << G4endl;
     }
 
   } else if ( shape == "GTRA" ) {
     // $$$ not implemented.
-    G4cerr << "GTRA not supported" << endl;
+    G4cerr << "GTRA not supported" << G4endl;
 
   } else if ( shape == "CTUB" ) {
     // $$$ not implemented.
-    G4cerr << "CTUB not supported" << endl;
+    G4cerr << "CTUB not supported" << G4endl;
   }
   return solid;
 }
diff --git a/source/g3tog4/src/G3toG4RotationMatrix.cc b/source/g3tog4/src/G3toG4RotationMatrix.cc
index 72f5c843f6..ca7b6d2a46 100644
--- a/source/g3tog4/src/G3toG4RotationMatrix.cc
+++ b/source/g3tog4/src/G3toG4RotationMatrix.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RotationMatrix.cc,v 1.2 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G3toG4RotationMatrix.hh"
 
diff --git a/source/g3tog4/src/G4.cc.omit b/source/g3tog4/src/G4.cc.omit
deleted file mode 100644
index 0dfc091a6a..0000000000
--- a/source/g3tog4/src/G4.cc.omit
+++ /dev/null
@@ -1,191 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4.cc.omit,v 1.2 1999/12/05 17:50:11 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-01-00 $ 
-//
-#include "G3toG4.hh"
-
-//G4GeometryManager::G4GeometryManager()
-//{
-//    ofile << "G4GeometryManager: Open manager\n";
-//}
-
-//void G4GeometryManager::CloseGeometry()
-//{
-//    ofile << "G4GeometryManager::CloseGeometry  close geometry\n";
-//}
-
-G4VSolid::G4VSolid()
-{
-    ofile << "G4VSolid: Making solid\n";
-}
-
-G4VSolid::G4VSolid(G4String shape, G4double* )
-{
-    ofile << "G4VSolid: Making solid " << shape << '\n';
-}
-
-G4VSolid::G4VSolid(G4String shape, G4double* , G4Angles)
-{
-    ofile << "G4VSolid: Making solid " << shape << '\n';
-}
-
-G4Material::G4Material(G4String name, G4double dens)
-{
-    ofile << "G4Material: Making material '" << name << "' density " << dens << '\n';
-}
-
-void G4Material::add(G4double a, G4double z, G4double fraction)
-{
-    ofile << "   G4Material::add a,z,fraction " << a << " " << z << " " << fraction << '\n';
-}
-
-G4UserLimits::G4UserLimits(G4double stepmin, G4double stepmax)
-{
-    ofile << "G4UserLimits: stepmin " << stepmin << " max " << stepmax << '\n';
-}
-
-G4LogicalVolume::G4LogicalVolume(G4String name, G4VSolid*, G4Material*,
-                                 G4MagneticField*, G4UserLimits*)
-{
-    myname = name;
-    ofile << "G4LogicalVolume: Creating logical volume " << name << '\n';
-}
-
-void G4LogicalVolume::ApplyAttribute(G4String attribute, G4int ival)
-{
-    ofile << "G4LogicalVolume::ApplyAttribute " << attribute << " to volume " << myname
-        << ", value " << ival << '\n';
-}
-
-G4VPhysicalVolume::G4VPhysicalVolume()
-{
-    ofile << "G4VPhysicalVolume: Make physical vol\n";
-}
-
-G4VPhysicalVolume* G4PVPlacement(G4String name, G4LogicalVolume*,
-                                G4VPhysicalVolume* p, G4Transform*,
-                                G4int, G4Only)
-{
-    ofile << "G4PVPLacement: Place phys vol " << name << '\n';
-    return p;
-}
-
-G4VPhysicalVolume* G4PVIndex(G4String name, G4LogicalVolume*,
-                            G4VPhysicalVolume* p, G4Transform*,
-                            G4int, G4Only, G4double*,
-                            G4int npars)
-{
-    ofile << "G4PVIndex: Place index vols " << name << " " << npars << '\n';
-    return p;
-}
-
-void G4PVReplicas(G4String name, G4LogicalVolume*, G4VPhysicalVolume*,
-                  EAxis, G4int ndiv, G4double range, G4double offset)
-{
-    ofile << "G4PVReplicas: Place replicas " << name << " " << ndiv << " " << range <<
-        " " << offset << '\n';
-}
-
-void G4PVParametrized(G4String name, void* , G4LogicalVolume*,
-                      G4VPhysicalVolume*, EAxis, G4int ndiv, 
-                      G4double range, G4double offset)
-{
-    ofile << "G4PVParametrized: Place parametrized volumes " << name 
-            << " " << ndiv << " " << range << " " << offset << '\n';
-}
-
-G4ProcessManager::G4ProcessManager(G4String name)
-{
-    ofile << "G4ProcessManager: " << " manager for " << name << '\n';
-}
-
-G4Decay::G4Decay()
-{
-    ofile << "G4Decay: Create decay object\n";
-}
-
-void G4Decay::AddMode(G4int mode, G4double br)
-{
-    ofile << "G4Decay::AddMode: add mode ID " << mode << " BR " << br
-            << '\n';
-}
-
-
-G4ParticleDef::G4ParticleDef(G4String name, G4ProcessManager*,
-                             G4double m, G4double q,
-                             G4double life)
-{
-    ofile << "G4ParticleDef: Create particle " << name << " mass " << m <<
-        " chg " << q << " life " << life << '\n';
-}
-
-void G4ParticleDef::SetDecay(G4Decay*)
-{
-    ofile << "G4ParticleDef::SetDecay: Set particle decay\n";
-}
-
-G4Box::G4Box(G4String, G4double*)
-{
-    ofile << "  G4Box: make BOX\n";
-}
-
-G4Trap::G4Trap(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Trap: make Trap\n";
-}
-
-G4Tubs::G4Tubs(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Tubs: make Tubs\n";
-}
-
-G4Cons::G4Cons(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Cons: make Cons\n";
-}
-
-G4Sphe::G4Sphe(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Sphe: make Sphe\n";
-}
-
-G4Para::G4Para(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Para: make Para\n";
-}
-
-G4Pgon::G4Pgon(G4String, G4double*)
-{
-    ofile << "  G4Pgon: make Pgon\n";
-}
-
-G4Pcon::G4Pcon(G4String, G4double*)
-{
-    ofile << "  G4Pcon: make Pcon\n";
-}
-
-G4Eltu::G4Eltu(G4String, G4double*)
-{
-    ofile << "  G4Eltu: make Eltu\n";
-}
-
-G4Hype::G4Hype(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Hype: make Hype\n";
-}
-
-G4Gtra::G4Gtra(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Gtra: make Gtra\n";
-}
-
-G4Ctub::G4Ctub(G4String, G4double*, G4Angles)
-{
-    ofile << "  G4Ctub: make Ctub\n";
-}
diff --git a/source/g3tog4/src/G4BuildGeom.cc b/source/g3tog4/src/G4BuildGeom.cc
index 65f55c4688..1ca5ea96f5 100644
--- a/source/g3tog4/src/G4BuildGeom.cc
+++ b/source/g3tog4/src/G4BuildGeom.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BuildGeom.cc,v 1.9 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BuildGeom.cc,v 1.12 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
@@ -14,6 +14,7 @@
 #include "g4std/fstream"
 #include "globals.hh"
 #include "G3toG4.hh"
+#include "G3toG4Debug.hh"
 #include "G3MatTable.hh"
 #include "G3MedTable.hh"
 #include "G3RotTable.hh"
@@ -27,7 +28,7 @@
 #include "G4PVPlacement.hh"
 #include "G4VisAttributes.hh"
 
-extern ofstream ofile;
+extern G4std::ofstream ofile;
 
 void G3CLRead(G4String &, char *);
 void checkVol(G4LogicalVolume*, G4int);
@@ -39,11 +40,11 @@ G4LogicalVolume* G4BuildGeom(G4String& inFile){
   G4int irot=0;
   G4gsrotm(0, 90, 0, 90, 90, 0, 0);
 
-  G4cout << "Instantiated unit rotation matrix irot=" << irot << endl;
+  G4cout << "Instantiated unit rotation matrix irot=" << irot << G4endl;
  
   // Read the call List and interpret to Generate Geant4 geometry
 
-  G4cout << "Reading the call List file " << inFile << "..." << endl;
+  G4cout << "Reading the call List file " << inFile << "..." << G4endl;
 
   G3CLRead(inFile, NULL);
 
@@ -52,12 +53,13 @@ G4LogicalVolume* G4BuildGeom(G4String& inFile){
   G3Det.PrintAll();
 
   G3Vol.PrintAll();
-  G4cout << "Call List file read completed. Build geometry" << endl;
+
+  G4cout << "Call List file read completed. Build geometry" << G4endl;
 
   // Build the geometry
 
   G3VolTableEntry* topVTE = G3Vol.GetFirstVTE();
-  G4cout << "G3toG4 top level volume is " << topVTE->GetName() << endl;
+  G4cout << "G3toG4 top level volume is " << topVTE->GetName() << G4endl;
 
   // modified
   G3toG4BuildTree(topVTE, 0);
@@ -76,14 +78,12 @@ G4LogicalVolume* G4BuildGeom(G4String& inFile){
   topLV->SetVisAttributes(G4VisAttributes::Invisible);
     
   G4cout << "Top-level G3toG4 logical volume " << topLV->GetName() << " "
-         << *(topLV->GetVisAttributes()) << endl;
+         << *(topLV->GetVisAttributes()) << G4endl;
         
         // check the geometry here
 
-  G4int debug=0;
-        
-  if (debug){
-    G4cout << "scan through G4LogicalVolumeStore:" << endl;
+  if (G3toG4Debug() != 0){
+    G4cout << "scan through G4LogicalVolumeStore:" << G4endl;
     checkVol();
   }
   return topLV;
@@ -106,13 +106,13 @@ void checkVol(G4LogicalVolume* _lvol, G4int level)
   G4int ndau = _lvol -> GetNoDaughters();
   
   G4cout << "G44LogicalVolume " << _lvol->GetName() << " at level " << level
-	 << " contains " << ndau << " daughters." << endl;
+	 << " contains " << ndau << " daughters." << G4endl;
   for (int idau=0; idau<ndau; idau++){
     _pdvol = _lvol-> GetDaughter(idau);
     _ldvol = _pdvol -> GetLogicalVolume();
-    G4cout << "G4VPhysical volume " << setw(5) << _pdvol -> GetName() 
-	 << " (G4LogicalVolume " << setw(5) << _ldvol->GetName() << ")" 
-	 << endl;
+    G4cout << "G4VPhysical volume " << G4std::setw(5) << _pdvol -> GetName() 
+	 << " (G4LogicalVolume " << G4std::setw(5) << _ldvol->GetName() << ")" 
+	 << G4endl;
     checkVol(_ldvol, level);
   }
   return;
@@ -122,3 +122,9 @@ void checkVol(G4LogicalVolume* _lvol, G4int level)
 
 
 
+
+
+
+
+
+
diff --git a/source/g3tog4/src/G4ggclos.cc b/source/g3tog4/src/G4ggclos.cc
index 98011d43d6..03fceda0e8 100644
--- a/source/g3tog4/src/G4ggclos.cc
+++ b/source/g3tog4/src/G4ggclos.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ggclos.cc,v 1.5 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ggclos.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
@@ -16,6 +16,6 @@ void PG4ggclos(){
 }
 
 void G4ggclos(){
-  G4cout << "G4ggclos: setting top-level VolTableEntry" << endl;
+  G4cout << "G4ggclos: setting top-level VolTableEntry" << G4endl;
   G3Vol.SetFirstVTE();
 }
diff --git a/source/g3tog4/src/G4gsatt.cc b/source/g3tog4/src/G4gsatt.cc
index 4f4901e213..56356c9cb5 100644
--- a/source/g3tog4/src/G4gsatt.cc
+++ b/source/g3tog4/src/G4gsatt.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsatt.cc,v 1.6 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsatt.cc,v 1.8 2000/03/02 17:54:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "g4rw/cstring.h"
 #include "G3toG4.hh"
@@ -29,5 +29,5 @@ void G4gsatt(G4String name, G4String attr, G4int ival)
 {
     // get logical volume pointer
     G4LogicalVolume *lvol = G3Vol.GetVTE(name)->GetLV();
-    G4cerr << "G4gsatt not implemented" << endl;
-};
+    G4cerr << "G4gsatt not implemented" << G4endl;
+}
diff --git a/source/g3tog4/src/G4gsdet.cc b/source/g3tog4/src/G4gsdet.cc
index cb83b3f385..9e617b6a78 100644
--- a/source/g3tog4/src/G4gsdet.cc
+++ b/source/g3tog4/src/G4gsdet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdet.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "globals.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdeta.cc b/source/g3tog4/src/G4gsdeta.cc
index 108ee4fab9..f3f9a61902 100644
--- a/source/g3tog4/src/G4gsdeta.cc
+++ b/source/g3tog4/src/G4gsdeta.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdeta.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // modified by I.Hrivnacova, 6 Oct 99
diff --git a/source/g3tog4/src/G4gsdetd.cc b/source/g3tog4/src/G4gsdetd.cc
index 6cd0c12aa8..0ac6275163 100644
--- a/source/g3tog4/src/G4gsdetd.cc
+++ b/source/g3tog4/src/G4gsdetd.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdetd.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G4gsdeth.cc b/source/g3tog4/src/G4gsdeth.cc
index 2c7236c605..5a19d00845 100644
--- a/source/g3tog4/src/G4gsdeth.cc
+++ b/source/g3tog4/src/G4gsdeth.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdeth.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G4gsdetu.cc b/source/g3tog4/src/G4gsdetu.cc
index 7cbf1fbb41..c551e63e1e 100644
--- a/source/g3tog4/src/G4gsdetu.cc
+++ b/source/g3tog4/src/G4gsdetu.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdetu.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G3toG4.hh"
 
diff --git a/source/g3tog4/src/G4gsdetv.cc b/source/g3tog4/src/G4gsdetv.cc
index 6e8af9fcd2..5b74ba8fdd 100644
--- a/source/g3tog4/src/G4gsdetv.cc
+++ b/source/g3tog4/src/G4gsdetv.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsdetv.cc,v 1.5 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsdetv.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G4ios.hh"
 #include "G3toG4.hh"
@@ -33,12 +33,12 @@ void PG4gsdetv(G4String tokens[])
 void G4gsdetv(G4String chset, G4String chdet, G4int idtyp, G4int,
               G4int){
   
-  G4cout << "G4gsdetv not currently implemented." << endl;
+  G4cout << "G4gsdetv not currently implemented." << G4endl;
   /*
     // get lvol for detector chdet
     G4LogicalVolume *lvol = G3Vol.GetLV(chdet);
     if (lvol == NULL) {
-    G4cout << "G4gsdetv: Logical volume " << chdet << " not available. Skip." << endl;
+    G4cout << "G4gsdetv: Logical volume " << chdet << " not available. Skip." << G4endl;
     return;
     }
     // Generate a sensitive detector structure
diff --git a/source/g3tog4/src/G4gsdk.cc b/source/g3tog4/src/G4gsdk.cc
index 18e153a25c..f272b44aea 100644
--- a/source/g3tog4/src/G4gsdk.cc
+++ b/source/g3tog4/src/G4gsdk.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdk.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G4Decay.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdvn.cc b/source/g3tog4/src/G4gsdvn.cc
index d17f15a15b..03bb292524 100644
--- a/source/g3tog4/src/G4gsdvn.cc
+++ b/source/g3tog4/src/G4gsdvn.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdvn.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvn2.cc b/source/g3tog4/src/G4gsdvn2.cc
index 29c2892fc7..5dcf3f5492 100644
--- a/source/g3tog4/src/G4gsdvn2.cc
+++ b/source/g3tog4/src/G4gsdvn2.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdvn2.cc,v 1.6 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt.cc b/source/g3tog4/src/G4gsdvt.cc
index 11503f8f4f..33f9578f1b 100644
--- a/source/g3tog4/src/G4gsdvt.cc
+++ b/source/g3tog4/src/G4gsdvt.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdvt.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt2.cc b/source/g3tog4/src/G4gsdvt2.cc
index 6e34bffb13..378d4a2d1d 100644
--- a/source/g3tog4/src/G4gsdvt2.cc
+++ b/source/g3tog4/src/G4gsdvt2.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdvt2.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvx.cc b/source/g3tog4/src/G4gsdvx.cc
index f607c692dd..2dabf36b16 100644
--- a/source/g3tog4/src/G4gsdvx.cc
+++ b/source/g3tog4/src/G4gsdvx.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdvx.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gsmate.cc b/source/g3tog4/src/G4gsmate.cc
index 48ee312e1f..322f66e58d 100644
--- a/source/g3tog4/src/G4gsmate.cc
+++ b/source/g3tog4/src/G4gsmate.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsmate.cc,v 1.4 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsmate.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -19,8 +19,6 @@
 #include "G4Isotope.hh"
 #include "G4UnitsTable.hh"
 
-//extern int debugOn;
-
 void PG4gsmate(G4String tokens[])
 {
   // fill the parameter containers
@@ -79,7 +77,7 @@ G4Element* CreateElement(G4double zeff, G4double aeff, G4String matName)
   // create new element if it was not found in element table
   G4Element* element = new G4Element(elName, elSymbol, zeff, aeff);	
   G4cout << "New element: " << element->GetName()
-         << " for " << matName << " material has been created." << endl;
+         << " for " << matName << " material has been created." << G4endl;
   return element;	
 }
 */
diff --git a/source/g3tog4/src/G4gsmixt.cc b/source/g3tog4/src/G4gsmixt.cc
index 6b28eba52b..d073c6a1eb 100644
--- a/source/g3tog4/src/G4gsmixt.cc
+++ b/source/g3tog4/src/G4gsmixt.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsmixt.cc,v 1.6 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsmixt.cc,v 1.7 1999/12/15 14:49:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -121,21 +121,21 @@ void G4gsmixt(G4int imate, G4String name, G4double a[], G4double z[],
   } else {
     if (nlmat>0) {
       G4cerr << "G4gsmixt: for mixture '" << name 
-	     << "' some |weights|>1 : " << endl;
+	     << "' some |weights|>1 : " << G4endl;
       for (G4int i=0;i<nlmat; i++) {
-	G4cerr << "Component " << setw(3) << i+1 << " fraction: "
-	       << setw(10) << wmat[i] << endl;
+	G4cerr << "Component " << G4std::setw(3) << i+1 << " fraction: "
+	       << G4std::setw(10) << wmat[i] << G4endl;
       }
     } else if (nlmat<0) {
       G4cerr << "G4gsmixt: for mixture '" << name 
-	     << "' some #natoms are non-integer: " << endl;
+	     << "' some #natoms are non-integer: " << G4endl;
       for (G4int i=0;i<nlmat; i++) {
-	G4cerr << "Component " << setw(3) << i+1 << " #atoms "
-	       << setw(10) << wmat[i] << endl;
+	G4cerr << "Component " << G4std::setw(3) << i+1 << " #atoms "
+	       << G4std::setw(10) << wmat[i] << G4endl;
       }
     } else {
       G4cerr << "G4gsmixt: Number of components for mixture '" 
-	     << name << "' (" << nlmat << ") not allowed." << endl;
+	     << name << "' (" << nlmat << ") not allowed." << G4endl;
     }
   }
 }
diff --git a/source/g3tog4/src/G4gspart.cc b/source/g3tog4/src/G4gspart.cc
index df31918c6c..1d2250ee89 100644
--- a/source/g3tog4/src/G4gspart.cc
+++ b/source/g3tog4/src/G4gspart.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gspart.cc,v 1.3 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4ProcessManager.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gspos.cc b/source/g3tog4/src/G4gspos.cc
index 4ea912cd98..16dbbc137e 100644
--- a/source/g3tog4/src/G4gspos.cc
+++ b/source/g3tog4/src/G4gspos.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gspos.cc,v 1.11 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G4gsposp.cc b/source/g3tog4/src/G4gsposp.cc
index 1d31b2b9fd..eb72a64de0 100644
--- a/source/g3tog4/src/G4gsposp.cc
+++ b/source/g3tog4/src/G4gsposp.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsposp.cc,v 1.11 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsposp.cc,v 1.13 2000/03/07 10:51:40 stesting Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
@@ -18,7 +18,7 @@
 #include "G4VSolid.hh"
 
 G4bool G3NegVolPars(G4double pars[], G4int *nparpt, 
-          G3VolTableEntry* vte, G3VolTableEntry* mvte, char routine[]);		       
+          G3VolTableEntry* vte, G3VolTableEntry* mvte, const char routine[]);		       
 
 void PG4gsposp(G4String tokens[]){
   // fill the parameter containers
@@ -49,9 +49,9 @@ void G4ProcessDaughters(G3VolTableEntry* vte)
 // vte daughters
 {
   if (vte->HasNegPars()) {
-    G4cerr << " Warning:" << endl;
+    G4cerr << " Warning:" << G4endl;
     G4cerr << " G4ProcessDaughters: Ignored (vte has negative parameters)." 
-           << endl;
+           << G4endl;
   }  
   else {  
     for (G4int i=0; i<vte->GetNoDaughters(); i++) {
diff --git a/source/g3tog4/src/G4gsrotm.cc b/source/g3tog4/src/G4gsrotm.cc
index 7f4715fbc2..936df60482 100644
--- a/source/g3tog4/src/G4gsrotm.cc
+++ b/source/g3tog4/src/G4gsrotm.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsrotm.cc,v 1.7 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsrotm.cc,v 1.8 1999/12/15 14:49:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G3toG4.hh"
 #include "G3RotTable.hh"
@@ -59,19 +59,19 @@ void G4gsrotm(G4int irot, G4double theta1, G4double phi1,
     if (1-abs(check)>tol) {
         G4cerr << "Coordinate axes forming rotation matrix "
                << irot << " are not orthonormal.(" << 1-abs(check) << ")" 
-         << endl;
+         << G4endl;
         G4cerr << " theta1=" << theta1;
         G4cerr << " phi1=" << phi1;
         G4cerr << " theta2=" << theta2;
         G4cerr << " phi2=" << phi2;
         G4cerr << " theta3=" << theta3;
         G4cerr << " phi3=" << phi3;
-        G4cerr << endl;
+        G4cerr << G4endl;
         G4Exception("G4gsrotm error");
     }
     else if (1+check<=tol) {
         G4cerr << "G4gsrotm warning: coordinate axes forming rotation "
-               << "matrix " << irot << " are left-handed" << endl;
+               << "matrix " << irot << " are left-handed" << G4endl;
     }
     
     G3toG4RotationMatrix* rotp = new G3toG4RotationMatrix;
diff --git a/source/g3tog4/src/G4gstmed.cc b/source/g3tog4/src/G4gstmed.cc
index fd40fb45fa..b240358a08 100644
--- a/source/g3tog4/src/G4gstmed.cc
+++ b/source/g3tog4/src/G4gstmed.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gstmed.cc,v 1.4 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // The last G4int argument of G4gstmed(..) is used for sending
 // info whether the Geant3 tracking medium parameters should
diff --git a/source/g3tog4/src/G4gstpar.cc b/source/g3tog4/src/G4gstpar.cc
index 133fec7cf3..7441b4b402 100644
--- a/source/g3tog4/src/G4gstpar.cc
+++ b/source/g3tog4/src/G4gstpar.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gstpar.cc,v 1.4 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gstpar.cc,v 1.5 1999/12/15 14:49:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
@@ -28,5 +28,5 @@ void G4gstpar(G4int itmed, G4String chpar, G4double parval)
 {
     // set special tracking medium parameter. Apply to all logical
     // volumes making use of the specified tracking medium.
-  G4cerr << "G4gstpar: not implemented." << endl;
+  G4cerr << "G4gstpar: not implemented." << G4endl;
 }
diff --git a/source/g3tog4/src/G4gsvolu.cc b/source/g3tog4/src/G4gsvolu.cc
index e8674544c2..c66b45dc17 100644
--- a/source/g3tog4/src/G4gsvolu.cc
+++ b/source/g3tog4/src/G4gsvolu.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4gsvolu.cc,v 1.6 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4gsvolu.cc,v 1.7 1999/12/15 14:49:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
@@ -58,8 +58,8 @@ void G4gsvolu(G4String vname, G4String shape, G4int nmed, G4double* Rpar,
   /*
   G4cout << "Creating logical volume " << vname << " shape " << shape
   	 << " nmed " << nmed << " #pars "<< npar << " parameters (cm): ";
-  for (int ipar=0; ipar< npar; ipar++) G4cout << setw(8) << Rpar[ipar];
-  G4cout << endl;
+  for (int ipar=0; ipar< npar; ipar++) G4cout << G4std::setw(8) << Rpar[ipar];
+  G4cout << G4endl;
   */
   if (G3Vol.GetVTE(vname)) {
     // abort if VTE with given name exists
diff --git a/source/g3tog4/src/clparse.cc b/source/g3tog4/src/clparse.cc
index ba91724785..348c241363 100644
--- a/source/g3tog4/src/clparse.cc
+++ b/source/g3tog4/src/clparse.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: clparse.cc,v 1.8 1999/12/05 17:50:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: clparse.cc,v 1.11 2000/03/07 10:51:41 stesting Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // modified by I.Hrivnacova
 // added G3SensVol
@@ -25,13 +25,13 @@
 #include "G3DetTable.hh"
 #include "G3SensVolVector.hh"
 
-ofstream ofile;
+G4std::ofstream ofile;
 
 extern "C" {
 #include <stdlib.h>
 }
 
-extern ofstream ofile;
+extern G4std::ofstream ofile;
 
 G3VolTable G3Vol;
 G3MatTable G3Mat; // material G3 ID <-> G4 pointer table
@@ -94,13 +94,12 @@ void G3CLRead(G4String & fname, char *select = NULL){
 
   G4int count = 0;
   G4int ntokens = 0;
-  ifstream istr(fname);
-  G4bool _debug=false;
+  G4std::ifstream istr(fname);
     
   while (line.readLine(istr) && ! istr.eof()){
       count++;
       ntokens = G3CLTokens(&line,tokens);  // tokenize the line
-      for (G4int i=0; i < ntokens; i++) ofile << tokens[i] << endl;
+      for (G4int i=0; i < ntokens; i++) ofile << tokens[i] << G4endl;
       
           // interpret the line as a Geant call
       G3CLEval(tokens, select);
@@ -155,7 +154,7 @@ void G3CLEval(G4String tokens[], char *select)
     if (select != NULL && select != "*") if ( strcmp(select,context) ) return;
 
     // Branch on Geant3 routine name
-    ofile << "Do routine " << routine << " in context " << context << endl;
+    ofile << "Do routine " << routine << " in context " << context << G4endl;
     
     if ( !strcmp(routine,"GSVOLU") ) { 
 //      volcount++;
@@ -200,7 +199,7 @@ void G3CLEval(G4String tokens[], char *select)
     if ( !strcmp(routine,"GGCLOS") ) { PG4ggclos(); return;}
 }
 
-void G3fillParams(G4String *tokens, char *ptypes)
+void G3fillParams(G4String *tokens, const char *ptypes)
 //
 // G3fillParams
 //
@@ -259,7 +258,7 @@ void G3fillParams(G4String *tokens, char *ptypes)
                     }
                 break;
             default:
-                ofile << "unidentified ptype '" << ptypes[i] << endl;
+                ofile << "unidentified ptype '" << ptypes[i] << G4endl;
             };
             i++;
         }
diff --git a/source/g3tog4/src/g3routines.F b/source/g3tog4/src/g3routines.F
index b4974e485d..28147d260b 100644
--- a/source/g3tog4/src/g3routines.F
+++ b/source/g3tog4/src/g3routines.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: g3routines.F,v 1.3 1999/12/05 17:50:15 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
 #define CALL_GEANT
 
diff --git a/source/g3tog4/src/g3test.F.main b/source/g3tog4/src/g3test.F.main
index 4ab79ee45d..ddc5106ded 100644
--- a/source/g3tog4/src/g3test.F.main
+++ b/source/g3tog4/src/g3test.F.main
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
 *
 *       g3test
diff --git a/source/g3tog4/src/g3tog4.F b/source/g3tog4/src/g3tog4.F
index afcc0dc227..4242ec1ace 100644
--- a/source/g3tog4/src/g3tog4.F
+++ b/source/g3tog4/src/g3tog4.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: g3tog4.F,v 1.3 1999/12/05 17:50:16 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
 *
 *       G3toG4
diff --git a/source/g3tog4/src/g4geom.cc.main b/source/g3tog4/src/g4geom.cc.main
index d6b7f5e319..ccfc304386 100644
--- a/source/g3tog4/src/g4geom.cc.main
+++ b/source/g3tog4/src/g4geom.cc.main
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-01-00 $ 
+// GEANT4 tag $Name: geant4-01-01 $ 
 //
 //   g4geom
 //
diff --git a/source/g3tog4/src/jshape.F b/source/g3tog4/src/jshape.F
index d9f6b12f3a..a1ba54ac61 100644
--- a/source/g3tog4/src/jshape.F
+++ b/source/g3tog4/src/jshape.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: jshape.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
 *     
 *--   Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch
diff --git a/source/g3tog4/src/mztog4.F b/source/g3tog4/src/mztog4.F
index 5c587706a1..1977d7dd6b 100644
--- a/source/g3tog4/src/mztog4.F
+++ b/source/g3tog4/src/mztog4.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: mztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
       subroutine mztog4
 ************************************************************************
diff --git a/source/g3tog4/src/rztog4.F b/source/g3tog4/src/rztog4.F
index bab1ef670b..608cb4be64 100644
--- a/source/g3tog4/src/rztog4.F
+++ b/source/g3tog4/src/rztog4.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: rztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
       program rztog4
 ************************************************************************
diff --git a/source/g3tog4/src/tog4.F b/source/g3tog4/src/tog4.F
index 43f12cec15..35457051c4 100644
--- a/source/g3tog4/src/tog4.F
+++ b/source/g3tog4/src/tog4.F
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: tog4.F,v 1.3 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-01-00 $
+*     GEANT4 tag $Name: geant4-01-01 $
 *    
       subroutine tog4
 ************************************************************************
diff --git a/source/g3tog4/test/clGeometry.cc b/source/g3tog4/test/clGeometry.cc
index d73cabbdb4..f39e9f6e41 100644
--- a/source/g3tog4/test/clGeometry.cc
+++ b/source/g3tog4/test/clGeometry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: clGeometry.cc,v 1.9 1999/12/05 17:50:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: clGeometry.cc,v 1.10 1999/12/15 14:49:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -44,32 +44,32 @@ G4int main(int argc, char** argv)
     
   if (argc < 2) {
     G4cerr << "clGeometry: Correct syntax: clGeometry <call_list_file> [ <macro_file> ]"
-	   << endl;
+	   << G4endl;
     G4cerr << "If only one argument is specified, interactive mode will be "
-	   << "entered." << endl << "The second argument, if specified, is "
-	   << "the name of the macro file (batch mode)." << endl;
+	   << "entered." << G4endl << "The second argument, if specified, is "
+	   << "the name of the macro file (batch mode)." << G4endl;
         
     return EXIT_FAILURE;
   }
   if (argc >= 2) {
     // Process the command line
     inFile = argv[1];
-    ifstream in(inFile);
+    G4std::ifstream in(inFile);
     if (!in) {
-      G4cerr << "Cannot open input file \"" << inFile << "\"" << endl;
+      G4cerr << "Cannot open input file \"" << inFile << "\"" << G4endl;
       return EXIT_FAILURE;
     }
   }
   if (argc >= 3) {
     macroFile = argv[2];
-    ifstream mac(macroFile);
+    G4std::ifstream mac(macroFile);
     if (!mac) {
-      G4cout << "Cannot open macro file """ << macroFile << """" << endl;
+      G4cout << "Cannot open macro file """ << macroFile << """" << G4endl;
       return 2;
     }
   }
   if (argc >= 4) {
-    G4cerr << "Too many command line arguments (" << argc <<")" << endl;
+    G4cerr << "Too many command line arguments (" << argc <<")" << G4endl;
     return EXIT_FAILURE;
   }
     
@@ -122,7 +122,7 @@ G4int main(int argc, char** argv)
     if (session != 0) {
       session->SessionStart();
       delete session;
-      //      G4cout << "deleted G4UITerminal..." << endl;
+      //      G4cout << "deleted G4UITerminal..." << G4endl;
     }
   }
   else {
diff --git a/source/g3tog4/test/cltog4.cc b/source/g3tog4/test/cltog4.cc
index 8bf25b32f2..18081bd63a 100644
--- a/source/g3tog4/test/cltog4.cc
+++ b/source/g3tog4/test/cltog4.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: cltog4.cc,v 1.6 1999/12/05 17:50:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: cltog4.cc,v 1.7 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 #include "G4ios.hh"
@@ -35,33 +35,33 @@ G4int main(int argc, char** argv)
   
   if (argc < 2) {
     G4cout << "Correct syntax:" << argv[0] << " <call_list_file> [ <macro_file> ]"
-	   << endl;
+	   << G4endl;
     G4cout << "If only one argument is specified, macro file " << macroFile
-	   << "will be used." << endl 
+	   << "will be used." << G4endl 
 	   << "The second argument is used to override the default macro file"
-	   << " name." << endl;
+	   << " name." << G4endl;
     
     return 1;
   }
   if (argc >= 2) {
     // Process the command line
     inFile = argv[1];
-    ifstream in(inFile);
+    G4std::ifstream in(inFile);
     if (!in) {
-      G4cout << "Cannot open input file """ << inFile << """" << endl;
+      G4cout << "Cannot open input file """ << inFile << """" << G4endl;
       return 1;
     }
   }
   if (argc >= 3) {
     macroFile = argv[2];
-    ifstream mac(macroFile);
+    G4std::ifstream mac(macroFile);
     if (!mac) {
-      G4cout << "Cannot open macro file """ << macroFile << """" << endl;
+      G4cout << "Cannot open macro file """ << macroFile << """" << G4endl;
       return 2;
     }
   }
   if (argc >= 4) {
-    G4cout << "Too many command line arguments (" << argc <<")" << endl;
+    G4cout << "Too many command line arguments (" << argc <<")" << G4endl;
     return 1;
   }
   // run manager
@@ -90,7 +90,7 @@ G4int main(int argc, char** argv)
     if (session != 0) {
       session->SessionStart();
       delete session;
-      //      G4cout << "deleted G4UITerminal..." << endl;
+      //      G4cout << "deleted G4UITerminal..." << G4endl;
     }
   }
   else {
diff --git a/source/g3tog4/test/include/G3toG4DetectorConstruction.hh b/source/g3tog4/test/include/G3toG4DetectorConstruction.hh
index afc37fe804..b4d88a383e 100644
--- a/source/g3tog4/test/include/G3toG4DetectorConstruction.hh
+++ b/source/g3tog4/test/include/G3toG4DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4DetectorConstruction.hh,v 1.3 1999/12/05 17:50:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G3toG4DetectorConstruction_h
 #define G3toG4DetectorConstruction_h 1
diff --git a/source/g3tog4/test/include/G3toG4EventAction.hh b/source/g3tog4/test/include/G3toG4EventAction.hh
index 5ad8fa7184..27989a1570 100644
--- a/source/g3tog4/test/include/G3toG4EventAction.hh
+++ b/source/g3tog4/test/include/G3toG4EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventAction.hh,v 1.3 1999/12/05 17:50:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/g3tog4/test/include/G3toG4EventActionMessenger.hh b/source/g3tog4/test/include/G3toG4EventActionMessenger.hh
index 184b149d7a..e8fbb5687c 100644
--- a/source/g3tog4/test/include/G3toG4EventActionMessenger.hh
+++ b/source/g3tog4/test/include/G3toG4EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.hh,v 1.2 1999/12/05 17:50:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/g3tog4/test/include/G3toG4PhysicsList.hh b/source/g3tog4/test/include/G3toG4PhysicsList.hh
index 1522b018be..1482812c37 100644
--- a/source/g3tog4/test/include/G3toG4PhysicsList.hh
+++ b/source/g3tog4/test/include/G3toG4PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PhysicsList.hh,v 1.4 1999/12/05 17:50:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/g3tog4/test/include/G3toG4PrimaryGeneratorAction.hh b/source/g3tog4/test/include/G3toG4PrimaryGeneratorAction.hh
index beb4129691..f57385da99 100644
--- a/source/g3tog4/test/include/G3toG4PrimaryGeneratorAction.hh
+++ b/source/g3tog4/test/include/G3toG4PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PrimaryGeneratorAction.hh,v 1.3 1999/12/05 17:50:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G3toG4PrimaryGeneratorAction_h
diff --git a/source/g3tog4/test/include/G3toG4RunAction.hh b/source/g3tog4/test/include/G3toG4RunAction.hh
index 55891c40eb..c4a744798a 100644
--- a/source/g3tog4/test/include/G3toG4RunAction.hh
+++ b/source/g3tog4/test/include/G3toG4RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RunAction.hh,v 1.3 1999/12/05 17:50:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G3toG4RunAction_h
diff --git a/source/g3tog4/test/include/G3toG4VisManager.hh b/source/g3tog4/test/include/G3toG4VisManager.hh
index c43c427c4c..ecced57e04 100644
--- a/source/g3tog4/test/include/G3toG4VisManager.hh
+++ b/source/g3tog4/test/include/G3toG4VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4VisManager.hh,v 1.2 1999/12/05 17:50:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/g3tog4/test/src/G3toG4DetectorConstruction.cc b/source/g3tog4/test/src/G3toG4DetectorConstruction.cc
index 562f3525ff..d368e0528b 100644
--- a/source/g3tog4/test/src/G3toG4DetectorConstruction.cc
+++ b/source/g3tog4/test/src/G3toG4DetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4DetectorConstruction.cc,v 1.6 1999/12/05 17:50:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4DetectorConstruction.cc,v 1.7 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //--------------------------------------------------------------------------
 // G3toG4DetectorConstruction. Most the work is Done in
@@ -25,11 +25,11 @@
 G3toG4DetectorConstruction::G3toG4DetectorConstruction(G4String inFile){
     _inFile = inFile;
     G4cout << "Instantiated G3toG4DetectorConstruction using call list file \""
-           << _inFile << "\"" << endl;
+           << _inFile << "\"" << G4endl;
 }
 
 G3toG4DetectorConstruction::~G3toG4DetectorConstruction(){
-  //    G4cout << "Deleted G3toG4DetectorConstruction..." << endl;
+  //    G4cout << "Deleted G3toG4DetectorConstruction..." << G4endl;
 }
 
 G4VPhysicalVolume*
@@ -40,9 +40,9 @@ G3toG4DetectorConstruction::Construct(){
     _pv = new G4PVPlacement(0, G4ThreeVector(), _lv, _lv->GetName(), 0,
 			    false, 0);
     G4cout << "Top-level G3toG4 logical volume " << _lv->GetName() << " "
-	   << *(_lv -> GetVisAttributes()) << endl;
+	   << *(_lv -> GetVisAttributes()) << G4endl;
   } else 
-    G4cerr << "creation of logical mother failed !!!" << endl;
+    G4cerr << "creation of logical mother failed !!!" << G4endl;
   return _pv;
 }
 G4LogicalVolume*
diff --git a/source/g3tog4/test/src/G3toG4EventAction.cc b/source/g3tog4/test/src/G3toG4EventAction.cc
index 9c795b4d25..8f8a07a605 100644
--- a/source/g3tog4/test/src/G3toG4EventAction.cc
+++ b/source/g3tog4/test/src/G3toG4EventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4EventAction.cc,v 1.6 1999/12/05 17:50:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4EventAction.cc,v 1.7 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -52,7 +52,7 @@ void G3toG4EventAction::EndOfEventAction(const G4Event* Ev)
 {
   const G4Event* evt = fpEventManager->GetConstCurrentEvent();
 
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
+  G4cout << ">>> Event " << evt->GetEventID() << G4endl;
   
   G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
   G4int n_trajectories = 0;
@@ -60,7 +60,7 @@ void G3toG4EventAction::EndOfEventAction(const G4Event* Ev)
     n_trajectories = trajectoryContainer->entries(); 
   }
   G4cout << "    " << n_trajectories 
-	 << " trajectories stored in this event." << endl;
+	 << " trajectories stored in this event." << G4endl;
 
   if(G4VVisManager::GetConcreteInstance()){
     for(G4int i=0; i<n_trajectories; i++) {
diff --git a/source/g3tog4/test/src/G3toG4EventActionMessenger.cc b/source/g3tog4/test/src/G3toG4EventActionMessenger.cc
index e8ad992cc7..7825dbc2f9 100644
--- a/source/g3tog4/test/src/G3toG4EventActionMessenger.cc
+++ b/source/g3tog4/test/src/G3toG4EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.cc,v 1.2 1999/12/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/g3tog4/test/src/G3toG4PhysicsList.cc b/source/g3tog4/test/src/G3toG4PhysicsList.cc
index 17e9d75cd2..2c8ad14915 100644
--- a/source/g3tog4/test/src/G3toG4PhysicsList.cc
+++ b/source/g3tog4/test/src/G3toG4PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4PhysicsList.cc,v 1.6 1999/12/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4PhysicsList.cc,v 1.7 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -226,7 +226,7 @@ void G3toG4PhysicsList::SetCuts()
     
   if (verboseLevel >0){
     G4cout << "G3toG4PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << endl;    
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;    
   }  
 
   // set cut values for gamma at first and for e- second and next for e+,
diff --git a/source/g3tog4/test/src/G3toG4PrimaryGeneratorAction.cc b/source/g3tog4/test/src/G3toG4PrimaryGeneratorAction.cc
index ab131689e3..d8bbe43b06 100644
--- a/source/g3tog4/test/src/G3toG4PrimaryGeneratorAction.cc
+++ b/source/g3tog4/test/src/G3toG4PrimaryGeneratorAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.3 1999/12/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.4 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "globals.hh"
@@ -39,7 +39,7 @@ G3toG4PrimaryGeneratorAction::~G3toG4PrimaryGeneratorAction(){
 void 
 G3toG4PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent){
   G4ThreeVector direction = GetRandomDirection();
-  G4cout << ">>>>>>>> Primary direction: " << direction << endl;
+  G4cout << ">>>>>>>> Primary direction: " << direction << G4endl;
   particleGun->SetParticleMomentumDirection( direction.unit() ) ;
   particleGun->GeneratePrimaryVertex(anEvent);
   particleGun->GeneratePrimaryVertex(anEvent);
diff --git a/source/g3tog4/test/src/G3toG4RunAction.cc b/source/g3tog4/test/src/G3toG4RunAction.cc
index 14849e0f21..7cccd093b6 100644
--- a/source/g3tog4/test/src/G3toG4RunAction.cc
+++ b/source/g3tog4/test/src/G3toG4RunAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4RunAction.cc,v 1.5 1999/12/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4RunAction.cc,v 1.6 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4ios.hh"
@@ -24,7 +24,7 @@ G3toG4RunAction::~G3toG4RunAction(){;}
 
 void G3toG4RunAction::BeginOfRunAction(const G4Run* aRun){
   ((G4Run *)(aRun))->SetRunID(runIDcounter++);
-  G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
+  G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
   
   G4UImanager* UI = G4UImanager::GetUIpointer(); 
   
diff --git a/source/g3tog4/test/src/G3toG4VisManager.cc b/source/g3tog4/test/src/G3toG4VisManager.cc
index f2ff066b25..4c39ea7a0c 100644
--- a/source/g3tog4/test/src/G3toG4VisManager.cc
+++ b/source/g3tog4/test/src/G3toG4VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3toG4VisManager.cc,v 1.3 1999/12/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G3toG4VisManager.cc,v 1.4 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -132,7 +132,7 @@ void G3toG4VisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/source/geometry/History b/source/geometry/History
index 74d6997836..e30c69015c 100644
--- a/source/geometry/History
+++ b/source/geometry/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 1999/05/21 19:38:32 japost Exp $
+$Id: History,v 1.9 2000/02/29 15:16:40 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,22 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Feb  29, 2000  Gabriele Cosmo                geometry-V01-00-00a
+
+- Minor fixes to unit tests (CSG) to make them up-to-date with recent
+  development versions.
+
+Jan  19, 2000  Gabriele Cosmo                geometry-V01-00-00
+
+- Sycronized file versions with HEAD after ISO-C++ migration.
+  Collecting subtags: field-V01-00-00, geomsolids-V01-00-00,
+                      geommng-V01-00-00 and geomvol-V01-00-00.
+
+===============================================================================
+  Geant4 1.0  , 1st STL-based release. 
+===============================================================================
+
 May  21,  98   John Apostolakis              geometry-01-00-05
 
 - Tagged.
diff --git a/source/geometry/benchmarks/BuildBoxWorld.hh b/source/geometry/benchmarks/BuildBoxWorld.hh
index 4bfc9649b5..dfd43d361b 100644
--- a/source/geometry/benchmarks/BuildBoxWorld.hh
+++ b/source/geometry/benchmarks/BuildBoxWorld.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: BuildBoxWorld.hh,v 1.1.8.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: BuildBoxWorld.hh,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef BUILDBOXWORLD_HH
 #define BUILDBOXWORLD_HH
diff --git a/source/geometry/benchmarks/BuildCalorimeter.hh b/source/geometry/benchmarks/BuildCalorimeter.hh
index a6a72487be..d366d8cb5e 100644
--- a/source/geometry/benchmarks/BuildCalorimeter.hh
+++ b/source/geometry/benchmarks/BuildCalorimeter.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: BuildCalorimeter.hh,v 1.1.8.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: BuildCalorimeter.hh,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef BUILDCALORIMETER_HH
 #define BUILDCALORIMETER_HH
diff --git a/source/geometry/benchmarks/GNUmakefile b/source/geometry/benchmarks/GNUmakefile
index e222af8e8d..b00990d39e 100644
--- a/source/geometry/benchmarks/GNUmakefile
+++ b/source/geometry/benchmarks/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/01/08 16:31:32 gunter Exp $
+# $Id: GNUmakefile,v 1.2 2000/02/29 09:46:21 gcosmo Exp $
 # ----------------------------------------------------------------
 # Makes test program in environment variable G4TARGET.
 # ----------------------------------------------------------------
@@ -23,12 +23,16 @@ INCFLAGS := -I$(G4BASE)/geometry/management/include \
             -I$(G4BASE)/global/management/include \
             -I$(G4BASE)/global/HEPRandom/include \
             -I$(G4BASE)/global/HEPGeometry/include \
-            -I$(G4BASE)/materials/include \
+	    -I$(G4BASE)/materials/include \
             -I$(G4BASE)/graphics_reps/include
 
-LDLIBS   := -lG4materials \
-            -lG4geometry \
-            -lG4global \
-            -lG4graphics_reps
+LDLIBS   := \
+	    -lG4csg \
+	    -lG4volumes \
+	    -lG4magneticfield \
+	    -lG4geometrymng \
+	    -lG4materials \
+            -lG4graphics_reps \
+            -lG4globman
 
 include $(G4INSTALL)/config/binmake.gmk
diff --git a/source/geometry/benchmarks/Shoot.hh b/source/geometry/benchmarks/Shoot.hh
index 1ac0d6edfb..48ee96df90 100644
--- a/source/geometry/benchmarks/Shoot.hh
+++ b/source/geometry/benchmarks/Shoot.hh
@@ -5,16 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Shoot.hh,v 1.1.8.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Shoot.hh,v 1.3 2000/02/29 09:45:59 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef SHOOT_HH
 #define SHOOT_HH
 
+#include "G4Timer.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4Navigator.hh"
 #include "G4ThreeVector.hh"
-#include "G4Timer.hh"
 #include "G4ios.hh"
 
 void Shoot(const G4int numShoot,
@@ -48,7 +48,7 @@ void Shoot(const G4int numShoot,
 		};
 	}
     timer.Stop();
-    G4cout << "Shots = " << numShoot << " " << timer << endl;
+    G4cout << "Shots = " << numShoot << " " << timer << G4endl;
 }
 
 void ShootVerbose(G4VPhysicalVolume *pTopNode,
@@ -59,20 +59,19 @@ void ShootVerbose(G4VPhysicalVolume *pTopNode,
     G4double safety,Step;
     G4Navigator myNav;
     G4ThreeVector partLoc;
-    G4VPhysicalVolume *located;
+    G4VPhysicalVolume *located=0;
 
     myNav.SetWorldVolume(pTopNode);
 
     partLoc=pSource;
-    //    located=myNav.LocateGlobalPointAndSetup(partLoc,false);
-    located=myNav.LocateGlobalPointAndSetup(partLoc,true);
+    located=myNav.LocateGlobalPointAndSetup(partLoc);
     while (located)
 	{
 	    Step=myNav.ComputeStep(partLoc,pVec,physStep,safety);
 	    G4cout << "Physical Location=" << located->GetName()
-		 << " #" << located->GetCopyNo() << endl
+		 << " #" << located->GetCopyNo() << G4endl
 	         << "   Step=" << Step << "  Safety=" << safety
-		 << "  ---->" << endl;
+		 << "  ---->" << G4endl;
 
 	    partLoc+=Step*pVec;
 	    myNav.SetGeometricallyLimitedStep();
diff --git a/source/geometry/benchmarks/calorimeter.cc b/source/geometry/benchmarks/calorimeter.cc
index 8a57bffbce..a396c96725 100644
--- a/source/geometry/benchmarks/calorimeter.cc
+++ b/source/geometry/benchmarks/calorimeter.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: calorimeter.cc,v 1.1.8.1 1999/12/07 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: calorimeter.cc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // calorimeter
 //
@@ -37,10 +37,10 @@ int main()
     G4VPhysicalVolume *myTopNode;
     G4Timer timer;
 
-    G4cout << "  Calorimeter Performance Test - P.Kent 21.08.95" << endl
-	 << "Using calorimeter from CERN School of Computing '95" << endl;
+    G4cout << "  Calorimeter Performance Test - P.Kent 21.08.95" << G4endl
+	 << "Using calorimeter from CERN School of Computing '95" << G4endl;
 #ifndef NDEBUG
-    G4cout << "WARNING: *** ASSERTs are compiled IN ***" << endl;
+    G4cout << "WARNING: *** ASSERTs are compiled IN ***" << G4endl;
 #endif
 
     myTopNode=BuildCalorimeter();	// Build the geometry
@@ -56,13 +56,13 @@ int main()
 	{
 	    G4cout << "Optimisation OFF";
 	}
-    G4cout << " Geometry close took " << timer << endl;
+    G4cout << " Geometry close took " << timer << G4endl;
 
 #ifdef G4GEOMETRY_VERBOSE
-    G4cout << endl << "Voxels for:" 
-	 << G4LogicalVolumeStore::GetInstance()->at(1)->GetName() << endl
+    G4cout << G4endl << "Voxels for:" 
+	 << G4LogicalVolumeStore::GetInstance()->at(1)->GetName() << G4endl
 	<< *G4LogicalVolumeStore::GetInstance()->at(1)->GetVoxelHeader()
-	<< endl;
+	<< G4endl;
 #endif
     G4SmartVoxelHeader* top=G4LogicalVolumeStore::GetInstance()
 	                   ->at(1)->GetVoxelHeader();
@@ -72,27 +72,27 @@ int main()
 	    switch (top->GetAxis())
 		{
 		case kXAxis:
-		    G4cout << "X" << endl;
+		    G4cout << "X" << G4endl;
 		    break;
 		case kYAxis:
-		    G4cout << "Y" << endl;
+		    G4cout << "Y" << G4endl;
 		    break;
 		case kZAxis:
-		    G4cout << "Z" << endl;
+		    G4cout << "Z" << G4endl;
 		    break;
 		    
 		}
 	}
 
-    G4cout << endl << "Shooting from " << origin << " along " << vx << endl;
+    G4cout << G4endl << "Shooting from " << origin << " along " << vx << G4endl;
     ShootVerbose(myTopNode,origin,vx);
     Shoot(numShoot,myTopNode,origin,vx);
 
-    G4cout << endl << "Shooting from " << origin << " along " << vy << endl;
+    G4cout << G4endl << "Shooting from " << origin << " along " << vy << G4endl;
     ShootVerbose(myTopNode,origin,vy);
     Shoot(numShoot,myTopNode,origin,vy);
 
-    G4cout << endl << "Shooting from " << origin << " along " << vxy << endl;
+    G4cout << G4endl << "Shooting from " << origin << " along " << vxy << G4endl;
     ShootVerbose(myTopNode,origin,vxy);
     Shoot(numShoot,myTopNode,origin,vxy);
 
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4Box.cc b/source/geometry/benchmarks/f77cppcomparison/G4Box.cc
index 60bad91ea4..505260dbed 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4Box.cc
+++ b/source/geometry/benchmarks/f77cppcomparison/G4Box.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Box.cc,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Box.cc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Implementation for G4Box class
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4Box.hh b/source/geometry/benchmarks/f77cppcomparison/G4Box.hh
index 566a48e0f6..9523138508 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4Box.hh
+++ b/source/geometry/benchmarks/f77cppcomparison/G4Box.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Box.hh,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Box.hh,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Box
 //
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4Box_fastfabs.cc b/source/geometry/benchmarks/f77cppcomparison/G4Box_fastfabs.cc
index 41d550ac3d..0b58a3d0b6 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4Box_fastfabs.cc
+++ b/source/geometry/benchmarks/f77cppcomparison/G4Box_fastfabs.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Box_fastfabs.cc,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Box_fastfabs.cc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Implementation for G4Box class
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.hh b/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.hh
index 98319f4e06..c7da3d849c 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.hh
+++ b/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RotationMatrix.hh,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RotationMatrix.hh,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Rotation Matrix class, converted from CLHEP:
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.icc b/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.icc
index 9118f42949..64896db4b0 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.icc
+++ b/source/geometry/benchmarks/f77cppcomparison/G4RotationMatrix.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RotationMatrix.icc,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RotationMatrix.icc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Inline functions for class G4RotationMatrix
 // Converted from CLHEP:
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.hh b/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.hh
index 24302bb058..4dc54e4e44 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.hh
+++ b/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ThreeVector.hh,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ThreeVector.hh,v 1.3 1999/12/15 17:17:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ThreeVector class, converted from CLHEP:
@@ -20,8 +20,7 @@
 
 #include "globals.hh"
 #include "geomdefs.hh"
-
-class ostream;
+#include "g4std/iostream"
 
 class G4ThreeVector {
 
@@ -152,7 +151,7 @@ private:
 
 };
 
-ostream & operator << (ostream &, const G4ThreeVector &);
+G4std::ostream & operator << (G4std::ostream &, const G4ThreeVector &);
 // output to a stream
 
 
diff --git a/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.icc b/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.icc
index af61aef047..92e6fbbdd0 100644
--- a/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.icc
+++ b/source/geometry/benchmarks/f77cppcomparison/G4ThreeVector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ThreeVector.icc,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ThreeVector.icc,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Inline functions for class G4ThreeVector
diff --git a/source/geometry/benchmarks/f77cppcomparison/boxtoincpp.cc b/source/geometry/benchmarks/f77cppcomparison/boxtoincpp.cc
index b79521414b..49a8467ccf 100644
--- a/source/geometry/benchmarks/f77cppcomparison/boxtoincpp.cc
+++ b/source/geometry/benchmarks/f77cppcomparison/boxtoincpp.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: boxtoincpp.cc,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: boxtoincpp.cc,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4ios.hh"
diff --git a/source/geometry/benchmarks/f77cppcomparison/geomdefs.hh b/source/geometry/benchmarks/f77cppcomparison/geomdefs.hh
index b767f6e010..733e2e6a51 100644
--- a/source/geometry/benchmarks/f77cppcomparison/geomdefs.hh
+++ b/source/geometry/benchmarks/f77cppcomparison/geomdefs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: geomdefs.hh,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: geomdefs.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // Constants, typedefs, enums for Geometry Section
diff --git a/source/geometry/benchmarks/f77cppcomparison/globals.hh b/source/geometry/benchmarks/f77cppcomparison/globals.hh
index 172b61c360..bc7001950f 100644
--- a/source/geometry/benchmarks/f77cppcomparison/globals.hh
+++ b/source/geometry/benchmarks/f77cppcomparison/globals.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: globals.hh,v 1.1.8.1 1999/12/07 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: globals.hh,v 1.3 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // Global Constants and typedefs
@@ -26,7 +26,7 @@ typedef int G4int;
 
 // Typedefs to decouple from library classes
 //#include <rw/cstring.h>
-//typedef RWCString G4String;
+//typedef G4String G4String;
 
 // Boolean - define G4_HAVE_BOOL if bool type available
 #ifdef G4_HAVE_BOOL
diff --git a/source/geometry/benchmarks/replicaCal.cc b/source/geometry/benchmarks/replicaCal.cc
index e945f050af..22c5844a0b 100644
--- a/source/geometry/benchmarks/replicaCal.cc
+++ b/source/geometry/benchmarks/replicaCal.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: replicaCal.cc,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: replicaCal.cc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
@@ -106,9 +106,9 @@ int main()
   G4VPhysicalVolume *myTopNode;
   G4Timer timer;
 
-  G4cout << "  Replication Performance Test - P.Kent 26.09.96" << endl;
+  G4cout << "  Replication Performance Test - P.Kent 26.09.96" << G4endl;
 #ifndef NDEBUG
-  G4cout << "WARNING: *** ASSERTs are compiled IN ***" << endl;
+  G4cout << "WARNING: *** ASSERTs are compiled IN ***" << G4endl;
 #endif
 
   myTopNode=BuildReplicaCal(NULL);	// Build the geometry
@@ -124,9 +124,9 @@ int main()
     {
       G4cout << "Optimisation OFF";
     }
-  G4cout << " Geometry close took " << timer << endl;
+  G4cout << " Geometry close took " << timer << G4endl;
   
-  G4cout << endl << "Shooting from " << pos << " along " << dir << endl;
+  G4cout << G4endl << "Shooting from " << pos << " along " << dir << G4endl;
   ShootVerbose(myTopNode,pos,dir);
   Shoot(numShoot,myTopNode,pos,dir);
 
diff --git a/source/geometry/benchmarks/shooter.cc b/source/geometry/benchmarks/shooter.cc
index 83f21344db..54678320e5 100644
--- a/source/geometry/benchmarks/shooter.cc
+++ b/source/geometry/benchmarks/shooter.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: shooter.cc,v 1.1.8.1 1999/12/07 20:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: shooter.cc,v 1.2 1999/12/15 14:49:45 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // shooter - perform test shots through simple box world.
 //
@@ -29,23 +29,23 @@ int main()
     G4ThreeVector vy(0,1,0);
     G4VPhysicalVolume *myTopNode;
 
-    G4cout << "Simple BoxWorld Performance Test - P.Kent 21.08.95" << endl;
+    G4cout << "Simple BoxWorld Performance Test - P.Kent 21.08.95" << G4endl;
 #ifndef NDEBUG
-    G4cout << "WARNING: *** ASSERTs are compiled IN ***" << endl;
+    G4cout << "WARNING: *** ASSERTs are compiled IN ***" << G4endl;
 #endif
 
     myTopNode=BuildBoxWorld();	// Build the geometry
     G4GeometryManager::GetInstance()->CloseGeometry();
 
-    G4cout << endl << "Shooting from " << origin << " along " << vx << endl;
+    G4cout << G4endl << "Shooting from " << origin << " along " << vx << G4endl;
     ShootVerbose(myTopNode,origin,vx);
     Shoot(numShoot,myTopNode,origin,vx);
 
-    G4cout << endl << "Shooting from " << origin << " along " << vy << endl;
+    G4cout << G4endl << "Shooting from " << origin << " along " << vy << G4endl;
     ShootVerbose(myTopNode,origin,vy);
     Shoot(numShoot,myTopNode,origin,vy);
 
-    G4cout << endl << "Shooting from " << pMX << " along " << vx << endl;
+    G4cout << G4endl << "Shooting from " << pMX << " along " << vx << G4endl;
     ShootVerbose(myTopNode,pMX,vx);
     Shoot(numShoot,myTopNode,pMX,vx);
 
diff --git a/source/geometry/magneticfield/History b/source/geometry/magneticfield/History
index 0c1582450f..a96def55a7 100644
--- a/source/geometry/magneticfield/History
+++ b/source/geometry/magneticfield/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 1999/12/07 11:42:04 japost Exp $
+$Id: History,v 1.16 2000/01/20 10:51:11 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,9 +17,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+January  19th, 2000   G. Cosmo - field-V01-00-00
+
+Syncronized versioning of files with HEAD after ISO-C++ migration
+(essentially CVS header changes).
+
 December  7th, 1999   J. Apostolakis - field-V00-01-01a
 
-  For negative or very small curve lengths (h) we suppress writing an error
+For negative or very small curve lengths (h) we suppress writing an error
 (about the distance of endpoints being further than the curve length),
 as it is meaningless.
 
diff --git a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
index 855a6d482c..b8fc21ab4e 100644
--- a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
+++ b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CashKarpRKF45.hh,v 1.1.10.1 1999/12/07 20:47:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CashKarpRKF45.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // J.Apostolakis, V.Grichine 30.1.97
diff --git a/source/geometry/magneticfield/include/G4ChordFinder.hh b/source/geometry/magneticfield/include/G4ChordFinder.hh
index e7ee320e80..e13d91e46d 100644
--- a/source/geometry/magneticfield/include/G4ChordFinder.hh
+++ b/source/geometry/magneticfield/include/G4ChordFinder.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ChordFinder.hh,v 1.1.10.1 1999/12/07 20:47:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ChordFinder.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------------
diff --git a/source/geometry/magneticfield/include/G4ClassicalRK4.hh b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
index c2f834f92b..ffd3ca2586 100644
--- a/source/geometry/magneticfield/include/G4ClassicalRK4.hh
+++ b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ClassicalRK4.hh,v 1.1.10.1 1999/12/07 20:47:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ClassicalRK4.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // J.Apostolakis, V.Grichine 30.1.97
diff --git a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
index c9559721fd..c78b0086cb 100644
--- a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
+++ b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ElectroMagneticField.hh,v 1.1.10.1 1999/12/07 20:47:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ElectroMagneticField.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  A full Electromagnetic field, containing both electric and magnetic fields.
diff --git a/source/geometry/magneticfield/include/G4EqMagElectricField.hh b/source/geometry/magneticfield/include/G4EqMagElectricField.hh
index c8f5dfea91..b3faa09d88 100644
--- a/source/geometry/magneticfield/include/G4EqMagElectricField.hh
+++ b/source/geometry/magneticfield/include/G4EqMagElectricField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EqMagElectricField.hh,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EqMagElectricField.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  This is the right-hand side of equation of motion in a combined
 //   electric and magnetic field.
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.hh b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
index 9633420860..bc5fab4ffd 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.hh
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EquationOfMotion.hh,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EquationOfMotion.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Abstract Base Class for:
 //
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.icc b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
index a67435f29a..b50c99bc89 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.icc
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EquationOfMotion.icc,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EquationOfMotion.icc,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Inline implementation 
diff --git a/source/geometry/magneticfield/include/G4ExplicitEuler.hh b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
index ec9a88621a..ca2cf59bff 100644
--- a/source/geometry/magneticfield/include/G4ExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExplicitEuler.hh,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExplicitEuler.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4Field.hh b/source/geometry/magneticfield/include/G4Field.hh
index fcbac67991..b83a729f47 100644
--- a/source/geometry/magneticfield/include/G4Field.hh
+++ b/source/geometry/magneticfield/include/G4Field.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Field.hh,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Field.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  G4Field:
diff --git a/source/geometry/magneticfield/include/G4FieldManager.hh b/source/geometry/magneticfield/include/G4FieldManager.hh
index 2b213d417f..7b435b4acb 100644
--- a/source/geometry/magneticfield/include/G4FieldManager.hh
+++ b/source/geometry/magneticfield/include/G4FieldManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldManager.hh,v 1.1.10.1 1999/12/07 20:47:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FieldManager.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 // 
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.hh b/source/geometry/magneticfield/include/G4FieldTrack.hh
index bf238679d2..0142eca4c1 100644
--- a/source/geometry/magneticfield/include/G4FieldTrack.hh
+++ b/source/geometry/magneticfield/include/G4FieldTrack.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldTrack.hh,v 1.1.10.1 1999/12/07 20:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FieldTrack.hh,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //  Data structure bringing together a magnetic track's state.
@@ -88,7 +88,7 @@ class  G4FieldTrack{
      void DumpToArray(   G4double valArr[ncompSVEC] ) const; 
      void LoadFromArray( const G4double valArr[ncompSVEC] ); 
      
-     friend  ostream& operator<<( ostream& os, G4FieldTrack& SixVec);
+     friend  G4std::ostream& operator<<( G4std::ostream& os, G4FieldTrack& SixVec);
 
    private:
      G4double  SixVector[6];
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.icc b/source/geometry/magneticfield/include/G4FieldTrack.icc
index 1c1e97fb9c..44865ae1e6 100644
--- a/source/geometry/magneticfield/include/G4FieldTrack.icc
+++ b/source/geometry/magneticfield/include/G4FieldTrack.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldTrack.icc,v 1.1.10.1 1999/12/07 20:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FieldTrack.icc,v 1.2 1999/12/15 14:49:46 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "PhysicalConstants.h"
 
diff --git a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
index 4ca2c1f55d..9beb0d4fdd 100644
--- a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixExplicitEuler.hh,v 1.1.10.1 1999/12/07 20:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixExplicitEuler.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4HelixHeum.hh b/source/geometry/magneticfield/include/G4HelixHeum.hh
index d7bb8ae374..93aa201505 100644
--- a/source/geometry/magneticfield/include/G4HelixHeum.hh
+++ b/source/geometry/magneticfield/include/G4HelixHeum.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixHeum.hh,v 1.1.10.1 1999/12/07 20:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixHeum.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 03/11/98
diff --git a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
index e5466336ed..dc252cd9c4 100644
--- a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixImplicitEuler.hh,v 1.1.10.1 1999/12/07 20:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixImplicitEuler.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 03/11/98
diff --git a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
index 81a864e0b5..7ba90ef6af 100644
--- a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixSimpleRunge.hh,v 1.1.10.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixSimpleRunge.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 03/12/98
diff --git a/source/geometry/magneticfield/include/G4ImplicitEuler.hh b/source/geometry/magneticfield/include/G4ImplicitEuler.hh
index 8fd63a5b48..a0d8fea998 100644
--- a/source/geometry/magneticfield/include/G4ImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ImplicitEuler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ImplicitEuler.hh,v 1.1.10.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ImplicitEuler.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4LineSection.hh b/source/geometry/magneticfield/include/G4LineSection.hh
index 7a491fcc26..a9a1b4c506 100644
--- a/source/geometry/magneticfield/include/G4LineSection.hh
+++ b/source/geometry/magneticfield/include/G4LineSection.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LineSection.hh,v 1.1.10.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LineSection.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  A utility class that calculates the distance of a point from a 
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.hh b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
index 6a947bc530..4cbe65b730 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagErrorStepper.hh,v 1.4.8.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagErrorStepper.hh,v 1.5 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Abstract base class (ie Interface)
 // -------------------
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.icc b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
index ee3b00514a..c582e9d76d 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagErrorStepper.icc,v 1.4.8.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagErrorStepper.icc,v 1.6 2000/03/03 12:09:13 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 inline G4MagErrorStepper::G4MagErrorStepper(G4Mag_EqRhs *EqRhs,
@@ -18,7 +18,7 @@ inline G4MagErrorStepper::G4MagErrorStepper(G4Mag_EqRhs *EqRhs,
       dydxMid=     new G4double[nvar];
       yInitial=    new G4double[nvar];
       yOneStep= new G4double[nvar];
-  };
+  }
 
 inline G4MagErrorStepper::~G4MagErrorStepper()
   {
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
index 3007864b89..28261d505e 100644
--- a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagHelicalStepper.hh,v 1.1.10.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagHelicalStepper.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //                                         Started from G4MagErrorStepper.hh
 //
 // Abstract base class (ie Interface)
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
index 51db80df83..ce119af4fa 100644
--- a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagHelicalStepper.icc,v 1.1.10.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagHelicalStepper.icc,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // linear Step in regions of no field
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
index 3b74955378..c02f2ce186 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorDriver.hh,v 1.3.6.1 1999/12/07 20:48:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorDriver.hh,v 1.5 1999/12/15 18:15:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  Provides Driver that talks to Integrator Stepper, and insures that 
 //  the error is within acceptable bounds.
@@ -152,8 +152,8 @@ private:
       G4double pgrow;    //  exponent for growth
       G4double errcon;
       //  maximum stepsize increase/decrease factors
-      const static G4double max_stepping_increase;
-      const static G4double max_stepping_decrease;
+      static const G4double max_stepping_increase;
+      static const G4double max_stepping_decrease;
 };
 
 #include "G4MagIntegratorDriver.icc"
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
index 8b47c7e802..6baa4db3d7 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorDriver.icc,v 1.2.6.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorDriver.icc,v 1.3 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 inline G4double G4MagInt_Driver::ComputeAndSetErrcon()
 {
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
index 1b50ea0bfd..3259e3d068 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorStepper.hh,v 1.2.8.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorStepper.hh,v 1.3 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Abstract base class (ie Interface)
 // -------------------
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
index eaa94be408..59c492ded0 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorStepper.icc,v 1.2.8.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorStepper.icc,v 1.3 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 inline G4EquationOfMotion* G4MagIntegratorStepper::GetEquationOfMotion() const
  { return  fEquation_Rhs; } 
diff --git a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
index 373f1b6cad..8f05eef98e 100644
--- a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Mag_EqRhs.hh,v 1.2.8.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Mag_EqRhs.hh,v 1.3 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // The right hand size of the equation of motion of a particle 
diff --git a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
index 697c689d92..f3bd876af6 100644
--- a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Mag_UsualEqRhs.hh,v 1.1.10.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Mag_UsualEqRhs.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  This is the standard right-hand side for equation of motion.
diff --git a/source/geometry/magneticfield/include/G4MagneticField.hh b/source/geometry/magneticfield/include/G4MagneticField.hh
index 45b01aa566..8e00261806 100644
--- a/source/geometry/magneticfield/include/G4MagneticField.hh
+++ b/source/geometry/magneticfield/include/G4MagneticField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagneticField.hh,v 1.1.10.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagneticField.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Magnetic Field abstract class,  implements inquiry function interface.
diff --git a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
index 0fba2b2058..51deffe259 100644
--- a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
+++ b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RKG3_Stepper.hh,v 1.2.8.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RKG3_Stepper.hh,v 1.3 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // J.Apostolakis, V.Grichine 30.01.97
diff --git a/source/geometry/magneticfield/include/G4SimpleHeum.hh b/source/geometry/magneticfield/include/G4SimpleHeum.hh
index 99fb3fb680..9b731e12b6 100644
--- a/source/geometry/magneticfield/include/G4SimpleHeum.hh
+++ b/source/geometry/magneticfield/include/G4SimpleHeum.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SimpleHeum.hh,v 1.1.10.1 1999/12/07 20:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SimpleHeum.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4SimpleRunge.hh b/source/geometry/magneticfield/include/G4SimpleRunge.hh
index c3f03e4039..9640090ace 100644
--- a/source/geometry/magneticfield/include/G4SimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4SimpleRunge.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SimpleRunge.hh,v 1.1.10.1 1999/12/07 20:48:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SimpleRunge.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4UniformElectricField.hh b/source/geometry/magneticfield/include/G4UniformElectricField.hh
index ac7ea4aebd..3a5ccf0757 100644
--- a/source/geometry/magneticfield/include/G4UniformElectricField.hh
+++ b/source/geometry/magneticfield/include/G4UniformElectricField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UniformElectricField.hh,v 1.1.10.1 1999/12/07 20:48:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UniformElectricField.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/include/G4UniformMagField.hh b/source/geometry/magneticfield/include/G4UniformMagField.hh
index 767a1192c7..0857b8214f 100644
--- a/source/geometry/magneticfield/include/G4UniformMagField.hh
+++ b/source/geometry/magneticfield/include/G4UniformMagField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UniformMagField.hh,v 1.1.10.1 1999/12/07 20:48:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UniformMagField.hh,v 1.2 1999/12/15 14:49:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
index 044777026d..0dbd3f90eb 100644
--- a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
+++ b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CashKarpRKF45.cc,v 1.3.8.1 1999/12/07 20:48:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CashKarpRKF45.cc,v 1.4 1999/12/15 14:49:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // The Cash-Karp Runge-Kutta-Fehlberg 4/5 method is an embedded fourth
 //  order method (giving fifth-order accuracy) for the solution
diff --git a/source/geometry/magneticfield/src/G4ChordFinder.cc b/source/geometry/magneticfield/src/G4ChordFinder.cc
index 14d402c515..ec20e07ab6 100644
--- a/source/geometry/magneticfield/src/G4ChordFinder.cc
+++ b/source/geometry/magneticfield/src/G4ChordFinder.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ChordFinder.cc,v 1.8.6.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ChordFinder.cc,v 1.9 1999/12/15 14:49:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // 25.02.97 John Apostolakis,  design and implimentation 
@@ -81,7 +81,7 @@ G4ChordFinder::AdvanceChordLimited(   G4FieldTrack& yCurrent,
 #ifdef G4VERBOSE
   if( dbg ) 
     G4cerr << "Entered FindNextChord Limited with:\n yCurrent: " << yCurrent
-	   << " and initial Step=stepMax=" <<  stepMax << " mm. " << endl;
+	   << " and initial Step=stepMax=" <<  stepMax << " mm. " << G4endl;
 #endif
 
   stepPossible= FindNextChord(yCurrent, stepMax, yEnd, dyErr, epsStep);
@@ -98,7 +98,7 @@ G4ChordFinder::AdvanceChordLimited(   G4FieldTrack& yCurrent,
      good_advance = fIntgrDriver->AccurateAdvance(yCurrent, stepPossible, epsStep);
      #ifdef G4VERBOSE
      if (dbg) G4cerr << "Accurate advance to end of chord attemped"
-		       << "with result " << good_advance << endl ;
+		       << "with result " << good_advance << G4endl ;
      #endif
      if ( ! good_advance ){ 
        // In this case the driver could not do the full distance
@@ -108,7 +108,7 @@ G4ChordFinder::AdvanceChordLimited(   G4FieldTrack& yCurrent,
 
 #ifdef G4VERBOSE
   if( dbg ) G4cerr << "Exiting FindNextChord Limited with:\n yCurrent: " 
-		 << yCurrent<< endl; 
+		 << yCurrent<< G4endl; 
 #endif
 
   return stepPossible;
@@ -147,8 +147,8 @@ G4ChordFinder::FindNextChord( const  G4FieldTrack  yStart,
 
 #ifdef G4VERBOSE
      if( dbg ) {
-        G4cerr << "Returned from QuickAdvance with: yCur=" << yCurrent << endl;
-        G4cerr << " dChordStep= "<< dChordStep <<" dyErr=" << dyErr << endl; 
+        G4cerr << "Returned from QuickAdvance with: yCur=" << yCurrent << G4endl;
+        G4cerr << " dChordStep= "<< dChordStep <<" dyErr=" << dyErr << G4endl; 
      }
 #endif
 
@@ -164,7 +164,7 @@ G4ChordFinder::FindNextChord( const  G4FieldTrack  yStart,
 	 // stepTrial= fIntgrDriver->ComputeNewStepSize( dyErr/epsStep, stepTrial);
 #ifdef G4VERBOSE
 	 if( dbg ) 
-	   G4cerr << "Dchord too big. Trying new hstep=" << stepTrial << endl;
+	   G4cerr << "Dchord too big. Trying new hstep=" << stepTrial << G4endl;
 #endif
      }
  
@@ -240,20 +240,20 @@ G4FieldTrack G4ChordFinder::ApproxCurvePointV(
        CurveB_PointVelocity.CurveS() - CurveA_PointVelocity.CurveS();  
 
   // const 
-  G4double  integrationInaccuracyLimit= max( perMillion, 0.5*eps_step ); 
+  G4double  integrationInaccuracyLimit= G4std::max( perMillion, 0.5*eps_step ); 
   if( curve_length < ABdist * (1. - integrationInaccuracyLimit) ){ 
 //  #ifdef G4DEBUG
-    G4cerr << " Warning in G4ChordFinder::ApproxCurvePoint: " << endl <<
-      " The two points are further apart than the curve length " << endl <<
+    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 
-	   << endl;
+	   << G4endl;
 //  #endif
     if( curve_length < ABdist * (1. - 10*eps_step) ) {
 //    #ifdef G4DEBUG
       G4cerr << " ERROR: the size of the above difference exceeds allowed limits.  Aborting." 
-	     << endl;
+	     << G4endl;
 //    #endif
       G4Exception("G4ChordFinder::ApproxCurvePoint> Unphysical curve length.");
     }
@@ -269,17 +269,17 @@ G4FieldTrack G4ChordFinder::ApproxCurvePointV(
      AE_fraction = ChordAE_Vector.mag() / ABdist;
   }else{
      G4cerr << " Error in G4ChordFinder::ApproxCurvePoint: A and B are the same point\n" <<
-      " Chord AB length = " << ChordAE_Vector.mag()  << endl << endl;
+      " Chord AB length = " << ChordAE_Vector.mag()  << G4endl << G4endl;
      AE_fraction = 0.5;                         // Guess .. ?; 
   }
   
   if( (AE_fraction> 1.0 + perMillion) || (AE_fraction< 0.) ){
-    G4cerr << " G4ChordFinder::ApproxCurvePointV: Warning: Anomalous condition:AE > AB or AE/AB <= 0 " << endl <<
-      "   AE_fraction = " <<  AE_fraction << endl <<
-      "   Chord AE length = " << ChordAE_Vector.mag()  << endl << 
-      "   Chord AB length = " << ABdist << endl << endl;
-    G4cerr << " OK if this condition occurs after a recalculation of 'B'" << endl
-	   << " Otherwise it is an error. " << endl ; 
+    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 ; 
      // 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
diff --git a/source/geometry/magneticfield/src/G4ClassicalRK4.cc b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
index afc086fca2..7c602ffcd6 100644
--- a/source/geometry/magneticfield/src/G4ClassicalRK4.cc
+++ b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ClassicalRK4.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ClassicalRK4.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4ClassicalRK4.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4EquationOfMotion.cc b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
index ad38263752..bea76a629b 100644
--- a/source/geometry/magneticfield/src/G4EquationOfMotion.cc
+++ b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EquationOfMotion.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EquationOfMotion.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4EquationOfMotion.hh"
 
diff --git a/source/geometry/magneticfield/src/G4ExplicitEuler.cc b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
index 0cfc2a2e05..ef47748402 100644
--- a/source/geometry/magneticfield/src/G4ExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExplicitEuler.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExplicitEuler.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Explicit Euler: x_1 = x_0 + h * dx_0
diff --git a/source/geometry/magneticfield/src/G4FieldManager.cc b/source/geometry/magneticfield/src/G4FieldManager.cc
index c0344355c8..39a628cf4d 100644
--- a/source/geometry/magneticfield/src/G4FieldManager.cc
+++ b/source/geometry/magneticfield/src/G4FieldManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldManager.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FieldManager.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4FieldManager.hh"
 
diff --git a/source/geometry/magneticfield/src/G4FieldTrack.cc b/source/geometry/magneticfield/src/G4FieldTrack.cc
index 6c8999dbad..1c534134e9 100644
--- a/source/geometry/magneticfield/src/G4FieldTrack.cc
+++ b/source/geometry/magneticfield/src/G4FieldTrack.cc
@@ -5,12 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldTrack.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FieldTrack.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4FieldTrack.hh"
 
-ostream& operator<<( ostream& os, G4FieldTrack& SixVec)
+G4std::ostream& operator<<( G4std::ostream& os, G4FieldTrack& SixVec)
 {
      G4double *SixV = SixVec.SixVector;
      os << " X= " << SixV[0] << " " << SixV[1] << " " << SixV[2] << " ";
diff --git a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
index 6091a1c57a..d7bf2d8477 100644
--- a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixExplicitEuler.cc,v 1.1.10.1 1999/12/07 20:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixExplicitEuler.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4HelixExplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixHeum.cc b/source/geometry/magneticfield/src/G4HelixHeum.cc
index 689160d8ca..dc4d8df74d 100644
--- a/source/geometry/magneticfield/src/G4HelixHeum.cc
+++ b/source/geometry/magneticfield/src/G4HelixHeum.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixHeum.cc,v 1.1.10.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixHeum.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4HelixHeum.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
index 0a5b22d84c..a6ab4343d4 100644
--- a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixImplicitEuler.cc,v 1.1.10.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixImplicitEuler.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4HelixImplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
index 8a6c95580a..75de0db51b 100644
--- a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HelixSimpleRunge.cc,v 1.1.10.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HelixSimpleRunge.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4HelixSimpleRunge.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4ImplicitEuler.cc b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
index c82e89d519..e5836c7533 100644
--- a/source/geometry/magneticfield/src/G4ImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ImplicitEuler.cc,v 1.1.10.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ImplicitEuler.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  Implicit Euler:
diff --git a/source/geometry/magneticfield/src/G4LineSection.cc b/source/geometry/magneticfield/src/G4LineSection.cc
index ecf1215046..60f029f0dc 100644
--- a/source/geometry/magneticfield/src/G4LineSection.cc
+++ b/source/geometry/magneticfield/src/G4LineSection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LineSection.cc,v 1.1.10.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LineSection.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // typedef double    G4double;  
 #include "G4LineSection.hh" 
diff --git a/source/geometry/magneticfield/src/G4MagErrorStepper.cc b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
index 55f522d43d..ac889a5656 100644
--- a/source/geometry/magneticfield/src/G4MagErrorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagErrorStepper.cc,v 1.5.8.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagErrorStepper.cc,v 1.6 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4MagErrorStepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
index a6d92391d9..4822f06354 100644
--- a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagHelicalStepper.cc,v 1.2.8.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagHelicalStepper.cc,v 1.3 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4MagHelicalStepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
index 94a3921c39..8828a1d43e 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorDriver.cc,v 1.9.2.1 1999/12/07 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorDriver.cc,v 1.10 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
@@ -89,7 +89,7 @@ G4MagInt_Driver::AccurateAdvance(
 
   G4bool  lastStep= false;
   nstp=1;
-  G4double  lastStepThreshold = min( eps * hstep, Hmin() ); 
+  G4double  lastStepThreshold = G4std::min( eps * hstep, Hmin() ); 
 
   do{
      G4ThreeVector StartPos( y[0], y[1], y[2] );   
@@ -176,11 +176,11 @@ G4MagInt_Driver::WarnSmallStepSize( G4double hnext, G4double hstep,
   if( noWarningsIssued < maxNoWarnings ){
     G4cerr<< " Warning (G4MagIntegratorDriver): The stepsize for the " 
 	  << " next iteration=" << hnext << " is too small - in Step number "
-	  << nstp << "." << endl;
-    G4cerr << "     Requested step size was " << hstep << " ." << endl ;
-    G4cerr << "     Previous  step size was " << h     << " ." << endl ;
-    G4cerr << "     The minimum for the driver is " << Hmin()  << endl ;
-    G4cerr << "     The integrations has already gone " << xDone << endl ;
+	  << nstp << "." << G4endl;
+    G4cerr << "     Requested step size was " << hstep << " ." << G4endl ;
+    G4cerr << "     Previous  step size was " << h     << " ." << G4endl ;
+    G4cerr << "     The minimum for the driver is " << Hmin()  << G4endl ;
+    G4cerr << "     The integrations has already gone " << xDone << G4endl ;
   }
   noWarningsIssued++;
 }
@@ -192,10 +192,10 @@ G4MagInt_Driver::WarnTooManyStep( G4double x1start,
 {
     G4cerr << " Warning (G4MagIntegratorDriver): The number of steps " 
          << "used in the Integration driver (Runge-Kutta) is too many.  "
-	 << endl ;
+	 << G4endl ;
     G4cerr << "Integration of the interval was not completed - only a " 
          << (xCurrent-x1start)*100/(x2end-x1start)
-	   <<" % fraction of it was Done." << endl;
+	   <<" % fraction of it was Done." << G4endl;
 }
 
 void
@@ -219,20 +219,20 @@ G4MagInt_Driver::WarnEndPointTooFar (G4double endPointDist,
            static G4int noWarnings = 0;
            if( (noWarnings ++ < 10) || (dbg>1) ){
  	      G4cerr << " Warning (G4MagIntegratorDriver): "
-		     << " The integration produced an endpoint which " << endl
-		     << "   is further from the startpoint than the curve length." << endl; 
+		     << " The integration produced an endpoint which " << G4endl
+		     << "   is further from the startpoint than the curve length." << G4endl; 
           
 	      G4cerr << "   Distance of endpoints = " << endPointDist
 		     << "  curve length = " <<  h
 		     << "  Difference (curveLen-endpDist)= " << (h - endPointDist)
 		     << "  relative = " << (h-endPointDist) / h 
-		     << endl;
+		     << G4endl;
 	   }else{
 	      G4cerr << "  EndpointDist = " << endPointDist
 		     << "  curve length = " <<  h
 		     << "  Diff (cl-ed)= " << (h - endPointDist)
 		     << "  rel = " << (h-endPointDist) / h 
-		     << " (from G4MagIntegratorDriver)" << endl;
+		     << " (from G4MagIntegratorDriver)" << G4endl;
 	   }
 	}
 }
@@ -274,7 +274,7 @@ G4MagInt_Driver::OneGoodStep(      G4double y[],
       for (;;)
       {
 	  pIntStepper-> Stepper(y,dydx,h,ytemp,yerr); 
-          G4double eps_pos = eps_rel_max * max(h, Hmin()); 
+          G4double eps_pos = eps_rel_max * G4std::max(h, Hmin()); 
 	  // Evaluate accuracy
 	  //
 	  errpos_sq =  sqr(yerr[0]) + sqr(yerr[1]) + sqr(yerr[2]) ;
@@ -285,7 +285,7 @@ G4MagInt_Driver::OneGoodStep(      G4double y[],
                      / (sqr(y[3]) + sqr(y[4]) + sqr(y[5]) );
           errvel_sq /= eps_rel_max*eps_rel_max; 
 
-          errmax_sq = max( errpos_sq, errvel_sq ); // Square of maximum error
+          errmax_sq = G4std::max( errpos_sq, errvel_sq ); // Square of maximum error
           errmax = sqrt( errmax_sq );
 	  if(errmax_sq <= 1.0 ) break ; // Step succeeded. 
 
@@ -297,11 +297,11 @@ G4MagInt_Driver::OneGoodStep(      G4double y[],
 					  // than a factor of 10
 	  xnew = x + h ;
 	  if(xnew == x) {
-	     G4cerr<<"G4MagIntegratorDriver::OneGoodStep: Stepsize underflow in Stepper "<<endl ;
+	     G4cerr<<"G4MagIntegratorDriver::OneGoodStep: Stepsize underflow in Stepper "<<G4endl ;
 	     G4cerr<<"  Step's start x=" << x << " and end x= " << xnew 
-		   << " are equal !! " << endl
+		   << " are equal !! " << G4endl
 		   <<"  Due to step-size= " << h 
-                   << " . Note that input step was " << htry << endl;
+                   << " . Note that input step was " << htry << G4endl;
 	     break;
 	  }
       }
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
index 6dde456c71..b86322b354 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorStepper.cc,v 1.2.8.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MagIntegratorStepper.cc,v 1.3 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4MagIntegratorStepper.hh"
 
diff --git a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
index 02baeabd7b..c7f03c550c 100644
--- a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
+++ b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Mag_EqRhs.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Mag_EqRhs.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  This is the standard right-hand side for equation of motion  
 //    in a pure Magnetic Field .
diff --git a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
index 50240a6199..54da2e92c8 100644
--- a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
+++ b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Mag_UsualEqRhs.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Mag_UsualEqRhs.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  This is the standard right-hand side for equation of motion.
diff --git a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
index fa906925ad..42696d81ff 100644
--- a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
+++ b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RKG3_Stepper.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RKG3_Stepper.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4RKG3_Stepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4SimpleHeum.cc b/source/geometry/magneticfield/src/G4SimpleHeum.cc
index 176163d376..524dff2735 100644
--- a/source/geometry/magneticfield/src/G4SimpleHeum.cc
+++ b/source/geometry/magneticfield/src/G4SimpleHeum.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SimpleHeum.cc,v 1.2.8.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SimpleHeum.cc,v 1.3 1999/12/15 14:49:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  Simple Heum:
 //        x_1 = x_0 + h *
diff --git a/source/geometry/magneticfield/src/G4SimpleRunge.cc b/source/geometry/magneticfield/src/G4SimpleRunge.cc
index f0fc9941f6..03ad6b98bc 100644
--- a/source/geometry/magneticfield/src/G4SimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4SimpleRunge.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SimpleRunge.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SimpleRunge.cc,v 1.2 1999/12/15 14:49:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  Simple Runge:
 //
diff --git a/source/geometry/magneticfield/src/G4UniformElectricField.cc b/source/geometry/magneticfield/src/G4UniformElectricField.cc
index f731fe831c..666ed0cb2e 100644
--- a/source/geometry/magneticfield/src/G4UniformElectricField.cc
+++ b/source/geometry/magneticfield/src/G4UniformElectricField.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UniformElectricField.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UniformElectricField.cc,v 1.2 1999/12/15 14:49:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/src/G4UniformMagField.cc b/source/geometry/magneticfield/src/G4UniformMagField.cc
index 5b32cff1b4..27c74b6dba 100644
--- a/source/geometry/magneticfield/src/G4UniformMagField.cc
+++ b/source/geometry/magneticfield/src/G4UniformMagField.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UniformMagField.cc,v 1.1.10.1 1999/12/07 20:48:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UniformMagField.cc,v 1.2 1999/12/15 14:49:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/management/History b/source/geometry/management/History
index c1a5ea87c3..d9e683d1f3 100644
--- a/source/geometry/management/History
+++ b/source/geometry/management/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.5 1999/11/30 12:21:49 gcosmo Exp $
+$Id: History,v 1.7 2000/01/19 19:07:04 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,17 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+January 19, 00       G. Cosmo              geommng-V01-00-00
+
+Syncronized file versioning with HEAD (several CVS headers changed
+due to the recent migration for ISO C++)
+
+January 19, 00       J. Allison
+
+G4DrawVoxels.cc:
+
+Assured GetSlice(slice_no) is called for slice_no < no_slices.
+
 November 30, 99      G. Cosmo              geommng-V00-01-01a
 
 G4DrawVoxels.cc:
diff --git a/source/geometry/management/include/G4AffineTransform.hh b/source/geometry/management/include/G4AffineTransform.hh
index 7ae432bdd1..ca9879170e 100644
--- a/source/geometry/management/include/G4AffineTransform.hh
+++ b/source/geometry/management/include/G4AffineTransform.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AffineTransform.hh,v 1.1.12.1 1999/12/07 20:48:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AffineTransform.hh,v 1.2 1999/12/15 14:49:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4AffineTransform Header File
diff --git a/source/geometry/management/include/G4AffineTransform.icc b/source/geometry/management/include/G4AffineTransform.icc
index 1dc290cf95..e338e7bcb0 100644
--- a/source/geometry/management/include/G4AffineTransform.icc
+++ b/source/geometry/management/include/G4AffineTransform.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AffineTransform.icc,v 1.2.10.1 1999/12/07 20:48:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AffineTransform.icc,v 1.3 1999/12/15 14:49:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4AffineTransformation Inline implementation
diff --git a/source/geometry/management/include/G4DrawVoxels.hh b/source/geometry/management/include/G4DrawVoxels.hh
index db6fa8e8af..cec8c81d5e 100644
--- a/source/geometry/management/include/G4DrawVoxels.hh
+++ b/source/geometry/management/include/G4DrawVoxels.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DrawVoxels.hh,v 1.6.2.1 1999/12/07 20:48:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DrawVoxels.hh,v 1.7 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4DrawVoxels
diff --git a/source/geometry/management/include/G4GeometryManager.hh b/source/geometry/management/include/G4GeometryManager.hh
index 86ee434225..fd4886f504 100644
--- a/source/geometry/management/include/G4GeometryManager.hh
+++ b/source/geometry/management/include/G4GeometryManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GeometryManager.hh,v 1.1.12.1 1999/12/07 20:48:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GeometryManager.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4GeometryManager
 //
diff --git a/source/geometry/management/include/G4LogicalSurface.hh b/source/geometry/management/include/G4LogicalSurface.hh
index f3412810e6..ba1e405c42 100644
--- a/source/geometry/management/include/G4LogicalSurface.hh
+++ b/source/geometry/management/include/G4LogicalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalSurface.hh,v 1.1.12.1 1999/12/07 20:48:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalSurface.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalSurface Definition
diff --git a/source/geometry/management/include/G4LogicalSurface.icc b/source/geometry/management/include/G4LogicalSurface.icc
index 5b52f30979..88b5d5f058 100644
--- a/source/geometry/management/include/G4LogicalSurface.icc
+++ b/source/geometry/management/include/G4LogicalSurface.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalSurface.icc,v 1.1.12.1 1999/12/07 20:48:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalSurface.icc,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Surface Class Inline Methods
diff --git a/source/geometry/management/include/G4LogicalVolume.hh b/source/geometry/management/include/G4LogicalVolume.hh
index 040b561440..bda51856b0 100644
--- a/source/geometry/management/include/G4LogicalVolume.hh
+++ b/source/geometry/management/include/G4LogicalVolume.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.hh,v 1.3.2.1 1999/12/07 20:48:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolume.hh,v 1.4 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4LogicalVolume
diff --git a/source/geometry/management/include/G4LogicalVolume.icc b/source/geometry/management/include/G4LogicalVolume.icc
index f59ab3e861..b6033c4eba 100644
--- a/source/geometry/management/include/G4LogicalVolume.icc
+++ b/source/geometry/management/include/G4LogicalVolume.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.icc,v 1.2.10.1 1999/12/07 20:48:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolume.icc,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4LogicalVolume Inline Implementation file
diff --git a/source/geometry/management/include/G4LogicalVolumeStore.hh b/source/geometry/management/include/G4LogicalVolumeStore.hh
index e6f414e1c6..ccc985f3c6 100644
--- a/source/geometry/management/include/G4LogicalVolumeStore.hh
+++ b/source/geometry/management/include/G4LogicalVolumeStore.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolumeStore.hh,v 1.2.2.1 1999/12/07 20:48:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolumeStore.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4LogicalVolumeStore
 //
diff --git a/source/geometry/management/include/G4PVParameterised.hh b/source/geometry/management/include/G4PVParameterised.hh
index c7dafdb002..f5c29c5469 100644
--- a/source/geometry/management/include/G4PVParameterised.hh
+++ b/source/geometry/management/include/G4PVParameterised.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVParameterised.hh,v 1.1.12.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVParameterised.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/include/G4PVPlacement.hh b/source/geometry/management/include/G4PVPlacement.hh
index 8c2d5bf531..99ecbfb0ae 100644
--- a/source/geometry/management/include/G4PVPlacement.hh
+++ b/source/geometry/management/include/G4PVPlacement.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVPlacement.hh,v 1.1.12.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVPlacement.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVPlacement
diff --git a/source/geometry/management/include/G4PVReplica.hh b/source/geometry/management/include/G4PVReplica.hh
index 1350b97727..9e70045bd0 100644
--- a/source/geometry/management/include/G4PVReplica.hh
+++ b/source/geometry/management/include/G4PVReplica.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVReplica.hh,v 1.1.12.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVReplica.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVReplica
diff --git a/source/geometry/management/include/G4PhysicalVolumeStore.hh b/source/geometry/management/include/G4PhysicalVolumeStore.hh
index 672cebe22c..af00654357 100644
--- a/source/geometry/management/include/G4PhysicalVolumeStore.hh
+++ b/source/geometry/management/include/G4PhysicalVolumeStore.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeStore.hh,v 1.2.2.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeStore.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PhysicalVolume
 //
diff --git a/source/geometry/management/include/G4SmartVoxelHeader.hh b/source/geometry/management/include/G4SmartVoxelHeader.hh
index de65e4675d..e52e4cbdb3 100644
--- a/source/geometry/management/include/G4SmartVoxelHeader.hh
+++ b/source/geometry/management/include/G4SmartVoxelHeader.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelHeader.hh,v 1.2.2.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SmartVoxelHeader.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4SmartVoxelHeader
 //
@@ -157,7 +157,7 @@ public:
 
     G4bool operator == (const G4SmartVoxelHeader& pHead) const;
 
-    friend ostream& operator << (ostream&s, const G4SmartVoxelHeader& h);
+    friend G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h);
 
 protected:
 
diff --git a/source/geometry/management/include/G4SmartVoxelNode.hh b/source/geometry/management/include/G4SmartVoxelNode.hh
index a8720a4e91..137404b09c 100644
--- a/source/geometry/management/include/G4SmartVoxelNode.hh
+++ b/source/geometry/management/include/G4SmartVoxelNode.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelNode.hh,v 1.2.2.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SmartVoxelNode.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4SmartVoxelNode
 //
diff --git a/source/geometry/management/include/G4SmartVoxelProxy.hh b/source/geometry/management/include/G4SmartVoxelProxy.hh
index 59d8bf6b04..072a70b7b2 100644
--- a/source/geometry/management/include/G4SmartVoxelProxy.hh
+++ b/source/geometry/management/include/G4SmartVoxelProxy.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelProxy.hh,v 1.1.12.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SmartVoxelProxy.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // class G4SmartVoxelProxy
diff --git a/source/geometry/management/include/G4SolidStore.hh b/source/geometry/management/include/G4SolidStore.hh
index 7d4049b2a5..a656eb7fb9 100644
--- a/source/geometry/management/include/G4SolidStore.hh
+++ b/source/geometry/management/include/G4SolidStore.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SolidStore.hh,v 1.2.2.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SolidStore.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4SolidStore
 //
diff --git a/source/geometry/management/include/G4VPVParameterisation.hh b/source/geometry/management/include/G4VPVParameterisation.hh
index eceb52478a..56564fa131 100644
--- a/source/geometry/management/include/G4VPVParameterisation.hh
+++ b/source/geometry/management/include/G4VPVParameterisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPVParameterisation.hh,v 1.1.12.1 1999/12/07 20:48:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPVParameterisation.hh,v 1.2 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VPVParamterisation
 //
diff --git a/source/geometry/management/include/G4VPhysicalVolume.hh b/source/geometry/management/include/G4VPhysicalVolume.hh
index 1130f566b6..862004ab97 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.hh
+++ b/source/geometry/management/include/G4VPhysicalVolume.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPhysicalVolume.hh,v 1.2.4.1 1999/12/07 20:48:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPhysicalVolume.hh,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // class description:
diff --git a/source/geometry/management/include/G4VPhysicalVolume.icc b/source/geometry/management/include/G4VPhysicalVolume.icc
index 12b0afdc37..98fc3da03e 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.icc
+++ b/source/geometry/management/include/G4VPhysicalVolume.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPhysicalVolume.icc,v 1.2.4.1 1999/12/07 20:48:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPhysicalVolume.icc,v 1.3 1999/12/15 14:49:51 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4VPhysicalVolume Inline Implementation
diff --git a/source/geometry/management/include/G4VSolid.hh b/source/geometry/management/include/G4VSolid.hh
index 6d3f216123..fdfcd54fa6 100644
--- a/source/geometry/management/include/G4VSolid.hh
+++ b/source/geometry/management/include/G4VSolid.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSolid.hh,v 1.3.2.1 1999/12/07 20:48:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSolid.hh,v 1.4 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //  Class Description 
diff --git a/source/geometry/management/include/G4VSolid.icc b/source/geometry/management/include/G4VSolid.icc
index 9a82a99b24..6ba38e0578 100644
--- a/source/geometry/management/include/G4VSolid.icc
+++ b/source/geometry/management/include/G4VSolid.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSolid.icc,v 1.1.12.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSolid.icc,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/geometry/management/include/G4VTouchable.hh b/source/geometry/management/include/G4VTouchable.hh
index 769ca3ac8a..696676551e 100644
--- a/source/geometry/management/include/G4VTouchable.hh
+++ b/source/geometry/management/include/G4VTouchable.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTouchable.hh,v 1.1.12.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VTouchable.hh,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4VTouchable Paul Kent August 1996
diff --git a/source/geometry/management/include/G4VTouchable.icc b/source/geometry/management/include/G4VTouchable.icc
index bb7b15eea4..3629d6bbde 100644
--- a/source/geometry/management/include/G4VTouchable.icc
+++ b/source/geometry/management/include/G4VTouchable.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTouchable.icc,v 1.1.12.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VTouchable.icc,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4VTouchable Inline implementation
diff --git a/source/geometry/management/include/G4VoxelLimits.hh b/source/geometry/management/include/G4VoxelLimits.hh
index b1f63734a3..21c89b85c9 100644
--- a/source/geometry/management/include/G4VoxelLimits.hh
+++ b/source/geometry/management/include/G4VoxelLimits.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VoxelLimits.hh,v 1.1.12.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VoxelLimits.hh,v 1.3 1999/12/15 16:40:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VoxelLimits
 //
@@ -80,7 +80,7 @@
 //
 // operators:
 //
-// ostream& operator << (ostream& os, const G4VoxelLimits& pLim);
+// G4std::ostream& operator << (G4std::ostream& os, const G4VoxelLimits& pLim);
 //
 // Print the limits to the stream in the form:
 //  "{(xmin,xmax) (ymin,ymax) (zmin,zmax)}" Replace (xmin,xmax) by (-,-)
@@ -100,11 +100,10 @@
 #include "geomdefs.hh"
 
 #include "G4ThreeVector.hh"
+#include "g4std/iostream"
 
 #include <assert.h>
 
-class ostream;
-
 class G4VoxelLimits
 {
 public:
@@ -247,6 +246,6 @@ private:
     G4double fzAxisMin,fzAxisMax;
 };
 
-ostream& operator << (ostream& os, const G4VoxelLimits& pLim);
+G4std::ostream& operator << (G4std::ostream& os, const G4VoxelLimits& pLim);
 
 #endif
diff --git a/source/geometry/management/include/meshdefs.hh b/source/geometry/management/include/meshdefs.hh
index 3f1aede2ed..6a9a9a1862 100644
--- a/source/geometry/management/include/meshdefs.hh
+++ b/source/geometry/management/include/meshdefs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: meshdefs.hh,v 1.1.12.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: meshdefs.hh,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Tube/Cone Meshing constants for extent calculations
diff --git a/source/geometry/management/include/voxeldefs.hh b/source/geometry/management/include/voxeldefs.hh
index 83c242bd3a..dae224c3b1 100644
--- a/source/geometry/management/include/voxeldefs.hh
+++ b/source/geometry/management/include/voxeldefs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: voxeldefs.hh,v 1.2.10.1 1999/12/07 20:48:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: voxeldefs.hh,v 1.3 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 //
diff --git a/source/geometry/management/src/G4DrawVoxels.cc b/source/geometry/management/src/G4DrawVoxels.cc
index 7be47ba5cf..a561d722c5 100644
--- a/source/geometry/management/src/G4DrawVoxels.cc
+++ b/source/geometry/management/src/G4DrawVoxels.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DrawVoxels.cc,v 1.8.2.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DrawVoxels.cc,v 1.10 2000/01/19 17:26:30 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4DrawVoxels
@@ -48,7 +48,7 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
  
    #ifdef G4DrawVoxelsDebug
  	G4cout << "**** !!! G4DrawVoxels::Draw_Voxels : a query for drawing voxelisation";
- 	G4cout << "	Logical Volume:" << lv->GetName() <<endl;
+ 	G4cout << "	Logical Volume:" << lv->GetName() <<G4endl;
    #endif
  
 
@@ -60,8 +60,8 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
    
    if (lv->GetNoDaughters()<=0) {
      #ifdef G4DrawVoxelsDebug
-        G4cout << "**** !!! G4DrawVoxels::Draw_Voxels : a query for drawing voxelisation" << endl;
-        G4cout << "	of a logical volume that has no (or <=0) daughter has been detected !!! ****" <<endl;
+        G4cout << "**** !!! G4DrawVoxels::Draw_Voxels : a query for drawing voxelisation" << G4endl;
+        G4cout << "	of a logical volume that has no (or <=0) daughter has been detected !!! ****" <<G4endl;
      #endif
      return;
    }
@@ -112,8 +112,8 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
 		default:
 		//erreur interne
 		/************************/
-		G4cout << "PANIC: in Draw_Voxels:DrawVoxels(...) header is decayed." <<endl;
-		G4cout << "header->GetAxis returns an invalid axis." <<endl; 
+		G4cout << "PANIC: in Draw_Voxels:DrawVoxels(...) header is decayed." <<G4endl;
+		G4cout << "header->GetAxis returns an invalid axis." <<G4endl; 
 		/************************/
 		break;
 	};
@@ -128,14 +128,14 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
    #ifdef G4DrawVoxelsDebug
       G4cout << "	Axis of the voxelisation:" << header->GetAxis();
       G4cout << "	No slices of the voxelisation:" << header->GetNoSlices();
-      G4cout << "	step:" << step <<endl;	
+      G4cout << "	step:" << step <<G4endl;	
    #endif
 
    while (slice_no<no_slices){
 		  
 	#ifdef G4DrawVoxelsDebug
 	   G4cout << "		slice_no:" << slice_no;
-	   G4cout << "		header/node:" << slice->IsHeader() <<endl;					
+	   G4cout << "		header/node:" << slice->IsHeader() <<G4endl;					
   	#endif
   		  
 	if (slice->IsHeader()){
@@ -152,7 +152,7 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
 		   
 	slice_no=(slice->IsHeader()?slice->GetHeader()->GetMaxEquivalentSliceNo()+1
 		  			     :slice->GetNode()->GetMaxEquivalentSliceNo()+1);
-	slice=header->GetSlice(slice_no);	
+	if (slice_no<no_slices)slice=header->GetSlice(slice_no);	
    }
 }//end of ComputeVoxelPolyhedra...
 //######################################################################################################################
@@ -200,8 +200,8 @@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume* lv) const{
 
    if (lv->GetNoDaughters()<=0) {
    #ifdef G4DrawVoxelsDebug
-        G4cout << "**** !!! G4DrawVoxels::Draw_Voxels : a query for drawing voxelisation" << endl;
-        G4cout << "	of a logical volume that has no (or <=0) daughter has been detected !!! ****" <<endl;
+        G4cout << "**** !!! G4DrawVoxels::Draw_Voxels : a query for drawing voxelisation" << G4endl;
+        G4cout << "	of a logical volume that has no (or <=0) daughter has been detected !!! ****" <<G4endl;
    #endif
    return;
    }
@@ -219,7 +219,7 @@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume* lv) const{
 	for (G4int i=0;i<pplist->entries();i++)
 	   pVVisManager->Draw((*pplist)(i).GetPolyhedron(),(*pplist)(i).GetTransform()*transf3D);	
    }
-   else G4cout << "@@@@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume*) pVVisManager is null! @@@@" <<endl; 	
+   else G4cout << "@@@@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume*) pVVisManager is null! @@@@" <<G4endl; 	
    delete pplist;
 }
 
diff --git a/source/geometry/management/src/G4GeometryManager.cc b/source/geometry/management/src/G4GeometryManager.cc
index a3a25ed806..9fbc6e2faa 100644
--- a/source/geometry/management/src/G4GeometryManager.cc
+++ b/source/geometry/management/src/G4GeometryManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GeometryManager.cc,v 1.1.12.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GeometryManager.cc,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4GeometryManager
 //
@@ -87,8 +87,8 @@ void G4GeometryManager::BuildOptimisations(const G4bool allOpts)
                    volume->GetDaughter(0)->IsReplicated()==true))
 		 {
 #ifdef G4GEOMETRY_VOXELDEBUG
-		     G4cout << "**** G4GeometryManager::BuildOptimisations" << endl
-			  << "     Examining logical volume name = " << volume->GetName() << endl;
+		     G4cout << "**** G4GeometryManager::BuildOptimisations" << G4endl
+			  << "     Examining logical volume name = " << volume->GetName() << G4endl;
 #endif
 		     head = new G4SmartVoxelHeader(volume);
 		     if (head)
@@ -105,9 +105,9 @@ void G4GeometryManager::BuildOptimisations(const G4bool allOpts)
 // Don't create voxels for this node
 #ifdef G4GEOMETRY_VOXELDEBUG
 		     G4cout << "**** G4GeometryManager::BuildOptimisations"
-			  << endl
+			  << G4endl
 			  << "     Skipping logical volume name = "
-			  << volume->GetName() << endl;
+			  << volume->GetName() << G4endl;
 #endif
 		 }
 
diff --git a/source/geometry/management/src/G4LogicalVolume.cc b/source/geometry/management/src/G4LogicalVolume.cc
index eed4704d0a..0d9ae203b6 100644
--- a/source/geometry/management/src/G4LogicalVolume.cc
+++ b/source/geometry/management/src/G4LogicalVolume.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolume.cc,v 1.2.10.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolume.cc,v 1.3 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4LogicalVolume Implementation
diff --git a/source/geometry/management/src/G4LogicalVolumeStore.cc b/source/geometry/management/src/G4LogicalVolumeStore.cc
index e66b422a18..8b2e9cf05d 100644
--- a/source/geometry/management/src/G4LogicalVolumeStore.cc
+++ b/source/geometry/management/src/G4LogicalVolumeStore.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolumeStore.cc,v 1.3.2.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolumeStore.cc,v 1.4 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4LogicalVolumeStore
 //
diff --git a/source/geometry/management/src/G4PVParameterised.cc b/source/geometry/management/src/G4PVParameterised.cc
index f0696b58d2..f3d640352e 100644
--- a/source/geometry/management/src/G4PVParameterised.cc
+++ b/source/geometry/management/src/G4PVParameterised.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVParameterised.cc,v 1.1.12.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVParameterised.cc,v 1.2 1999/12/15 14:49:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/src/G4PVPlacement.cc b/source/geometry/management/src/G4PVPlacement.cc
index b684a65b67..bb6700cb16 100644
--- a/source/geometry/management/src/G4PVPlacement.cc
+++ b/source/geometry/management/src/G4PVPlacement.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVPlacement.cc,v 1.1.12.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVPlacement.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVPlacement Implementation
diff --git a/source/geometry/management/src/G4PVReplica.cc b/source/geometry/management/src/G4PVReplica.cc
index 176f944a7e..72b552ee82 100644
--- a/source/geometry/management/src/G4PVReplica.cc
+++ b/source/geometry/management/src/G4PVReplica.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVReplica.cc,v 1.1.12.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVReplica.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVReplica Implementation
diff --git a/source/geometry/management/src/G4PhysicalVolumeStore.cc b/source/geometry/management/src/G4PhysicalVolumeStore.cc
index 3c69da9965..14a5ac747f 100644
--- a/source/geometry/management/src/G4PhysicalVolumeStore.cc
+++ b/source/geometry/management/src/G4PhysicalVolumeStore.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeStore.cc,v 1.3.2.1 1999/12/07 20:48:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeStore.cc,v 1.4 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4PhysicalVolumeStore
 //
diff --git a/source/geometry/management/src/G4SmartVoxelHeader.cc b/source/geometry/management/src/G4SmartVoxelHeader.cc
index 7ff441c182..540533f7fe 100644
--- a/source/geometry/management/src/G4SmartVoxelHeader.cc
+++ b/source/geometry/management/src/G4SmartVoxelHeader.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelHeader.cc,v 1.4.10.1 1999/12/07 20:48:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SmartVoxelHeader.cc,v 1.5 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4SmartVoxelHeader
@@ -72,14 +72,14 @@ G4SmartVoxelHeader::G4SmartVoxelHeader(G4LogicalVolume* pVolume,
 
 {
 #ifdef G4GEOMETRY_VOXELDEBUG
-    G4cout << "**** G4SmartVoxelHeader::G4SmartVoxelHeader" << endl
-         << "     Limits " << pLimits << endl
+    G4cout << "**** G4SmartVoxelHeader::G4SmartVoxelHeader" << G4endl
+         << "     Limits " << pLimits << G4endl
          << "     Candidate #s = " ;
     for (G4int i=0;i<pCandidates->entries();i++)
 	{
 	    G4cout << pCandidates->at(i) << " ";
 	}
-    G4cout << endl;
+    G4cout << G4endl;
 #endif   
     BuildVoxelsWithinLimits(pVolume,pLimits,pCandidates);
 }
@@ -389,7 +389,7 @@ void G4SmartVoxelHeader::BuildVoxelsWithinLimits(G4LogicalVolume* pVolume,
     faxis=goodSliceAxis;
 
 #ifdef G4GEOMETRY_VOXELDEBUG
-    G4cout << endl << "     Selected axis = " << faxis << endl;
+    G4cout << G4endl << "     Selected axis = " << faxis << G4endl;
     G4int islice;
     for (islice=0;islice<fslices.entries();islice++)
 	{
@@ -397,9 +397,9 @@ void G4SmartVoxelHeader::BuildVoxelsWithinLimits(G4LogicalVolume* pVolume,
 	    G4cout << "     Node #" << islice << " = {";
 	    for (j=0;j<fslices(islice)->GetNode()->GetNoContained();j++)
 		{ G4cout << " " << fslices(islice)->GetNode()->GetVolume(j); }
-	    G4cout << " }" << endl;
+	    G4cout << " }" << G4endl;
 	}
-    G4cout << endl;
+    G4cout << G4endl;
 #endif
 
 // Calculate and set min and max extents given our axis
@@ -541,9 +541,9 @@ void G4SmartVoxelHeader::CollectEquivalentNodes()
 		{
 // Do collection between sliceNo and maxNo inclusive
 #ifdef G4GEOMETRY_VOXELDEBUG
-		    G4cout << "**** G4SmartVoxelHeader::CollectEquivalentNodes" << endl
+		    G4cout << "**** G4SmartVoxelHeader::CollectEquivalentNodes" << G4endl
 			 << "     Collecting Nodes = " 
-			 << sliceNo << " - " << maxNo << endl;
+			 << sliceNo << " - " << maxNo << G4endl;
 #endif
 		    for (equivNo=sliceNo+1;equivNo<=maxNo;equivNo++)
 			{
@@ -587,7 +587,7 @@ void G4SmartVoxelHeader::CollectEquivalentHeaders()
 // but may not have equal contents
 
 #ifdef G4GEOMETRY_VOXELDEBUG
-			    G4cout << "**** G4SmartVoxelHeader::CollectEquivalentHeaders" << endl
+			    G4cout << "**** G4SmartVoxelHeader::CollectEquivalentHeaders" << G4endl
 				<< "     Collecting Headers =";
 #endif
 			    for (equivNo=sliceNo+1;equivNo<=maxNo;equivNo++)
@@ -614,7 +614,7 @@ void G4SmartVoxelHeader::CollectEquivalentHeaders()
 
 				}
 #ifdef G4GEOMETRY_VOXELDEBUG
-			    G4cout << endl;
+			    G4cout << G4endl;
 #endif
 
 // Skip past examined slices
@@ -653,10 +653,10 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
     
     nCandidates=pCandidates->entries();
 #ifdef G4GEOMETRY_VOXELDEBUG
-    G4cout << "**** G4SmartVoxelHeader::BuildNodes" << endl
-	 << "     Limits = " << pLimits << endl
+    G4cout << "**** G4SmartVoxelHeader::BuildNodes" << G4endl
+	 << "     Limits = " << pLimits << G4endl
 	 << "     Axis = " << pAxis
-	 << " Candidates = " << nCandidates << endl;
+	 << " Candidates = " << nCandidates << G4endl;
 #endif
 
 // Compute extent of logical volume's solid along this axis
@@ -751,13 +751,13 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
 		    if (((motherMinExtent-minExtents(nVol))*100/width>kStraddlePercent)
 			||((maxExtents(nVol)-motherMaxExtent)*100/width>kStraddlePercent))
 			{
-			    G4cout << "**** G4SmartVoxelHeader::BuildNodes" << endl
+			    G4cout << "**** G4SmartVoxelHeader::BuildNodes" << G4endl
 				 << "     WARNING : Daughter # " << nVol
-				 << " Name = " << pDaughter->GetName() << endl
+				 << " Name = " << pDaughter->GetName() << G4endl
 				 << "     Crosses mother boundary of logical volume Name = " 
-				 << pVolume->GetName() << endl
+				 << pVolume->GetName() << G4endl
 				 << "     by more than " << kStraddlePercent 
-				 << "%" << endl;
+				 << "%" << G4endl;
 			}
 		}
 #endif
@@ -806,13 +806,13 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
 
 #ifdef G4GEOMETRY_VOXELDEBUG
     G4cout << "     Min width = " << minWidth
-	 << " => # Nodes = " << noNodes << endl;
+	 << " => # Nodes = " << noNodes << G4endl;
 #endif   
     if (noNodes>kMaxVoxelNodes)
 	{
 	    noNodes=kMaxVoxelNodes;
 #ifdef G4GEOMETRY_VOXELDEBUG
-    G4cout << "     Nodes Clipped to = " << kMaxVoxelNodes << endl;
+    G4cout << "     Nodes Clipped to = " << kMaxVoxelNodes << G4endl;
 #endif   
 	}
     G4double nodeWidth=(motherMaxExtent-motherMinExtent)/noNodes;
@@ -956,11 +956,11 @@ G4double G4SmartVoxelHeader::CalculateQuality(G4ProxyVector *pSlice)
 	}
 
 #ifdef G4GEOMETRY_VOXELDEBUG
-    G4cout << "**** G4SmartVoxelHeader::CalculateQuality" << endl
-	 << "     Quality = " << quality << endl
+    G4cout << "**** G4SmartVoxelHeader::CalculateQuality" << G4endl
+	 << "     Quality = " << quality << G4endl
 	 << "     Nodes = " << nNodes 
-	 << " of which " << sumNonEmptyNodes << " non empty" << endl
-         << "     Max Contained = " << maxContained << endl;
+	 << " of which " << sumNonEmptyNodes << " non empty" << G4endl
+         << "     Max Contained = " << maxContained << G4endl;
 #endif
     return quality;
 }
@@ -1042,9 +1042,9 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 			    maxNo=targetNode->GetMaxEquivalentSliceNo();
 #ifdef G4GEOMETRY_VOXELDEBUG
 			    G4cout << "**** G4SmartVoxelHeader::RefineNodes"
-				 << endl
+				 << G4endl
 				 << "     Refining nodes " << minNo 
-				 << " - " << maxNo << " inclusive" << endl;
+				 << " - " << maxNo << " inclusive" << G4endl;
 
 #endif
 // Delete node proxies at start of collected sets of nodes/headers
@@ -1116,9 +1116,9 @@ G4bool G4SmartVoxelHeader::AllSlicesEqual() const
 }
 
 // Output for debugging
-ostream& operator << (ostream&s, const G4SmartVoxelHeader& h)
+G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h)
 {
-    s << "Axis = " << h.faxis << endl;
+    s << "Axis = " << h.faxis << G4endl;
     G4SmartVoxelProxy *collectNode=0,*collectHead=0;
     G4int collectNodeNo,collectHeadNo,i,j;
     G4bool haveHeaders=false;
@@ -1133,13 +1133,13 @@ ostream& operator << (ostream&s, const G4SmartVoxelHeader& h)
 			    s << "{";
 			    for (G4int j=0;j<h.fslices(i)->GetNode()->GetNoContained();j++)
 				{ s << " " << h.fslices(i)->GetNode()->GetVolume(j); }
-			    s << " }" << endl;
+			    s << " }" << G4endl;
 			    collectNode=h.fslices(i);
 			    collectNodeNo=i;
 			}
 		    else
 			{
-			    s << "As slice #" << collectNodeNo << endl;
+			    s << "As slice #" << collectNodeNo << G4endl;
 			}
 		}
 	    else
@@ -1147,13 +1147,13 @@ ostream& operator << (ostream&s, const G4SmartVoxelHeader& h)
 		    haveHeaders=true;
 		    if (h.fslices(i)!=collectHead)
 			{
-			    s << "Header" << endl;
+			    s << "Header" << G4endl;
 			    collectHead=h.fslices(i);
 			    collectHeadNo=i;
 			}
 		    else
 			{
-			    s << "As slice #" << collectHeadNo << endl;
+			    s << "As slice #" << collectHeadNo << G4endl;
 			}
 		}
 	}
@@ -1169,14 +1169,14 @@ ostream& operator << (ostream&s, const G4SmartVoxelHeader& h)
 			    s << "Header at Slice #" << j << " = ";
 			    if (h.fslices(j)!=collectHead)
 				{
-				    s << endl 
+				    s << G4endl 
 				      << (*(h.fslices(j)->GetHeader()));
 				    collectHead=h.fslices(j);
 				    collectHeadNo=j;
 				}
 			    else
 				{
-				    s << "As slice #" << collectHeadNo << endl;
+				    s << "As slice #" << collectHeadNo << G4endl;
 				}
 			}
 		}
diff --git a/source/geometry/management/src/G4SmartVoxelNode.cc b/source/geometry/management/src/G4SmartVoxelNode.cc
index 909aa8658a..699d8eef94 100644
--- a/source/geometry/management/src/G4SmartVoxelNode.cc
+++ b/source/geometry/management/src/G4SmartVoxelNode.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SmartVoxelNode.cc,v 1.1.12.1 1999/12/07 20:48:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SmartVoxelNode.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class G4SmartVoxelNode
 //
diff --git a/source/geometry/management/src/G4SolidStore.cc b/source/geometry/management/src/G4SolidStore.cc
index cdb1d1b17c..10f50d9a34 100644
--- a/source/geometry/management/src/G4SolidStore.cc
+++ b/source/geometry/management/src/G4SolidStore.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SolidStore.cc,v 1.3.2.1 1999/12/07 20:48:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SolidStore.cc,v 1.4 1999/12/15 14:49:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4SolidStore
 //
diff --git a/source/geometry/management/src/G4VPVParameterisation.cc b/source/geometry/management/src/G4VPVParameterisation.cc
index bdb55b0495..691819c086 100644
--- a/source/geometry/management/src/G4VPVParameterisation.cc
+++ b/source/geometry/management/src/G4VPVParameterisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPVParameterisation.cc,v 1.1.12.1 1999/12/07 20:48:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPVParameterisation.cc,v 1.2 1999/12/15 14:49:54 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Default implementations for Parameterisations that do not
 //    parameterise solid and/or material
diff --git a/source/geometry/management/src/G4VPhysicalVolume.cc b/source/geometry/management/src/G4VPhysicalVolume.cc
index 527555cbc8..7131cc8527 100644
--- a/source/geometry/management/src/G4VPhysicalVolume.cc
+++ b/source/geometry/management/src/G4VPhysicalVolume.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPhysicalVolume.cc,v 1.2.4.1 1999/12/07 20:48:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPhysicalVolume.cc,v 1.3 1999/12/15 14:49:54 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4VPhysicalVolume Implementation
diff --git a/source/geometry/management/src/G4VSolid.cc b/source/geometry/management/src/G4VSolid.cc
index 1fd84dd570..7a99f47810 100644
--- a/source/geometry/management/src/G4VSolid.cc
+++ b/source/geometry/management/src/G4VSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSolid.cc,v 1.2.4.1 1999/12/07 20:48:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSolid.cc,v 1.3 1999/12/15 14:49:54 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VSolid
 //
diff --git a/source/geometry/management/src/G4VoxelLimits.cc b/source/geometry/management/src/G4VoxelLimits.cc
index 2a160a9ba7..57784b7790 100644
--- a/source/geometry/management/src/G4VoxelLimits.cc
+++ b/source/geometry/management/src/G4VoxelLimits.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VoxelLimits.cc,v 1.1.12.1 1999/12/07 20:48:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VoxelLimits.cc,v 1.2 1999/12/15 14:49:54 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VoxelLimits
 // 
@@ -274,7 +274,7 @@ G4int G4VoxelLimits::OutCode(const G4ThreeVector& pVec) const
 }
 
 
-ostream& operator << (ostream& os, const G4VoxelLimits& pLim)
+G4std::ostream& operator << (G4std::ostream& os, const G4VoxelLimits& pLim)
 {
     os << "{";
     if (pLim.IsXLimited())
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
index 25313e07a9..9752acd479 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidBox.hh,v 1.1.10.1 1999/12/07 20:48:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidBox.hh,v 1.2 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4BREPSolidBOX
 #define __G4BREPSolidBOX
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
index 1bb6386db2..f16a6ce48c 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidCone.hh,v 1.1.10.1 1999/12/07 20:48:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidCone.hh,v 1.2 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4BREPSolidCone
 #define __G4BREPSolidCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
index ec57e86b0e..82d29afe6d 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidCylinder.hh,v 1.1.10.1 1999/12/07 20:48:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidCylinder.hh,v 1.2 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4BREPSolidCylinder
 #define __G4BREPSolidCylinder
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
index 07dc567caf..9643caea56 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidPCone.hh,v 1.2.8.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidPCone.hh,v 1.3 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // The polyconical solid G4BREPSolidPCone is a shape defined by a set of 
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
index cdf41ceab5..20d4f8e575 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidPolyhedra.hh,v 1.2.8.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidPolyhedra.hh,v 1.3 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // The polygonal solid G4BREPSolidPolyhedra is a shape defined by an inner 
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
index 7828fe3319..70edcfeca5 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidSphere.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidSphere.hh,v 1.2 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4BREPSolidSphere
 #define __G4BREPSolidSphere
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
index 724b1f1aa9..6fc693acda 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidTorus.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidTorus.hh,v 1.2 1999/12/15 14:49:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4BREPSolidTorus
 #define __G4BREPSolidTorus
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
index ee9f0c2da7..758e00036e 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineCurve.hh,v 1.4.2.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineCurve.hh,v 1.5 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __BSPLINECURVE_H
 #define __BSPLINECURVE_H 
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
index 7e23ccd394..a98edf339e 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineCurveWithKnots.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineCurveWithKnots.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __B_SPLINECURVEWITHKNOTS_H
 #define __B_SPLINECURVEWITHKNOTS_H 
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
index c082ea65df..cb0b99f1ad 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineSurface.hh,v 1.2.8.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineSurface.hh,v 1.3 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __BSPLINESURFACE_H
 #define __BSPLINESURFACE_H
diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.hh b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
index ebc582de00..c27065a9ac 100644
--- a/source/geometry/solids/BREPS/include/G4BezierSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BezierSurface.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BezierSurface.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __BEZIERSURFACE_H
 #define __BEZIERSURFACE_H
diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.hh b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
index 5c12f1b8b4..8b096d044e 100644
--- a/source/geometry/solids/BREPS/include/G4CircularCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CircularCurve.hh,v 1.2.8.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CircularCurve.hh,v 1.3 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __CIRCULARCURVE_H
 #define __CIRCULARCURVE_H 
diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
index ce7f711721..11c9ed3bee 100644
--- a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ConicalSurface.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ConicalSurface.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/G4ConicalSurface.h,v 1.5 1993/12/30 02:13:59 rensing Exp  */
 //  File:  G4ConicalSurface.h
@@ -61,7 +61,7 @@ public:
   
   virtual char *NameOf() const { return "G4ConicalSurface"; }
   
-  virtual void PrintOn( ostream& os = G4cout ) const;
+  virtual void PrintOn( G4std::ostream& os = G4cout ) const;
   
   int operator==( const G4ConicalSurface& c )
   { 
@@ -128,7 +128,7 @@ private:
 //----->virtual char *NameOf() const { return "G4ConicalSurface"; }
 //
 //  printing function
-//----->virtual void PrintOn( ostream& os = G4cout ) const;
+//----->virtual void PrintOn( G4std::ostream& os = G4cout ) const;
 //
 //  equality operator
 //----->int operator==( const G4ConicalSurface& c )
diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.hh b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
index aa10723ea6..e07f35882a 100644
--- a/source/geometry/solids/BREPS/include/G4ControlPoints.hh
+++ b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ControlPoints.hh,v 1.1.10.1 1999/12/07 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ControlPoints.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Modif 8 oct 98 : A.Floquet
diff --git a/source/geometry/solids/BREPS/include/G4ConvexHull.hh b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
index d390df222b..7c46e2765d 100644
--- a/source/geometry/solids/BREPS/include/G4ConvexHull.hh
+++ b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ConvexHull.hh,v 1.1.10.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ConvexHull.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __CONVEXHULL_H
 #define __CONVEXHULL_H
diff --git a/source/geometry/solids/BREPS/include/G4Curve.hh b/source/geometry/solids/BREPS/include/G4Curve.hh
index 4ed645fc4f..1ccc656678 100644
--- a/source/geometry/solids/BREPS/include/G4Curve.hh
+++ b/source/geometry/solids/BREPS/include/G4Curve.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Curve.hh,v 1.2.8.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Curve.hh,v 1.3 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __CURVE_H
 #define __CURVE_H 
diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
index af78488686..e3a059a567 100644
--- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CylindricalSurface.hh,v 1.1.10.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CylindricalSurface.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/G4CylindricalSurface.h,v 1.16 1993/12/30 02:14:08 rensing Exp  */
 //  File:  G4CylindricalSurface.h
@@ -63,7 +63,7 @@ public:
   
   virtual char *NameOf() const { return "G4CylindricalSurface"; }
   
-  virtual void PrintOn( ostream& os = G4cout ) const;
+  virtual void PrintOn( G4std::ostream& os = G4cout ) const;
   
   int operator==( const G4CylindricalSurface& c )
   {
@@ -131,7 +131,7 @@ private:
 //----->virtual char *NameOf() const { return "G4CylindricalSurface"; }
 //
 //  printing function
-//----->virtual void PrintOn( ostream& os = G4cout ) const;
+//----->virtual void PrintOn( G4std::ostream& os = G4cout ) const;
 //
 //  equality operator
 //----->int operator==( const G4CylindricalSurface& c )
diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.hh b/source/geometry/solids/BREPS/include/G4Ellipse.hh
index a6f9d06e50..94792f1df2 100644
--- a/source/geometry/solids/BREPS/include/G4Ellipse.hh
+++ b/source/geometry/solids/BREPS/include/G4Ellipse.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Ellipse.hh,v 1.2.8.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Ellipse.hh,v 1.3 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __ELLIPTICCURVE_H
 #define __ELLIPTICCURVE_H 
diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
index e287a5d765..645834f993 100644
--- a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FConicalSurface.hh,v 1.3.8.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FConicalSurface.hh,v 1.4 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __FCONIC_H
 #define __FCONIC_H
@@ -90,7 +90,7 @@ public:
 //  function to return class name
   virtual char *Name() const { return "G4FConicalSurface"; }
 //  printing function
-  virtual void PrintOn( ostream& os = G4cout ) const;
+  virtual void PrintOn( G4std::ostream& os = G4cout ) const;
 
 //  equality operator
   int operator==( const G4FConicalSurface& c );
diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
index 9b7f108bbb..5cf652844c 100644
--- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FCylindricalSurface.hh,v 1.4.8.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FCylindricalSurface.hh,v 1.5 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __FCYLINDER_H
 #define __FCYLINDER_H
@@ -101,7 +101,7 @@ class G4FCylindricalSurface: public G4Surface
   }
   
   //  printing function
-  virtual void PrintOn( ostream& os = G4cout ) const;
+  virtual void PrintOn( G4std::ostream& os = G4cout ) const;
   
   //  equality operator
   int operator==( const G4FCylindricalSurface& c );
diff --git a/source/geometry/solids/BREPS/include/G4FPlane.hh b/source/geometry/solids/BREPS/include/G4FPlane.hh
index dce967b942..5aaa59574e 100644
--- a/source/geometry/solids/BREPS/include/G4FPlane.hh
+++ b/source/geometry/solids/BREPS/include/G4FPlane.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FPlane.hh,v 1.4.8.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FPlane.hh,v 1.5 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // L. Broglia
 // 
diff --git a/source/geometry/solids/BREPS/include/G4Globals.hh b/source/geometry/solids/BREPS/include/G4Globals.hh
index b935bec940..f48cc5882c 100644
--- a/source/geometry/solids/BREPS/include/G4Globals.hh
+++ b/source/geometry/solids/BREPS/include/G4Globals.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Globals.hh,v 1.1.10.1 1999/12/07 20:48:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Globals.hh,v 1.2 1999/12/15 14:49:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/support/globals.h,v 1.8 1994/04/18 18:29:03 atwood Exp  */
 //  File: globals.h
diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.hh b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
index 5d0e236e91..1533837956 100644
--- a/source/geometry/solids/BREPS/include/G4Hyperbola.hh
+++ b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Hyperbola.hh,v 1.2.8.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Hyperbola.hh,v 1.3 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __HYPERBOLICCURVE_H
 #define __HYPERBOLICCURVE_H 
diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.hh b/source/geometry/solids/BREPS/include/G4KnotVector.hh
index ee0984060a..e198b4f81f 100644
--- a/source/geometry/solids/BREPS/include/G4KnotVector.hh
+++ b/source/geometry/solids/BREPS/include/G4KnotVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KnotVector.hh,v 1.2.4.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KnotVector.hh,v 1.3 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __KNOTVECTOR_H
 #define __KNOTVECTOR_H
diff --git a/source/geometry/solids/BREPS/include/G4Line.hh b/source/geometry/solids/BREPS/include/G4Line.hh
index c0d3ff0208..8a09fc9e7a 100644
--- a/source/geometry/solids/BREPS/include/G4Line.hh
+++ b/source/geometry/solids/BREPS/include/G4Line.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Line.hh,v 1.2.8.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Line.hh,v 1.3 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __LINE_H
 #define __LINE_H 
diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
index 2ba764aadc..abd28176b4 100644
--- a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
+++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OsloMatrix.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OsloMatrix.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef __G4OsloMatrix_h
diff --git a/source/geometry/solids/BREPS/include/G4Parabola.hh b/source/geometry/solids/BREPS/include/G4Parabola.hh
index c760739897..567e845b69 100644
--- a/source/geometry/solids/BREPS/include/G4Parabola.hh
+++ b/source/geometry/solids/BREPS/include/G4Parabola.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Parabola.hh,v 1.2.8.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Parabola.hh,v 1.3 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef __PARABOLICCURVE_H
diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
index a2ff3f2265..e9d0f54af7 100644
--- a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
+++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PlacedSolid.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PlacedSolid.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PLACEDSOLID_HH
diff --git a/source/geometry/solids/BREPS/include/G4Plane.hh b/source/geometry/solids/BREPS/include/G4Plane.hh
index a3fa4ecc7f..ab16f573dd 100644
--- a/source/geometry/solids/BREPS/include/G4Plane.hh
+++ b/source/geometry/solids/BREPS/include/G4Plane.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Plane.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Plane.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4Plane
 #define __G4Plane
diff --git a/source/geometry/solids/BREPS/include/G4Point3DVector.hh b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
index e40885e92d..aa0105fd71 100644
--- a/source/geometry/solids/BREPS/include/G4Point3DVector.hh
+++ b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Point3DVector.hh,v 1.2.2.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Point3DVector.hh,v 1.3 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef included_G4Point3DVector
 #define included_G4Point3DVector
diff --git a/source/geometry/solids/BREPS/include/G4PointRat.hh b/source/geometry/solids/BREPS/include/G4PointRat.hh
index 0cd9be24df..02d0154652 100644
--- a/source/geometry/solids/BREPS/include/G4PointRat.hh
+++ b/source/geometry/solids/BREPS/include/G4PointRat.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PointRat.hh,v 1.3.4.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PointRat.hh,v 1.4 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Modif 8 oct 98 : A.Floquet
diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
index cf7eba052e..28891d9c94 100644
--- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProjectedSurface.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProjectedSurface.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4ProjectedSurface_h
 #define __G4ProjectedSurface_h 1
diff --git a/source/geometry/solids/BREPS/include/G4Ray.hh b/source/geometry/solids/BREPS/include/G4Ray.hh
index f2fbbdd8a9..4032069613 100644
--- a/source/geometry/solids/BREPS/include/G4Ray.hh
+++ b/source/geometry/solids/BREPS/include/G4Ray.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Ray.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Ray.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4Ray_h
 #define __G4Ray_h 1
diff --git a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
index 2000da826f..8cd7863489 100644
--- a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RectangularTrimmedSurface.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RectangularTrimmedSurface.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4FCylindricalSurface.hh"
 
diff --git a/source/geometry/solids/BREPS/include/G4Sort.hh b/source/geometry/solids/BREPS/include/G4Sort.hh
index cf60f6231a..df4bb7ecb2 100644
--- a/source/geometry/solids/BREPS/include/G4Sort.hh
+++ b/source/geometry/solids/BREPS/include/G4Sort.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Sort.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Sort.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  File: G4Sort.h
 //  Author:  Alan Breakstone
diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
index ebdef9c5da..edd8143dfd 100644
--- a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SphericalSurface.hh,v 1.1.10.1 1999/12/07 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SphericalSurface.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4SpheShell_H
 #define __G4SpheShell_H
@@ -84,7 +84,7 @@ public:
   }
 
   virtual char *NameOf() const { return "G4SphericalSurface"; }
-  virtual void PrintOn( ostream& os = G4cout ) const;
+  virtual void PrintOn( G4std::ostream& os = G4cout ) const;
   
   int operator==( const G4SphericalSurface& s )
   { return origin  == s.origin  &&  
@@ -180,7 +180,7 @@ private:
 //----->virtual char *NameOf() const { return "G4SphericalSurface"; }
 //
 //  printing function
-//----->virtual void PrintOn( ostream& os = G4cout ) const;
+//----->virtual void PrintOn( G4std::ostream& os = G4cout ) const;
 //
 //  equality operator
 //----->int operator==( const G4SphericalSurface& s )
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceList.hh b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
index fcf94d2578..00f9d3aa48 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceList.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SurfaceList.hh,v 1.1.10.1 1999/12/07 20:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SurfaceList.hh,v 1.2 1999/12/15 14:49:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4SurfaceList_h
 #define __G4SurfaceList_h 1
diff --git a/source/geometry/solids/BREPS/include/G4ThreeMat.hh b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
index 29e458b762..81ec4ba530 100644
--- a/source/geometry/solids/BREPS/include/G4ThreeMat.hh
+++ b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ThreeMat.hh,v 1.1.10.1 1999/12/07 20:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ThreeMat.hh,v 1.2 1999/12/15 14:49:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  G4ThreeMat.h,v 1.7 1993/12/30 02:15:55 rensing Exp  */
 //  File: G4ThreeMat.h
@@ -55,8 +55,8 @@ public:
 //  function to return class name
 	virtual char *NameOf() const { return "G4ThreeMat"; }
 //  printing functions (derived classes do not need to overwrite operator <<)
-	friend ostream& operator<<( ostream& os, const G4ThreeMat& m );
-	virtual void PrintOn( ostream& os = G4cout ) const;
+	friend G4std::ostream& operator<<( G4std::ostream& os, const G4ThreeMat& m );
+	virtual void PrintOn( G4std::ostream& os = G4cout ) const;
 //  equality operator
 	int operator==( const G4ThreeMat& m );
 //
diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
index 0fc7eb9334..bd048e10c4 100644
--- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ToroidalSurface.hh,v 1.1.10.1 1999/12/07 20:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ToroidalSurface.hh,v 1.2 1999/12/15 14:49:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef __G4TOROIDALSURAFCE
diff --git a/source/geometry/solids/BREPS/include/G4UVHit.hh b/source/geometry/solids/BREPS/include/G4UVHit.hh
index 003bad918d..485a729ea6 100644
--- a/source/geometry/solids/BREPS/include/G4UVHit.hh
+++ b/source/geometry/solids/BREPS/include/G4UVHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UVHit.hh,v 1.1.10.1 1999/12/07 20:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UVHit.hh,v 1.2 1999/12/15 14:49:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef __G4UV_Hit
 #define __G4UV_Hit
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolid.cc b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
index 53b037a6a6..0122870e67 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolid.cc,v 1.9.4.1 1999/12/07 20:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolid.cc,v 1.10 1999/12/15 14:49:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G4BREPSolid.hh"
 #include "G4VoxelLimits.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
index dd70b29b33..ebc1492647 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidBox.cc,v 1.1.10.1 1999/12/07 20:48:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidBox.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4BREPSolidBox.hh"
 #include "G4FPlane.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
index 32376f039b..b6ab48c2eb 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidCone.cc,v 1.1.10.1 1999/12/07 20:48:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidCone.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4BREPSolidCone.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
index e12fdf06de..35587ac9fb 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidCylinder.cc,v 1.1.10.1 1999/12/07 20:48:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidCylinder.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4BREPSolidCylinder.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
index 7b41c4f702..0a1b792b9b 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidPCone.cc,v 1.12.8.1 1999/12/07 20:48:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidPCone.cc,v 1.14 1999/12/15 17:17:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // The polyconical solid G4BREPSolidPCone is a shape defined by a set of 
@@ -98,7 +98,7 @@ G4BREPSolidPCone::G4BREPSolidPCone(G4String name,
       {
         G4cerr << "Error in construction of G4BREPSolidPCone "
                << "Exactly the same z, rmin and rmax given for "
-               << "consecutive indices, " << a << " and " << a+1 << endl;
+               << "consecutive indices, " << a << " and " << a+1 << G4endl;
         continue; 
       }
 
@@ -485,7 +485,7 @@ G4ThreeVector G4BREPSolidPCone::SurfaceNormal(const G4ThreeVector& Pt) const
 
     return n;
   } else {
-    cout << "Warning ... PCone not able to return normal .. " << endl;
+    G4cout << "Warning ... PCone not able to return normal .. " << G4endl;
     return ( G4ThreeVector(1,0,0));
   }
 }
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
index 19324e4b8b..27bb153160 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidPolyhedra.cc,v 1.10.6.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidPolyhedra.cc,v 1.11 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Corrections by S.Giani:
 // - Xaxis now corresponds to phi=0
@@ -248,18 +248,18 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(G4String name,
   
   if(print_pgone_parameters)
   {
-    G4cout << "Parameters of the G4PGone " << name << endl;
-    G4cout << "  starting angle =" << original_parameters.Start_angle << endl;
-    G4cout << "  opening angle =" << original_parameters.Opening_angle << endl;
-    G4cout << "  sides =" << original_parameters.Sides << endl;
-    G4cout << "  nb of z planes=" << original_parameters.Num_z_planes << endl;
+    G4cout << "Parameters of the G4PGone " << name << G4endl;
+    G4cout << "  starting angle =" << original_parameters.Start_angle << G4endl;
+    G4cout << "  opening angle =" << original_parameters.Opening_angle << G4endl;
+    G4cout << "  sides =" << original_parameters.Sides << G4endl;
+    G4cout << "  nb of z planes=" << original_parameters.Num_z_planes << G4endl;
 
     for (G4int nb = 0; nb <= sections; nb++)
     {
       G4cout << "   Z[" << nb << "] = " << original_parameters.Z_values[nb];
       G4cout << "   Rmin[" << nb << "] = " << original_parameters.Rmin[nb];
       G4cout << "   Rmax[" << nb << "] = " << original_parameters.Rmax[nb] 
-	     << endl;
+	     << G4endl;
     }   
   }
 #endif
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
index 2fbe0f25a0..df514626ca 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidSphere.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidSphere.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4BREPSolidSphere.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
index a83203465f..77e6c737c6 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BREPSolidTorus.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BREPSolidTorus.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4BREPSolidTorus.hh"
 #include "G4ToroidalSurface.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
index f37e3a72c5..4dd3cfbaf9 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineCurve.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineCurve.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4BSplineCurve.hh"
 #include "G4ControlPoints.hh"
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
index c6f921edfb..ca35c97901 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineCurveWithKnots.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineCurveWithKnots.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4BSplineCurveWithKnots.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
index b314b5a68c..a1820ca5a5 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BSplineSurface.cc,v 1.2.8.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BSplineSurface.cc,v 1.3 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "EntityInst.h"
diff --git a/source/geometry/solids/BREPS/src/G4BezierSurface.cc b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
index dc1a2f2a92..a763a9ba13 100644
--- a/source/geometry/solids/BREPS/src/G4BezierSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BezierSurface.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BezierSurface.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // L. Broglia, 10/10/98
 // Error in line 331 and replaced addition of coordinates by 
diff --git a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
index c3acfc1536..fff5355d73 100644
--- a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
+++ b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
@@ -28,12 +28,12 @@ void G4BoundingBox3D::Init(const G4Point3D& p1, const G4Point3D& p2)
   // Maybe temporary
   // Create a BBox bigger than the reality
 
-  box_min.setX( min(p1.x(), p2.x()) - kCarTolerance );
-  box_min.setY( min(p1.y(), p2.y()) - kCarTolerance );
-  box_min.setZ( min(p1.z(), p2.z()) - kCarTolerance );
-  box_max.setX( max(p1.x(), p2.x()) + kCarTolerance );
-  box_max.setY( max(p1.y(), p2.y()) + kCarTolerance );
-  box_max.setZ( max(p1.z(), p2.z()) + kCarTolerance );
+  box_min.setX( G4std::min(p1.x(), p2.x()) - kCarTolerance );
+  box_min.setY( G4std::min(p1.y(), p2.y()) - kCarTolerance );
+  box_min.setZ( G4std::min(p1.z(), p2.z()) - kCarTolerance );
+  box_max.setX( G4std::max(p1.x(), p2.x()) + kCarTolerance );
+  box_max.setY( G4std::max(p1.y(), p2.y()) + kCarTolerance );
+  box_max.setZ( G4std::max(p1.z(), p2.z()) + kCarTolerance );
   
   // Calc half spaces
   GeantBox = (box_max - box_min)*0.5;
diff --git a/source/geometry/solids/BREPS/src/G4CircularCurve.cc b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
index 722e6e16c1..05be2b8621 100644
--- a/source/geometry/solids/BREPS/src/G4CircularCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CircularCurve.cc,v 1.1.10.1 1999/12/07 20:48:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CircularCurve.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4CircularCurve.hh"
diff --git a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
index bb495bf884..220143fbb5 100644
--- a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ConicalSurface.cc,v 1.1.10.1 1999/12/07 20:48:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ConicalSurface.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/G4ConicalSurface.cc,v 1.6 1994/08/03 17:15:01 burnett Exp  */
 //  File:  G4ConicalSurface.cc
@@ -17,7 +17,7 @@
 //	G4ConicalSurface::G4ConicalSurface()
 //	G4ConicalSurface::G4ConicalSurface( const G4Vector3D& o, 
 //                                          const G4Vector3D& a, G4double e )
-//	G4ConicalSurface::PrintOn( ostream& os ) const
+//	G4ConicalSurface::PrintOn( G4std::ostream& os ) const
 //	G4ConicalSurface::HowNear( const G4Vector3D& x ) const
 //	G4ConicalSurface::distanceAlongRay( int which_way, const Ray* ry,
 //				 G4Vector3D& p ) const
@@ -91,9 +91,9 @@ void G4ConicalSurface::CalcBBox()
 }
 
 
-void G4ConicalSurface::PrintOn( ostream& os ) const
+void G4ConicalSurface::PrintOn( G4std::ostream& os ) const
 { 
-  // printing function using C++ ostream class
+  // printing function using C++ G4std::ostream class
   os << "G4ConicalSurface surface with origin: " << origin << "\t"
      << "angle: " << angle << " radians \tand axis " << axis << "\n";
 }
diff --git a/source/geometry/solids/BREPS/src/G4ControlPoints.cc b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
index 833feb6a29..73c67cea6f 100644
--- a/source/geometry/solids/BREPS/src/G4ControlPoints.cc
+++ b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ControlPoints.cc,v 1.1.10.1 1999/12/07 20:48:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ControlPoints.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Modif 8 oct 98 : A.Floquet
diff --git a/source/geometry/solids/BREPS/src/G4Curve.cc b/source/geometry/solids/BREPS/src/G4Curve.cc
index 89b6166afc..7e21c35135 100644
--- a/source/geometry/solids/BREPS/src/G4Curve.cc
+++ b/source/geometry/solids/BREPS/src/G4Curve.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Curve.cc,v 1.1.10.1 1999/12/07 20:48:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Curve.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Curve.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
index c36b34eba5..85b78462dc 100644
--- a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CylindricalSurface.cc,v 1.1.10.1 1999/12/07 20:48:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CylindricalSurface.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/G4CylindricalSurface.cc,v 1.24 1994/08/03 17:15:09 burnett Exp  */
 //  File:  G4CylindricalSurface.cc
@@ -18,7 +18,7 @@
 //	G4CylindricalSurface::G4CylindricalSurface( const G4Vector3D& o, 
 //                                                  const G4Vector3D& a,      
 //                                                  G4double r          )
-//	G4CylindricalSurface::PrintOn( ostream& os ) const
+//	G4CylindricalSurface::PrintOn( G4std::ostream& os ) const
 //	G4CylindricalSurface::HowNear( const G4Vector3D& x ) const
 //	G4CylindricalSurface::distanceAlongRay( int which_way, const Ray* ry,
 //				    G4Vector3D& p ) const
@@ -85,9 +85,9 @@ G4CylindricalSurface::G4CylindricalSurface( const G4Vector3D& o,
 }
 
 
-void G4CylindricalSurface::PrintOn( ostream& os ) const
+void G4CylindricalSurface::PrintOn( G4std::ostream& os ) const
 {
-  // printing function using C++ ostream class
+  // printing function using C++ G4std::ostream class
   os << "G4CylindricalSurface surface with origin: " << origin << "\t"
      << "radius: " << radius << "\tand axis " << axis << "\n";
 }
diff --git a/source/geometry/solids/BREPS/src/G4Ellipse.cc b/source/geometry/solids/BREPS/src/G4Ellipse.cc
index 8336db6d8d..abc8bb3978 100644
--- a/source/geometry/solids/BREPS/src/G4Ellipse.cc
+++ b/source/geometry/solids/BREPS/src/G4Ellipse.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Ellipse.cc,v 1.1.10.1 1999/12/07 20:48:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Ellipse.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4Ellipse.hh"
@@ -72,7 +72,7 @@ void G4Ellipse::InitBounded()
 {
   // original implementation
   // const G4Point3D& center = position.GetLocation();
-  // G4double maxEntent      = max(semiAxis1, semiAxis2);
+  // G4double maxEntent      = G4std::max(semiAxis1, semiAxis2);
   // G4Vector3D halfExtent(maxEntent, maxEntent, maxEntent);
   // bBox.Init(center+halfExtent, center-halfExtent);
 
diff --git a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
index 021abbb1bb..475c3acd48 100644
--- a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FConicalSurface.cc,v 1.8.8.1 1999/12/07 20:48:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FConicalSurface.cc,v 1.9 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/G4FConicalSurface.cc,v 1.2 1993/02/05 00:38:39 alanb Exp  */
 //  File:  G4FConicalSurface.cc
@@ -18,7 +18,7 @@
 //                                            const G4Vector3D& a,
 //		G4double l, G4double sr, G4double lr )
 //	G4FConicalSurface::G4FConicalSurface( const G4FConicalSurface& c )
-//	G4FConicalSurface::PrintOn( ostream& os ) const
+//	G4FConicalSurface::PrintOn( G4std::ostream& os ) const
 //	G4FConicalSurface::operator==( const G4FConicalSurface& c )
 //	G4FConicalSurface::WithinBoundary( const G4Vector3D& x ) const
 //	G4FConicalSurface::Scale() const
@@ -139,9 +139,9 @@ void G4FConicalSurface::CalcBBox()
 }
 
 
-void G4FConicalSurface::PrintOn( ostream& os ) const
+void G4FConicalSurface::PrintOn( G4std::ostream& os ) const
 { 
-  //  printing function using C++ ostream class
+  //  printing function using C++ G4std::ostream class
   os << "G4FConicalSurface with origin: " << origin << "\t"
      << "and axis: " << Position.GetAxis() << "\n"
      << "\t small radius: " << small_radius 
@@ -362,7 +362,7 @@ G4double G4FConicalSurface::HowNear( const G4Vector3D& x ) const
     hownear = fabs(m*xd.x()-xd.z()+q)/sqrt(1+m*m);
     return hownear;
   } else {
-    hownear = min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
+    hownear = G4std::min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
     return hownear;
   }
 
diff --git a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
index f96d92f2fe..066b3c5906 100644
--- a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FCylindricalSurface.cc,v 1.8.8.1 1999/12/07 20:48:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FCylindricalSurface.cc,v 1.9 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  /usr/local/gismo/repo/geometry/FG4Cylinder.cc,v 1.1 1992/10/27 22:02:29 alanb Exp  */
 //  File:  FG4Cylinder.cc
@@ -17,7 +17,7 @@
 //      FG4Cylinder::FG4Cylinder( const G4Point3D& o, const G4ThreeVec& a,
 //	                          G4double r, G4double l )
 //	FG4Cylinder::FG4Cylinder( const FG4Cylinder& c )
-//	FG4Cylinder::PrintOn( ostream& os ) const
+//	FG4Cylinder::PrintOn( G4std::ostream& os ) const
 //	FG4Cylinder::operator==( const FG4Cylinder& c )
 //	FG4Cylinder::WithinBoundary( const G4ThreeVec& x ) const
 //	FG4Cylinder::Scale() const
@@ -76,8 +76,8 @@ G4FCylindricalSurface::G4FCylindricalSurface( const G4FCylindricalSurface& c )
   length = c.length;
 }
 
-//  printing function using C++ ostream class
-void G4FCylindricalSurface::PrintOn( ostream& os ) const
+//  printing function using C++ G4std::ostream class
+void G4FCylindricalSurface::PrintOn( G4std::ostream& os ) const
 { 
   os << "G4FCylindricalSurface with origin: " << origin << "\t"
      << "and axis: " << Position.GetAxis() << "\n"
@@ -239,7 +239,7 @@ G4double G4FCylindricalSurface::HowNear( const G4Vector3D& x ) const
   if ( ((Zinter >= downcorner.z()) && (Zinter <=upcorner.z())) ) {
     hownear = fabs( radius - xd.x() );
   } else {
-    hownear = min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
+    hownear = G4std::min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
   }
 
   return hownear;
diff --git a/source/geometry/solids/BREPS/src/G4FPlane.cc b/source/geometry/solids/BREPS/src/G4FPlane.cc
index 6f113bdc62..d9c80f596c 100644
--- a/source/geometry/solids/BREPS/src/G4FPlane.cc
+++ b/source/geometry/solids/BREPS/src/G4FPlane.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FPlane.cc,v 1.6.8.1 1999/12/07 20:48:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FPlane.cc,v 1.7 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Corrections by S.Giani:
 // - The constructor using iVec now properly stores both the internal and
diff --git a/source/geometry/solids/BREPS/src/G4Hyperbola.cc b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
index c8d7a6f271..61ee8dfce5 100644
--- a/source/geometry/solids/BREPS/src/G4Hyperbola.cc
+++ b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Hyperbola.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Hyperbola.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4Hyperbola.hh"
diff --git a/source/geometry/solids/BREPS/src/G4KnotVector.cc b/source/geometry/solids/BREPS/src/G4KnotVector.cc
index 492b42ab8c..7433a0ef2b 100644
--- a/source/geometry/solids/BREPS/src/G4KnotVector.cc
+++ b/source/geometry/solids/BREPS/src/G4KnotVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KnotVector.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KnotVector.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4KnotVector.hh"
diff --git a/source/geometry/solids/BREPS/src/G4Line.cc b/source/geometry/solids/BREPS/src/G4Line.cc
index f0aab1f1b9..b7aaea781f 100644
--- a/source/geometry/solids/BREPS/src/G4Line.cc
+++ b/source/geometry/solids/BREPS/src/G4Line.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Line.cc,v 1.3.8.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Line.cc,v 1.4 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Line.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
index 1fb22acae1..f160431bcc 100644
--- a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
+++ b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OsloMatrix.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OsloMatrix.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4OsloMatrix.hh"
diff --git a/source/geometry/solids/BREPS/src/G4Parabola.cc b/source/geometry/solids/BREPS/src/G4Parabola.cc
index c4fcfa24ae..3835a90cb3 100644
--- a/source/geometry/solids/BREPS/src/G4Parabola.cc
+++ b/source/geometry/solids/BREPS/src/G4Parabola.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Parabola.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Parabola.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Parabola.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
index 8a4c665daa..7e2ab57d07 100644
--- a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PlacedSolid.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PlacedSolid.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4PlacedSolid.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4PointRat.cc b/source/geometry/solids/BREPS/src/G4PointRat.cc
index bec2ab71e6..e3046cd376 100644
--- a/source/geometry/solids/BREPS/src/G4PointRat.cc
+++ b/source/geometry/solids/BREPS/src/G4PointRat.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PointRat.cc,v 1.1.10.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PointRat.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Modif 8 oct 98 : A.Floquet
diff --git a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
index a501de7fd9..7086a57fa4 100644
--- a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProjectedSurface.cc,v 1.2.8.1 1999/12/07 20:48:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProjectedSurface.cc,v 1.3 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4ProjectedSurface.hh"
  
diff --git a/source/geometry/solids/BREPS/src/G4Ray.cc b/source/geometry/solids/BREPS/src/G4Ray.cc
index 602bfaa9d9..acabe18d59 100644
--- a/source/geometry/solids/BREPS/src/G4Ray.cc
+++ b/source/geometry/solids/BREPS/src/G4Ray.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Ray.cc,v 1.1.10.1 1999/12/07 20:48:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Ray.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Ray.hh"
 #include "G4PointRat.hh"
diff --git a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
index bdd18e94b7..04e8f81864 100644
--- a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RectangularTrimmedSurface.cc,v 1.1.10.1 1999/12/07 20:48:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RectangularTrimmedSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "SdaiCONFIG_CONTROL_DESIGN.h"
 #include "G4RectangularTrimmedSurface.hh"
diff --git a/source/geometry/solids/BREPS/src/G4Sort.cc b/source/geometry/solids/BREPS/src/G4Sort.cc
index 55ce84256d..88dc95488b 100644
--- a/source/geometry/solids/BREPS/src/G4Sort.cc
+++ b/source/geometry/solids/BREPS/src/G4Sort.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Sort.cc,v 1.1.10.1 1999/12/07 20:48:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Sort.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  File: G4Sort.cc
 //  Author:  Alan Breakstone
diff --git a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
index 7717cea982..9fe15c1c62 100644
--- a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SphericalSurface.cc,v 1.1.10.1 1999/12/07 20:48:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SphericalSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  $Header: /private/Net/unixhub/u1/ea/liml/gismo/gismo-0.2/geometry/RCS/G4SphericalSurface.cc,v 1.10 1992/08   */
 //  File:  G4SphericalSurface.cc
@@ -20,7 +20,7 @@
 //                            const G4Vector3D& zhat,
 //			      G4double r, G4double ph1, G4double ph2,
 //		              G4double th1, G4double th2 )
-//	G4SphericalSurface::PrintOn( ostream& os ) const
+//	G4SphericalSurface::PrintOn( G4std::ostream& os ) const
 //	G4SphericalSurface::HowNear( const G4Vector3D& x ) const
 //	G4SphericalSurface::distanceAlongRay( int which_way, const Ray* ry,
 //				     G4Vector3D& p ) const
@@ -162,9 +162,9 @@ G4SphericalSurface::G4SphericalSurface( const G4Vector3D& o,
 }
 
 
-void G4SphericalSurface::PrintOn( ostream& os ) const
+void G4SphericalSurface::PrintOn( G4std::ostream& os ) const
 {  
-  //  printing function using C++ ostream class
+  //  printing function using C++ G4std::ostream class
   os << "G4SphericalSurface surface with origin: " << origin << "\t"
      << "radius: " << radius << "\n"
      << "\t local x_axis: " << x_axis
diff --git a/source/geometry/solids/BREPS/src/G4Surface.cc b/source/geometry/solids/BREPS/src/G4Surface.cc
index 231e025bfb..724541c388 100644
--- a/source/geometry/solids/BREPS/src/G4Surface.cc
+++ b/source/geometry/solids/BREPS/src/G4Surface.cc
@@ -157,8 +157,8 @@ G4double G4Surface::ClosestDistanceToPoint(const G4Point3D& Pt)
 
 //  Contents ----------------------------------------------------------
 //
-//	operator<<( ostream& os, const Surface& s )
-//	Surface::PrintOn( ostream& os ) const
+//	operator<<( G4std::ostream& os, const Surface& s )
+//	Surface::PrintOn( G4std::ostream& os ) const
 //	Surface::HowNear( const G4ThreeVec& x ) const
 //	Surface::distanceAlongRay( int which_way, const Ray* ry,
 //				   G4ThreeVec& p ) const
@@ -175,7 +175,7 @@ G4double G4Surface::ClosestDistanceToPoint(const G4Point3D& Pt)
 //
 //  End ---------------------------------------------------------------
 
-ostream& operator<<( ostream& os, const G4Surface& s )
+G4std::ostream& operator<<( G4std::ostream& os, const G4Surface& s )
 {
   // overwrite output operator << to Print out Surface objects
   // using the PrintOn function defined below
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceList.cc b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
index 595df67995..da0e4b267e 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceList.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SurfaceList.cc,v 1.1.10.1 1999/12/07 20:48:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SurfaceList.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4SurfaceList.hh"
 
diff --git a/source/geometry/solids/BREPS/src/G4ThreeMat.cc b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
index dcfede43f8..dd1ba6529d 100644
--- a/source/geometry/solids/BREPS/src/G4ThreeMat.cc
+++ b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ThreeMat.cc,v 1.1.10.1 1999/12/07 20:48:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ThreeMat.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  G4ThreeMat.cc,v 1.5 1993/08/02 22:21:27 atwood Exp  */
 // File: G4ThreeMat.cc
@@ -16,8 +16,8 @@
 //
 //	G4ThreeMat::G4ThreeMat()
 //	G4ThreeMat::G4ThreeMat( G4double a[3][3] )
-//	operator<<( ostream&, const G4ThreeMat& m );
-//	G4ThreeMat::PrintOn( ostream& os ) const
+//	operator<<( G4std::ostream&, const G4ThreeMat& m );
+//	G4ThreeMat::PrintOn( G4std::ostream& os ) const
 //	operator==( const G4ThreeMat& m )
 //	G4ThreeMat::operator=( const G4ThreeMat& m )
 //	G4ThreeMat::operator-()
@@ -76,7 +76,7 @@ G4ThreeMat::G4ThreeMat( const G4ThreeMat& m )
 }
 
 
-ostream& operator<<( ostream& os, const G4ThreeMat& m )
+G4std::ostream& operator<<( G4std::ostream& os, const G4ThreeMat& m )
 {
   // overwrite output operator << to Print out G4ThreeMat objects
   // using the PrintOn function defined below
@@ -85,9 +85,9 @@ ostream& operator<<( ostream& os, const G4ThreeMat& m )
 }
 
 
-void G4ThreeMat::PrintOn( ostream& os ) const
+void G4ThreeMat::PrintOn( G4std::ostream& os ) const
 {
-  // printing function using C++ ostream class
+  // printing function using C++ G4std::ostream class
   os << "[ " << element[0][0] << "\t" 
      << element[0][1] << "\t"
      << element[0][2] << "\n  "
diff --git a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
index f8b9f411dd..693e32c846 100644
--- a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ToroidalSurface.cc,v 1.1.10.1 1999/12/07 20:48:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ToroidalSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4ToroidalSurface.hh"
 
diff --git a/source/geometry/solids/Boolean/History b/source/geometry/solids/Boolean/History
index c269fe9fdd..f95b1d5636 100644
--- a/source/geometry/solids/Boolean/History
+++ b/source/geometry/solids/Boolean/History
@@ -1,5 +1,5 @@
 
-$Id: History,v 1.4 1999/11/24 20:17:20 japost Exp $
+$Id: History,v 1.5 2000/01/19 19:24:25 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -19,6 +19,13 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+ Gen 19   2000	Gabriele Cosmo		geom-solid-bool-V01-00-00
+
+  - Syncronized file versions with HEAD (essentially CVS headers changes)
+  - Fixed cases of G4std::min which were not migrated on the HEAD in files:
+    G4UnionSolid.cc and G4IntersectionSolid.cc
+
  Nov 24   1999 				geom-solid-bool-V00-01-05
 
   - Small fix in src/G4DisplacedSolid.cc to the return type 
diff --git a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
index 55795d7307..ca93550ce3 100644
--- a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
@@ -87,8 +87,8 @@ G4IntersectionSolid::CalculateExtent(const EAxis pAxis,
   retA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
   retB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
 
-  pMin = max( minA, minB ); 
-  pMax = min( maxA, maxB ); 
+  pMin = G4std::max( minA, minB ); 
+  pMax = G4std::min( maxA, maxB ); 
 
   return retA && retB ; // It exists in this slice only if both exist in it.
 }
@@ -317,7 +317,7 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p) const
     }
     else
     {
-      dist =  min(fPtrSolidA->DistanceToIn(p),
+      dist =  G4std::min(fPtrSolidA->DistanceToIn(p),
                     fPtrSolidB->DistanceToIn(p) ) ; 
     }
   }
@@ -341,10 +341,10 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p,
   }
   G4double distA = fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n) ;
   G4double distB = fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ;
-  G4double dist = min(distA,distB) ; 
+  G4double dist = G4std::min(distA,distB) ; 
   return dist ; 
-  //  return min(fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n),
-  //	     fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ) ; 
+  //  return G4std::min(fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n),
+  //	                fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ) ; 
 }
 
 //////////////////////////////////////////////////////////////
@@ -360,8 +360,8 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p ) const
   }
 
 
-  return min(fPtrSolidA->DistanceToOut(p),
-             fPtrSolidB->DistanceToOut(p) ) ; 
+  return G4std::min(fPtrSolidA->DistanceToOut(p),
+                    fPtrSolidB->DistanceToOut(p) ) ; 
 
 }
 
diff --git a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
index 442afeebfd..e7fc1f6e87 100644
--- a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
@@ -306,7 +306,7 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p ) const
   }
   else
   {
-     dist= min(fPtrSolidA->DistanceToOut(p),
+     dist= G4std::min(fPtrSolidA->DistanceToOut(p),
                fPtrSolidB->DistanceToIn(p) ) ; 
   }
   return dist; 
diff --git a/source/geometry/solids/Boolean/src/G4UnionSolid.cc b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
index 6ccfb76b8b..6ab48c0167 100644
--- a/source/geometry/solids/Boolean/src/G4UnionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
@@ -89,8 +89,8 @@ G4UnionSolid::CalculateExtent(const EAxis pAxis,
   touchesA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
   touchesB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
 
-  pMin = min( minA, minB ); 
-  pMax = max( maxA, maxB ); 
+  pMin = G4std::min( minA, minB ); 
+  pMax = G4std::max( maxA, maxB ); 
 
   return touchesA || touchesB ;  // It exists in this slice if either one does.
 }
@@ -169,8 +169,8 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p,
   {
     G4Exception("Invalid call in G4IntersectionSolid::DistanceToIn(p,v),  point p is inside") ;
   }
-  return min(fPtrSolidA->DistanceToIn(p,v),
-             fPtrSolidB->DistanceToIn(p,v) ) ;
+  return G4std::min(fPtrSolidA->DistanceToIn(p,v),
+                    fPtrSolidB->DistanceToIn(p,v) ) ;
 }
 
 ////////////////////////////////////////////////////////
@@ -188,7 +188,7 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p) const
   G4double distA = fPtrSolidA->DistanceToIn(p) ;
   G4double distB = fPtrSolidB->DistanceToIn(p) ;
 
-  return min(distA,distB) ;
+  return G4std::min(distA,distB) ;
 }
 
 //////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p ) const
        (positionA == kInside  && positionB == kSurface ) ||
        (positionA == kSurface && positionB == kInside  )     )
     {     
-      distout= max(fPtrSolidA->DistanceToOut(p),
+      distout= G4std::max(fPtrSolidA->DistanceToOut(p),
 		   fPtrSolidB->DistanceToOut(p) ) ;
     }
     else
diff --git a/source/geometry/solids/CSG/History b/source/geometry/solids/CSG/History
index dfb442b98e..99596e1b0c 100644
--- a/source/geometry/solids/CSG/History
+++ b/source/geometry/solids/CSG/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.8 1999/11/19 16:22:52 grichine Exp $
+$Id: History,v 1.11 2000/03/03 12:24:06 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,20 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Mar 03,   00   G. Cosmo                   geom-solids-csg-V01-00-05
+ - Minor fixes to unit tests to make them up-to-date with recent
+   development versions (already included in tag geometry-V01-00-00a).
+ - G4PolyconeSide.cc, G4PolyhedraSide.cc: added explicit cast to G4int
+   to avoid warnings on Linux.
+
+Jan 19,   00   G. Cosmo			  geom-solids-csg-01-00-04
+
+ - Fixed bug in DistanceToIn(p,v). Modified files: G4Trap.cc and
+   testG4Trap.cc. (V.Grichine)
+ - Syncronized file versions with HEAD (essentially CVS headers changes).
+ - Fixes for missing migration on HEAD related to some files in test/fred
+   and test/SBT.
+ 
 Nov 17,   99   J. Apostolakis             geom-solids-csg-01-00-03
  
  - Tagged
diff --git a/source/geometry/solids/CSG/include/G4Box.hh b/source/geometry/solids/CSG/include/G4Box.hh
index 88c894bb40..77397ddd7c 100644
--- a/source/geometry/solids/CSG/include/G4Box.hh
+++ b/source/geometry/solids/CSG/include/G4Box.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Box.hh,v 1.2.2.1 1999/12/07 20:48:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Box.hh,v 1.3 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Box
diff --git a/source/geometry/solids/CSG/include/G4CSGSolid.hh b/source/geometry/solids/CSG/include/G4CSGSolid.hh
index 9fa0d9acbe..bfe47edcba 100644
--- a/source/geometry/solids/CSG/include/G4CSGSolid.hh
+++ b/source/geometry/solids/CSG/include/G4CSGSolid.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CSGSolid.hh,v 1.1.10.1 1999/12/07 20:48:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CSGSolid.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 // class G4CSGSolid
diff --git a/source/geometry/solids/CSG/include/G4Cons.hh b/source/geometry/solids/CSG/include/G4Cons.hh
index 95bc124ffd..38cd19dc63 100644
--- a/source/geometry/solids/CSG/include/G4Cons.hh
+++ b/source/geometry/solids/CSG/include/G4Cons.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Cons.hh,v 1.1.10.1 1999/12/07 20:48:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Cons.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Cons
 //
diff --git a/source/geometry/solids/CSG/include/G4Hype.hh b/source/geometry/solids/CSG/include/G4Hype.hh
index 8471251d09..a5bf25aceb 100644
--- a/source/geometry/solids/CSG/include/G4Hype.hh
+++ b/source/geometry/solids/CSG/include/G4Hype.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Hype.hh,v 1.2.2.1 1999/12/07 20:48:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Hype.hh,v 1.3 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/solids/CSG/include/G4Para.hh b/source/geometry/solids/CSG/include/G4Para.hh
index fe54a3e96e..fabeaeea44 100644
--- a/source/geometry/solids/CSG/include/G4Para.hh
+++ b/source/geometry/solids/CSG/include/G4Para.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Para.hh,v 1.2.2.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Para.hh,v 1.3 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Para
 //
diff --git a/source/geometry/solids/CSG/include/G4Sphere.hh b/source/geometry/solids/CSG/include/G4Sphere.hh
index b5b60fe2d3..7551fe8010 100644
--- a/source/geometry/solids/CSG/include/G4Sphere.hh
+++ b/source/geometry/solids/CSG/include/G4Sphere.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Sphere.hh,v 1.1.10.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Sphere.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Sphere
 //
diff --git a/source/geometry/solids/CSG/include/G4Torus.hh b/source/geometry/solids/CSG/include/G4Torus.hh
index f98b86fd94..1fef296138 100644
--- a/source/geometry/solids/CSG/include/G4Torus.hh
+++ b/source/geometry/solids/CSG/include/G4Torus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Torus.hh,v 1.1.10.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Torus.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Torus
diff --git a/source/geometry/solids/CSG/include/G4Trap.hh b/source/geometry/solids/CSG/include/G4Trap.hh
index d0a31a0c18..fd8a50b209 100644
--- a/source/geometry/solids/CSG/include/G4Trap.hh
+++ b/source/geometry/solids/CSG/include/G4Trap.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trap.hh,v 1.1.10.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trap.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Trap
 //
diff --git a/source/geometry/solids/CSG/include/G4Trd.hh b/source/geometry/solids/CSG/include/G4Trd.hh
index 1c18218833..e2e4456189 100644
--- a/source/geometry/solids/CSG/include/G4Trd.hh
+++ b/source/geometry/solids/CSG/include/G4Trd.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trd.hh,v 1.2.2.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trd.hh,v 1.3 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // class G4Trd
diff --git a/source/geometry/solids/CSG/include/G4Tubs.hh b/source/geometry/solids/CSG/include/G4Tubs.hh
index 9e73a773b2..b3312b13ac 100644
--- a/source/geometry/solids/CSG/include/G4Tubs.hh
+++ b/source/geometry/solids/CSG/include/G4Tubs.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Tubs.hh,v 1.1.10.1 1999/12/07 20:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Tubs.hh,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Tubs
diff --git a/source/geometry/solids/CSG/src/G4Box.cc b/source/geometry/solids/CSG/src/G4Box.cc
index 819b4e536b..02eafb3abe 100644
--- a/source/geometry/solids/CSG/src/G4Box.cc
+++ b/source/geometry/solids/CSG/src/G4Box.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Box.cc,v 1.3.2.1 1999/12/07 20:48:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Box.cc,v 1.4 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/geometry/solids/CSG/src/G4CSGSolid.cc b/source/geometry/solids/CSG/src/G4CSGSolid.cc
index b38777f962..5eda84644b 100644
--- a/source/geometry/solids/CSG/src/G4CSGSolid.cc
+++ b/source/geometry/solids/CSG/src/G4CSGSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4CSGSolid.cc,v 1.1.10.1 1999/12/07 20:48:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4CSGSolid.cc,v 1.2 1999/12/15 14:50:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4CSGSolid.hh"
 
diff --git a/source/geometry/solids/CSG/src/G4Cons.cc b/source/geometry/solids/CSG/src/G4Cons.cc
index 26e0b323aa..2c4b8b2611 100644
--- a/source/geometry/solids/CSG/src/G4Cons.cc
+++ b/source/geometry/solids/CSG/src/G4Cons.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Cons.cc,v 1.5.2.1 1999/12/07 20:48:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Cons.cc,v 1.6 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Cons
 //
diff --git a/source/geometry/solids/CSG/src/G4Hype.cc b/source/geometry/solids/CSG/src/G4Hype.cc
index f7473adccf..92e71efe10 100644
--- a/source/geometry/solids/CSG/src/G4Hype.cc
+++ b/source/geometry/solids/CSG/src/G4Hype.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Hype.cc,v 1.3.2.1 1999/12/07 20:48:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Hype.cc,v 1.4 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Hype: this class implements in G4 the volume equivalent 
 //               to the HYPE volume in Geant 3, i.e. a tube with 
@@ -114,8 +114,8 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 {
 
 
-  //G4cout << "Calculate extent !"<< endl;
-  //G4cout << "Surface data: " << outerRadius << endl;
+  //G4cout << "Calculate extent !"<< G4endl;
+  //G4cout << "Surface data: " << outerRadius << G4endl;
 
   if (!pTransform.IsRotated())
 	{
@@ -134,7 +134,7 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 	  xoffset=pTransform.NetTranslation().x();
 	  xMin=xoffset-endOuterRadius;
 	  xMax=xoffset+endOuterRadius;
-	  //G4cout << "xMin, xMax : " << xMin << " " << xMax << endl;
+	  //G4cout << "xMin, xMax : " << xMin << " " << xMax << G4endl;
 	  if (pVoxelLimit.IsXLimited())
 	    {
 	      if (xMin>pVoxelLimit.GetMaxXExtent()+kCarTolerance ||
@@ -147,12 +147,12 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 		  if (xMin<pVoxelLimit.GetMinXExtent())
 		    {
 		      xMin=pVoxelLimit.GetMinXExtent();
-		      //G4cout << xMin << endl;
+		      //G4cout << xMin << G4endl;
 		    }
 		  if (xMax>pVoxelLimit.GetMaxXExtent())
 		    {
 		      xMax=pVoxelLimit.GetMaxXExtent();
-		      //G4cout << xMax << endl;
+		      //G4cout << xMax << G4endl;
 		    }
 		}
 	    }
@@ -208,7 +208,7 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 	  switch (pAxis)
 		{
 		case kXAxis:
-		  //G4cout << "kXAxis" << endl;
+		  //G4cout << "kXAxis" << G4endl;
 		  yoff1=yoffset-yMin;
 		  yoff2=yMax-yoffset;
 		  if (yoff1>=0&&yoff2>=0)
@@ -231,13 +231,13 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 		  
 		  break;
 		case kYAxis:
-		  //G4cout << "kYAxis" << endl;
+		  //G4cout << "kYAxis" << G4endl;
 		  xoff1=xoffset-xMin;
 		  xoff2=xMax-xoffset;
 		  if (xoff1>=0&&xoff2>=0)
 		   {
 		      // X limits cross max/min y => no change
-		     //G4cout << "assegnazione diretta, xoff1,2 > 0" << yMin << " " << yMax << endl;
+		     //G4cout << "assegnazione diretta, xoff1,2 > 0" << yMin << " " << yMax << G4endl;
 		     pMin=yMin;
 		     pMax=yMax;
 		   }
@@ -246,20 +246,20 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 		      // X limits don't cross max/min y => compute max delta y, hence new mins/maxs
 		      diff1=sqrt(abs(endOuterRadius2-xoff1*xoff1));
 		      diff2=sqrt(abs(endOuterRadius2-xoff2*xoff2));
-		      //G4cout << diff1 << " " << diff2 << endl;
+		      //G4cout << diff1 << " " << diff2 << G4endl;
 		      maxDiff=(diff1>diff2) ? diff1:diff2;
-		      //G4cout << "maxDiff " << maxDiff << endl;
+		      //G4cout << "maxDiff " << maxDiff << G4endl;
 		      newMin=yoffset-maxDiff;
 		      newMax=yoffset+maxDiff;
-		      //G4cout << "assegnazione indiretta" << yMin << " " << yMax << endl;
-		      //G4cout << "newMin, newMax : " << newMin << " " << newMax << endl;
+		      //G4cout << "assegnazione indiretta" << yMin << " " << yMax << G4endl;
+		      //G4cout << "newMin, newMax : " << newMin << " " << newMax << G4endl;
 		      
 		      pMin=(newMin<yMin) ? yMin : newMin;
 		      pMax=(newMax>yMax) ? yMax : newMax;
 		    }
 		  break;
 		case kZAxis:
-		  //G4cout << "kZAxis" << endl;
+		  //G4cout << "kZAxis" << G4endl;
 		  pMin=zMin;
 		  pMax=zMax;
 		  break;
@@ -268,8 +268,8 @@ G4bool G4Hype::CalculateExtent(const EAxis pAxis,
 	  pMin-=kCarTolerance;
 	  pMax+=kCarTolerance;
 
-	  //G4cout << xoffset << " " << yoffset << " " << zoffset << endl;
-	  //G4cout << "pMin, pMax: " << pMin << "," << pMax << endl << endl;
+	  //G4cout << xoffset << " " << yoffset << " " << zoffset << G4endl;
+	  //G4cout << "pMin, pMax: " << pMin << "," << pMax << G4endl << G4endl;
 	  return true;
 	  
 	}
@@ -336,8 +336,8 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 {
   // Get third component of point "in study"
   double xZ=abs(p.z());
-  //G4cout << "Inside::This point is : " << p << endl;
-  //G4cout << "Surface data : " << outerRadius << endl;
+  //G4cout << "Inside::This point is : " << p << G4endl;
+  //G4cout << "Surface data : " << outerRadius << G4endl;
 
   // if point's Z component is greater than halfLenZ it is SURELY outside.
   if (xZ<=(1+SURFACE_PRECISION)*halfLenZ)
@@ -354,7 +354,7 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 	  // 1. w/o inner surface 
 	  // 2. w/  inner surface
 
-	  //G4cout << "iRad, xR, oRad : " << sqrt(iRad2) << "  " << sqrt(xR2) << " " << sqrt(oRad2) << endl;
+	  //G4cout << "iRad, xR, oRad : " << sqrt(iRad2) << "  " << sqrt(xR2) << " " << sqrt(oRad2) << G4endl;
 
 	  if ((innerRadius==0.) && (innerStereo==0.))
 	    {
@@ -363,12 +363,12 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 		{ // on endcaps ?
 		  if (abs(xZ/halfLenZ-1)<SURFACE_PRECISION) 
 		    {
-		      //G4cout << "kSurf, no Inner, endcaps" << endl;
+		      //G4cout << "kSurf, no Inner, endcaps" << G4endl;
 		      return kSurface; // yes. On endcap!
 		    }
 		  else 
 		    {
-		      //G4cout << "kInside, no Inner, endcaps" << endl;		      
+		      //G4cout << "kInside, no Inner, endcaps" << G4endl;		      
 		      return kInside;  // no. It's inside!
 		    }
 		}
@@ -376,12 +376,12 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 	      else
 		if (abs(sqrt(xR2/oRad2)-1) < SURFACE_PRECISION)
 		  {
-		    //G4cout << "kSurf, no Inner, hype surface" << endl;
+		    //G4cout << "kSurf, no Inner, hype surface" << G4endl;
 		    return kSurface;  // yes...it's on the surface!
 		  }
 		else 
 		  {
-		    //G4cout << "kOut, no Inner, hype surface" << endl;
+		    //G4cout << "kOut, no Inner, hype surface" << G4endl;
 		    return kOutside;  // no...outside the hype.
 		  }
 	    }
@@ -395,12 +395,12 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 		  // on endcaps ??
 		  if (abs(xZ/halfLenZ-1)<SURFACE_PRECISION) 
 		    {
-		      //G4cout << "kSurf, Inner, endcaps" << endl;
+		      //G4cout << "kSurf, Inner, endcaps" << G4endl;
 		      return kSurface; // yes. On endcap!
 		    }
 		  else 
 		    {
-		      //G4cout << "kInside, inner, endcaps" << endl;
+		      //G4cout << "kInside, inner, endcaps" << G4endl;
 		      return kInside;  // no. It's inside!
 		    }
 		}
@@ -410,17 +410,17 @@ EInside G4Hype::Inside(const G4ThreeVector& p) const
 		    || 
 		    abs(sqrt(xR2/iRad2)-1) < SURFACE_PRECISION) 
 		  {
-		    //G4cout << "kSurf, inner, hype surface" << endl;
+		    //G4cout << "kSurf, inner, hype surface" << G4endl;
 		    return kSurface;  // yes...it's on the surface!
 		  }
 		else 
 		  {
-		    //G4cout << "kOutside, Inner, hype surface" << endl;
+		    //G4cout << "kOutside, Inner, hype surface" << G4endl;
 		    return kOutside;  // no...outside the hype.
 		  }
 	    }
 	}
-  //G4cout << "qui ci devo arrivare sse abs(z)>halfLenZ!!!! " << endl;
+  //G4cout << "qui ci devo arrivare sse abs(z)>halfLenZ!!!! " << G4endl;
   return kOutside;
 }
 
@@ -433,8 +433,8 @@ G4ThreeVector G4Hype::SurfaceNormal( const G4ThreeVector& p) const
   double zRadius2=p.x()*p.x()+p.y()*p.y();
   double param=0;
 
-  //G4cout << "Surface Normal " << p << endl;
-  //G4cout << "Surface data : " << outerRadius << endl;
+  //G4cout << "Surface Normal " << p << G4endl;
+  //G4cout << "Surface data : " << outerRadius << G4endl;
 
 
   // check if the point is on the endcaps
@@ -481,8 +481,8 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p,
     EInside Pp=Inside(p);
     double zero_tolerance=1e-6;
 
-    //G4cout << "DistToIn(pt,dir)" << p << " " << v << endl;
-    //G4cout << "Surface data : " << outerRadius << endl;
+    //G4cout << "DistToIn(pt,dir)" << p << " " << v << G4endl;
+    //G4cout << "Surface data : " << outerRadius << G4endl;
 
     if (Pp==kSurface || Pp==kInside)
       {
@@ -721,7 +721,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p,
 	  }
       }
     // Done!
-    //G4cout << "DistToIn(pt,dir) = " << snxt << endl;
+    //G4cout << "DistToIn(pt,dir) = " << snxt << G4endl;
     return snxt;
 }
  
@@ -741,13 +741,13 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
   double BpointR=0.;
   double BpointZ=pZ;
   
-  //G4cout << "DistToIn(pt)" << p << endl;
-  //G4cout << "Surface data : " << outerRadius << endl;
+  //G4cout << "DistToIn(pt)" << p << G4endl;
+  //G4cout << "Surface data : " << outerRadius << G4endl;
 
   EInside Pp=Inside(p);
   if (Pp==kSurface || Pp==kInside) 
     {
-      //G4cout << "Point on surface or inside, returning 0" << endl;
+      //G4cout << "Point on surface or inside, returning 0" << G4endl;
       return 0.;
     }
 
@@ -756,7 +756,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
       pR2<=(1+SURFACE_PRECISION)*(1+SURFACE_PRECISION)*endOuterRadius2 && 
       pR2>=(1-SURFACE_PRECISION)*(1-SURFACE_PRECISION)*endInnerRadius2)
     { 
-      //G4cout << "zone1 - returning : " <<  abs(pZ)-halfLenZ << endl;
+      //G4cout << "zone1 - returning : " <<  abs(pZ)-halfLenZ << G4endl;
       return abs(pZ)-halfLenZ; 
     }
 
@@ -765,12 +765,12 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
     { 
       if (pR<=(1+SURFACE_PRECISION)*innerRadius) 
 	{
-	  //G4cout << "z=0, inner nearer,  returning: " << (innerRadius-pR) << endl;
+	  //G4cout << "z=0, inner nearer,  returning: " << (innerRadius-pR) << G4endl;
 	  return abs(innerRadius-pR);
 	}
       else
 	{
-	  //G4cout << "z=0, outer nearer, returning: " << pR2-outerRadius << endl;
+	  //G4cout << "z=0, outer nearer, returning: " << pR2-outerRadius << G4endl;
 	  return abs(pR-outerRadius);
 	}
     }
@@ -782,7 +782,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
       if (pR>=(1-SURFACE_PRECISION)*outerRadius &&
 	  pZ<=(1+SURFACE_PRECISION)*halfLenZ)
 	{
-	  //G4cout << "zone2 - Cyl - returning : " <<  pR-outerRadius << endl;
+	  //G4cout << "zone2 - Cyl - returning : " <<  pR-outerRadius << G4endl;
 	  return abs(pR-outerRadius);
 	}
     }
@@ -838,7 +838,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 	    // line normal to the Hype axis passing in A)
 	    BpointR=sqrt(HypeOuterRadius2(BpointZ));
 	    
-	    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << endl; 
+	    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << G4endl; 
 	    
 	    // the components of the normal vector in B are
 	    // / normR = 2*BpointR
@@ -855,7 +855,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 	    //    i.e. stepping back for the  backupdist
 	    // 2. move of backupdist in the opposite direction
 	    // so mydist is the double of backupdist with opposite Sign
-	    // //G4cout << " mydist : " << mydist << endl;
+	    // //G4cout << " mydist : " << mydist << G4endl;
 	    
 	    if (abs(mydist)<abs(backupdist)) { backupdist=mydist; }
 	    else { mydist=-2*backupdist; }
@@ -865,7 +865,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 	  // Now I have the correct point BpointZ, BpointR stored...
 	  //G4cout << "zone2 - hyp - returning : " << 
 	  //sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
-	  // (ApointR-BpointR)*(ApointR-BpointR)) << endl;
+	  // (ApointR-BpointR)*(ApointR-BpointR)) << G4endl;
 
 	  return sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
 		      (ApointR-BpointR)*(ApointR-BpointR));
@@ -878,7 +878,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
       if (pR<=(1+SURFACE_PRECISION)*innerRadius &&
 	  pZ<=(1+SURFACE_PRECISION)*halfLenZ)
 	{
-	  //G4cout << "zone3 - Cyl - returning : " << innerRadius-pR << endl;
+	  //G4cout << "zone3 - Cyl - returning : " << innerRadius-pR << G4endl;
 	  return abs(innerRadius-pR);
 	}
     }
@@ -926,7 +926,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 		// line normal to the Hype axis passing in A)
 		BpointR=sqrt(HypeInnerRadius2(BpointZ));
 		
-		// //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << endl; 
+		// //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << G4endl; 
 		
 		// the components of the normal vector in B are
 		// / normR = 2*BpointR
@@ -943,7 +943,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 		//    i.e. stepping back for the  backupdist
 		// 2. move of backupdist in the opposite direction
 		// so mydist is the double of backupdist with opposite Sign
-		// //G4cout << " mydist : " << mydist << endl;
+		// //G4cout << " mydist : " << mydist << G4endl;
 		
 		if (abs(mydist)<abs(backupdist)) { backupdist=mydist; }
 		else { mydist=-2*backupdist; }
@@ -953,7 +953,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
 	      // Now I have the correct point BpointZ, BpointR stored...
 	      //G4cout << " zone3 - hyp - returning: " <<
 	      //sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
-	      //     (ApointR-BpointR)*(ApointR-BpointR)) << endl;
+	      //     (ApointR-BpointR)*(ApointR-BpointR)) << G4endl;
 	      return sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
 			  (ApointR-BpointR)*(ApointR-BpointR));
 	    }
@@ -964,7 +964,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
     { // 4b
       //G4cout << " zone 4b - returning: " <<
       // sqrt((ApointR-endInnerRadius)*(ApointR-endInnerRadius)+
-      //      (ApointZ-halfLenZ)*(ApointZ-halfLenZ)) << endl;
+      //      (ApointZ-halfLenZ)*(ApointZ-halfLenZ)) << G4endl;
 
       return sqrt( 
 		  (ApointR-endInnerRadius)*(ApointR-endInnerRadius)+
@@ -974,7 +974,7 @@ G4double G4Hype::DistanceToIn(const G4ThreeVector& p) const
     { // 4a
       //G4cout << " zone 4a - returning: " <<
       //sqrt((ApointR-endOuterRadius)*(ApointR-endOuterRadius)+
-      //     (ApointZ-halfLenZ)*(ApointZ-halfLenZ)) << endl;
+      //     (ApointZ-halfLenZ)*(ApointZ-halfLenZ)) << G4endl;
 
       return sqrt( 
 		  (ApointR-endOuterRadius)*(ApointR-endOuterRadius)+
@@ -996,8 +996,8 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 
     if (calcNorm) *validNorm=true;  // All normals are valid
     *n=G4ThreeVector(0.,0.,0.);
-    //G4cout << "DistanceToOut(pt,dir): " << p << " " << v << endl;
-    //G4cout << "Surface Data " << outerRadius << endl;
+    //G4cout << "DistanceToOut(pt,dir): " << p << " " << v << G4endl;
+    //G4cout << "Surface Data " << outerRadius << G4endl;
 
     EInside Pp=Inside(p);
     if (Pp==kOutside)
@@ -1021,8 +1021,8 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 
         // make direction a versor
 	direction=direction.unit();
-	//G4cout << "direzione : " << direction << endl;
-	//G4cout << "workPoint : " << workPoint << endl;
+	//G4cout << "direzione : " << direction << G4endl;
+	//G4cout << "workPoint : " << workPoint << G4endl;
 
         // line parameters - u vector
         double ux=direction.x();
@@ -1042,7 +1042,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 	  {
 	    // *left* (see docs) intersection z=-halfLenZ
 	    double tLeft=(-halfLenZ-vz)/uz;
-	    //   //G4cout << tLeft << endl;
+	    //   //G4cout << tLeft << G4endl;
 	    if (tLeft>0 || abs(tLeft)<zero_tolerance) 
 	      {
 		double xIL=ux*tLeft+vx;
@@ -1059,7 +1059,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 	
 	    // *right* (see docs) intersection z=halfLenZ
 	    double tRight=(halfLenZ-vz)/uz;
-	    // //G4cout << tRight << endl;
+	    // //G4cout << tRight << G4endl;
 	    if (tRight>0 || abs(tRight)<zero_tolerance)
 	      {
 		double xIR=ux*tRight+vx;
@@ -1074,7 +1074,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 		  }
 	      }
 	    	    
-	    //G4cout << "tLeft, tRight : " << tLeft << "  " << tRight << endl;
+	    //G4cout << "tLeft, tRight : " << tLeft << "  " << tRight << G4endl;
 	  }
 	  
 	// ==============================================================================//
@@ -1104,7 +1104,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 		double solution2=(-paramB-sqrt(delta))/paramA;
 		double dist1=kInfinity;
 		double dist2=kInfinity;
-		//G4cout << "Sol 1,2 " << solution1 << "  " << solution2 << endl;
+		//G4cout << "Sol 1,2 " << solution1 << "  " << solution2 << G4endl;
 
 		if (solution1>0 || abs(solution1)<zero_tolerance)
 		  dist1=abs(solution1);
@@ -1149,8 +1149,8 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 
 	// intersection equation discriminant
         double delta=paramB*paramB-paramA*paramC;
-	//G4cout << "delta : " << delta << endl;
-	//G4cout << "A, B, C : " << paramA << "  " << paramB << "   " << paramC << endl;
+	//G4cout << "delta : " << delta << G4endl;
+	//G4cout << "A, B, C : " << paramA << "  " << paramB << "   " << paramC << G4endl;
 
         if (delta > 0 || abs(delta)<zero_tolerance) 
         { 
@@ -1159,7 +1159,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 	  double solution1=(-paramB+sqrt(delta))/paramA;
 	  double solution2=(-paramB-sqrt(delta))/paramA;
 
-	  //G4cout << "Solution 1, 2  : " << solution1*1E+14 << "   " << solution2*1E+14 << endl;
+	  //G4cout << "Solution 1, 2  : " << solution1*1E+14 << "   " << solution2*1E+14 << G4endl;
 	  
 	  if (solution1>0 || abs(solution1)<zero_tolerance) 
 	    {
@@ -1225,7 +1225,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 
 	// Done!
 	//G4cout << "distanze left, right, inner, outer :" << distanceLeft << "   " 
-	//     << distanceRight << "   " << distanceInner << "    " << distanceOuter << endl;
+	//     << distanceRight << "   " << distanceInner << "    " << distanceOuter << G4endl;
 	
 	// normal calculation, where required.
 	// normal to EXIT the volume...
@@ -1238,7 +1238,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 		yi=vy+snxt*uy;
 		zi=vz+snxt*uz;
 		*n=G4ThreeVector(xi,yi,-zi*tanOuterStereo2).unit();
-		//G4cout << "outerFace : " << *n << endl;
+		//G4cout << "outerFace : " << *n << G4endl;
 		break;
 	  
 	      case innerFace:
@@ -1246,17 +1246,17 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 		yi=vy+snxt*uy;
 		zi=vx+snxt*uz;
 		*n=-G4ThreeVector(xi,yi,-zi*tanInnerStereo2).unit();
-		//G4cout << "innerFace: " << *n << endl;
+		//G4cout << "innerFace: " << *n << G4endl;
 		break;
 		
 	      case leftCap:
 		*n=G4ThreeVector(0,0,-1);
-		//G4cout << "leftCap: " << *n << endl;
+		//G4cout << "leftCap: " << *n << G4endl;
 		break;
 		
 	      case rightCap:
 		*n=G4ThreeVector(0,0,1);
-		//G4cout << "rightCap: " << *n << endl;
+		//G4cout << "rightCap: " << *n << G4endl;
 		break;
 		
 	      default: *validNorm=false;
@@ -1264,8 +1264,8 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p,const G4ThreeVector& v,
 	  }
       }
     snxt+=zero_tolerance*halfLenZ; 
-    //G4cout << "valore restituito: " << snxt << endl;
-    //G4cout << "*n = " << *n << endl;
+    //G4cout << "valore restituito: " << snxt << G4endl;
+    //G4cout << "*n = " << *n << G4endl;
     return snxt;
 }
 
@@ -1280,25 +1280,25 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
   double pR=sqrt(pR2);
 
   //G4cout << "pZ : " << pZ << " param: " << pZ/halfLenZ << " SP: "
-  //      << SURFACE_PRECISION <<endl;
+  //      << SURFACE_PRECISION <<G4endl;
 
   // distance parameters
   double distEndCap=kInfinity;
   double distSurfac=kInfinity;
 
-  //G4cout << "DistToOut(pt)" << p << endl;
-  //G4cout << "Surface data: " << outerRadius << endl;
+  //G4cout << "DistToOut(pt)" << p << G4endl;
+  //G4cout << "Surface data: " << outerRadius << G4endl;
 
   EInside Pp=Inside(p);
   if (Pp==kOutside)
     {
-      //G4cout << "Point outside, returning 0." << endl;
+      //G4cout << "Point outside, returning 0." << G4endl;
       return 0;
     }
       
   if (Pp==kSurface) 
     {
-      //G4cout << "Point on surface, returning Step" << endl;
+      //G4cout << "Point on surface, returning Step" << G4endl;
       return halfLenZ*SURFACE_PRECISION;
     }
 
@@ -1327,8 +1327,8 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
       double a2=abs(outerRadius-pR);
       distSurfac= (a1<a2?a1:a2);
       //G4cout << "a1: " << a1 << "  a2: " << a2 << "  distEndCap: " << 
-      //	distEndCap << endl; 
-      //G4cout << "Point with z=0, returning: " <<(distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+      //	distEndCap << G4endl; 
+      //G4cout << "Point with z=0, returning: " <<(distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
       return (distSurfac<distEndCap?distSurfac:distEndCap); // Done
     }
   
@@ -1344,7 +1344,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	    {
 	      distSurfac=abs(outerRadius-pR);
 	      //G4cout << "Cyl, no inner surf, returning: " << 
-	      //(distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+	      //(distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 	      return (distSurfac<distEndCap?distSurfac:distEndCap);
 	    }
 	}
@@ -1379,7 +1379,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	    // line normal to the Hype axis passing in A)
 	    BpointR=sqrt(HypeOuterRadius2(BpointZ));
 	    
-	    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << endl; 
+	    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << G4endl; 
 	    
 	    // the components of the normal vector in B are
 	    // / normR = 2*BpointR
@@ -1396,7 +1396,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	    //    i.e. stepping back for the  backupdist
 	    // 2. move of backupdist in the opposite direction
 	    // so mydist is the double of backupdist with opposite Sign
-	    // //G4cout << " mydist : " << mydist << endl;
+	    // //G4cout << " mydist : " << mydist << G4endl;
 	    
 	    if (abs(mydist)<abs(backupdist)) { backupdist=mydist; }
 	    else { mydist=-2*backupdist; }
@@ -1407,7 +1407,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	  //distSurfac=sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
 	  //                (ApointR-BpointR)*(ApointR-BpointR));
 	  //G4cout << "Hyperb, no inner surface, returning : " << 
-	  //  (distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+	  //  (distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 	  return (distSurfac<distEndCap?distSurfac:distEndCap);
 	}
     }
@@ -1425,7 +1425,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		{
 		  distSurfac=abs(outerRadius-pR);
 		  //G4cout << "Cyl, with inner surface, outer is nearer,  returning : " << 
-		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 		  return (distSurfac<distEndCap?distSurfac:distEndCap);
 		}
 	    }
@@ -1459,7 +1459,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		// line normal to the Hype axis passing in A)
 		BpointR=sqrt(HypeOuterRadius2(BpointZ));
 		
-		// //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << endl; 
+		// //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << G4endl; 
 		
 		// the components of the normal vector in B are
 		// / normR = 2*BpointR
@@ -1476,7 +1476,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		//    i.e. stepping back for the  backupdist
 		// 2. move of backupdist in the opposite direction
 		// so mydist is the double of backupdist with opposite Sign
-		// //G4cout << " mydist : " << mydist << endl;
+		// //G4cout << " mydist : " << mydist << G4endl;
 		
 		if (abs(mydist)<abs(backupdist)) { backupdist=mydist; }
 		else { mydist=-2*backupdist; }
@@ -1487,7 +1487,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	      distSurfac=sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
 			      (ApointR-BpointR)*(ApointR-BpointR));
 	      //G4cout << "Hyp, with inner surface, outer is nearer,  returning : " << 
-	      //(distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+	      //(distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 
 	      return (distSurfac<distEndCap?distSurfac:distEndCap);
 	    }
@@ -1503,7 +1503,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		{
 		  distSurfac=abs(pR-innerRadius);
 		  //G4cout << "Cyl, with inner surface, inner is nearer,  returning : " << 
-		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 
 		  return (distSurfac<distEndCap?distSurfac:distEndCap);
 		}
@@ -1522,7 +1522,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 	      double paramNorm=endInnerRadius/(-tanInnerStereo2*halfLenZ);
 	      if (ApointR<=(1+SURFACE_PRECISION)*(paramNorm*(ApointZ-halfLenZ)+endInnerRadius))
 		{
-		  // //G4cout << "HERE!" << endl;
+		  // //G4cout << "HERE!" << G4endl;
 		  // not in a blank zone!!!
 		  //Prepare the parameter for the iteration
 		  double mydist=0.;       // distance between C and A     
@@ -1544,7 +1544,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		    // line normal to the Hype axis passing in A)
 		    BpointR=sqrt(HypeInnerRadius2(BpointZ));
 		    
-		    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << endl; 
+		    // //G4cout << "BpointZ : " << BpointZ << "  BpointR: " << BpointR << G4endl; 
 		    
 		    // the components of the normal vector in B are
 		    // / normR = 2*BpointR
@@ -1561,7 +1561,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		    //    i.e. stepping back for the  backupdist
 		    // 2. move of backupdist in the opposite direction
 		    // so mydist is the double of backupdist with opposite Sign
-		    // //G4cout << " mydist : " << mydist << endl;
+		    // //G4cout << " mydist : " << mydist << G4endl;
 		    
 		    if (abs(mydist)<abs(backupdist)) { backupdist=mydist; }
 		    else { mydist=-2*backupdist; }
@@ -1572,7 +1572,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 		  distSurfac=sqrt((ApointZ-BpointZ)*(ApointZ-BpointZ)+
 				  (ApointR-BpointR)*(ApointR-BpointR));
 		  //G4cout << "Hyp, with inner surface, inner is nearer,  returning : " << 
-		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 
 		  return (distSurfac<distEndCap?distSurfac:distEndCap);
 		}
@@ -1584,7 +1584,7 @@ G4double G4Hype::DistanceToOut(const G4ThreeVector& p) const
 				    (pR-endOuterRadius)*(pR-endOuterRadius));
 		  distSurfac=(dist1<dist2?dist1:dist2);
 		  //G4cout << "Blank zone,  returning : " << 
-		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << endl;
+		  //  (distSurfac<distEndCap?distSurfac:distEndCap) << G4endl;
 
 		  return (distSurfac<distEndCap?distSurfac:distEndCap); // Done
 		}
diff --git a/source/geometry/solids/CSG/src/G4Para.cc b/source/geometry/solids/CSG/src/G4Para.cc
index a3693559e1..56d8ced031 100644
--- a/source/geometry/solids/CSG/src/G4Para.cc
+++ b/source/geometry/solids/CSG/src/G4Para.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Para.cc,v 1.3.2.1 1999/12/07 20:48:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Para.cc,v 1.4 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Para
 //
diff --git a/source/geometry/solids/CSG/src/G4PolyPhiFace.cc b/source/geometry/solids/CSG/src/G4PolyPhiFace.cc
index 858f181d30..a1bf10b1b8 100644
--- a/source/geometry/solids/CSG/src/G4PolyPhiFace.cc
+++ b/source/geometry/solids/CSG/src/G4PolyPhiFace.cc
@@ -679,7 +679,7 @@ G4bool G4PolyPhiFace::InsideEdgesExact( const G4double r, const G4double z,
 	
 //	G4int fanswer = abs(answer);
 //	if (fanswer==1 || fanswer>2) {
-//		G4cerr << "G4PolyPhiFace::InsideEdgesExact: answer is " << answer << endl;
+//		G4cerr << "G4PolyPhiFace::InsideEdgesExact: answer is " << answer << G4endl;
 //	}
 
 	return answer!=0;
diff --git a/source/geometry/solids/CSG/src/G4Polycone.cc b/source/geometry/solids/CSG/src/G4Polycone.cc
index 8c5e539de8..548ad366e2 100644
--- a/source/geometry/solids/CSG/src/G4Polycone.cc
+++ b/source/geometry/solids/CSG/src/G4Polycone.cc
@@ -366,7 +366,7 @@ G4Polyhedron *G4Polycone::CreatePolyhedron() const
 					     original_parameters->Rmax);
 	}
 	else {
-		G4cerr << "G4Polycone: visualization of this type of G4Polycone is not supported at this time" << endl;
+		G4cerr << "G4Polycone: visualization of this type of G4Polycone is not supported at this time" << G4endl;
 		return 0;
 	}
 }	
diff --git a/source/geometry/solids/CSG/src/G4PolyconeSide.cc b/source/geometry/solids/CSG/src/G4PolyconeSide.cc
index e78a83cb66..9dd4fe5784 100644
--- a/source/geometry/solids/CSG/src/G4PolyconeSide.cc
+++ b/source/geometry/solids/CSG/src/G4PolyconeSide.cc
@@ -477,7 +477,7 @@ void G4PolyconeSide::CalculateExtent( const EAxis axis,
 	// Choose phi size of our segment(s) based on constants as
 	// defined in meshdefs.hh
 	//
-	G4int numPhi = deltaPhi/kMeshAngleDefault + 1;
+	G4int numPhi = (G4int)(deltaPhi/kMeshAngleDefault) + 1;
 	if (numPhi < kMinMeshSections) 
 		numPhi = kMinMeshSections;
 	else if (numPhi > kMaxMeshSections)
diff --git a/source/geometry/solids/CSG/src/G4Polyhedra.cc b/source/geometry/solids/CSG/src/G4Polyhedra.cc
index 0af1dd3444..3e297c65ac 100644
--- a/source/geometry/solids/CSG/src/G4Polyhedra.cc
+++ b/source/geometry/solids/CSG/src/G4Polyhedra.cc
@@ -409,7 +409,7 @@ G4Polyhedron *G4Polyhedra::CreatePolyhedron() const
 					     original_parameters->Rmax);
 	}
 	else {
-		G4cerr << "G4Polyhedra: visualization of this type of G4Polyhedra is not supported at this time" << endl;
+		G4cerr << "G4Polyhedra: visualization of this type of G4Polyhedra is not supported at this time" << G4endl;
 		return 0;
 	}
 
diff --git a/source/geometry/solids/CSG/src/G4PolyhedraSide.cc b/source/geometry/solids/CSG/src/G4PolyhedraSide.cc
index 04bca6a597..886b2111e7 100644
--- a/source/geometry/solids/CSG/src/G4PolyhedraSide.cc
+++ b/source/geometry/solids/CSG/src/G4PolyhedraSide.cc
@@ -854,7 +854,7 @@ G4int G4PolyhedraSide::PhiSegment( const G4double phi0 )
 	//
 	// Divide
 	//
-	G4int answer = phi/deltaPhi;
+	G4int answer = (G4int)(phi/deltaPhi);
 	
 	if (answer >= numSide) {
 		if (phiIsOpen) {
diff --git a/source/geometry/solids/CSG/src/G4ReduciblePolygon.cc b/source/geometry/solids/CSG/src/G4ReduciblePolygon.cc
index 5c5f1d7688..36b204c84d 100644
--- a/source/geometry/solids/CSG/src/G4ReduciblePolygon.cc
+++ b/source/geometry/solids/CSG/src/G4ReduciblePolygon.cc
@@ -481,7 +481,7 @@ void G4ReduciblePolygon::Print()
 {
 	ABVertex *curr = vertexHead;
 	do {
-		G4cerr << curr->a << " " << curr->b << endl;
+		G4cerr << curr->a << " " << curr->b << G4endl;
 	} while( curr = curr->next );
 }
 
diff --git a/source/geometry/solids/CSG/src/G4Sphere.cc b/source/geometry/solids/CSG/src/G4Sphere.cc
index 7a81a8c82f..9031b61f83 100644
--- a/source/geometry/solids/CSG/src/G4Sphere.cc
+++ b/source/geometry/solids/CSG/src/G4Sphere.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Sphere.cc,v 1.3.2.1 1999/12/07 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Sphere.cc,v 1.4 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Sphere
 //
diff --git a/source/geometry/solids/CSG/src/G4Torus.cc b/source/geometry/solids/CSG/src/G4Torus.cc
index d2f44545d8..192d21f97e 100644
--- a/source/geometry/solids/CSG/src/G4Torus.cc
+++ b/source/geometry/solids/CSG/src/G4Torus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Torus.cc,v 1.3.2.1 1999/12/07 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Torus.cc,v 1.4 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Torus
@@ -178,12 +178,12 @@ G4int  G4Torus::TorusRoots(       G4double Ri,
      {
         for(i=0;i<num;i++)
         {
-           G4cout<<i<<" Root = "<<s[i]<<endl ; 
+           G4cout<<i<<" Root = "<<s[i]<<G4endl ; 
         }
      }
-     else G4cout<<"All real roots are negative"<<endl ;
+     else G4cout<<"All real roots are negative"<<G4endl ;
    }
-   else G4cout<<"No real roots for intesection with torus"<<endl;
+   else G4cout<<"No real roots for intesection with torus"<<G4endl;
       
    return num ;      
 }
diff --git a/source/geometry/solids/CSG/src/G4Trap.cc b/source/geometry/solids/CSG/src/G4Trap.cc
index f9d2103dc2..5b7312cd78 100644
--- a/source/geometry/solids/CSG/src/G4Trap.cc
+++ b/source/geometry/solids/CSG/src/G4Trap.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trap.cc,v 1.4.2.1 1999/12/07 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trap.cc,v 1.6 1999/12/15 14:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Trap
 //
@@ -19,6 +19,7 @@
 //  8.12.97 J.Allison: Added "nominal" constructor and method SetAllParameters.
 //  4.06.99 S.Giani: Fixed CalculateExtent in rotated case. 
 // 19.11.99 V.Grichine, kUndefined was added to Eside enum
+// 13.12.99 V.Grichine, bug fixed in DistanceToIn(p,v)
 
 #include <math.h>
 #include "G4Trap.hh"
@@ -938,120 +939,113 @@ G4double G4Trap::DistanceToIn(const G4ThreeVector& p,
 //
 // Z Intersection range
 //
-    if (v.z()>0)
-	{
-	    max=fDz-p.z();
-	    if (max>kCarTolerance/2)
-		{
-		   smax=max/v.z();
-		   smin=(-fDz-p.z())/v.z();
-		}
-	    else
-		{
-		    return snxt=kInfinity;
-		}
-	}
-    else if (v.z()<0)
-	{
-	    max=-fDz-p.z();
-	    if (max<-kCarTolerance/2)
-		{
-		   smax=max/v.z();
-		   smin=(fDz-p.z())/v.z();
-		}
-	    else
-		{
-		    return snxt=kInfinity;
-		}
-	}
+    if (v.z() > 0 )
+    {
+       max = fDz - p.z() ;
+
+       if (max > 0.5*kCarTolerance)
+       {
+	  smax = max/v.z();
+	  smin = (-fDz-p.z())/v.z();
+       }
+       else
+       {
+	  return snxt=kInfinity;
+       }
+    }
+    else if (v.z() < 0 )
+    {
+       max = - fDz - p.z() ;
+
+       if (max < -0.5*kCarTolerance )
+       {
+	  smax=max/v.z();
+	  smin=(fDz-p.z())/v.z();
+       }
+       else
+       {
+	  return snxt=kInfinity;
+       }
+    }
     else
-	{
-	    if (fabs(p.z())<=fDz) // Inside
-		{
-		   smin=0;
-		   smax=kInfinity;
-		}
-	    else
-		{
-		    return snxt=kInfinity;
-		}
-	}
+    {
+       if (fabs(p.z())<fDz - 0.5*kCarTolerance) // Inside was <=fDz
+       {
+	  smin=0;
+	  smax=kInfinity;
+       }
+       else
+       {
+	  return snxt=kInfinity;
+       }
+    }
 
     for (i=0;i<4;i++)
-	{
-	    pdist=fPlanes[i].a*p.x()+fPlanes[i].b*p.y()+fPlanes[i].c*p.z()+fPlanes[i].d;
-	    Comp=fPlanes[i].a*v.x()+fPlanes[i].b*v.y()+fPlanes[i].c*v.z();
+    {
+       pdist=fPlanes[i].a*p.x()+fPlanes[i].b*p.y()+fPlanes[i].c*p.z()+fPlanes[i].d;
+       
+       Comp=fPlanes[i].a*v.x()+fPlanes[i].b*v.y()+fPlanes[i].c*v.z();
 
-	    if (pdist>0)
-		{
+       if ( pdist >= -0.5*kCarTolerance )      // was >0
+       {
+//
 // Outside the plane -> this is an extent entry distance
-		    if (Comp>0)
-			{
-			    return snxt=kInfinity;
-			}
-		    else if (Comp<0)
-			{
-			    vdist=-pdist/Comp;
-			    if (vdist>smin)
-				{
-				    if (vdist<smax)
-					{
-					   smin=vdist;
-					}
-				    else
-					{
-					    return snxt=kInfinity;
-					}
-				}
-			}
-		}
-	    else if (pdist<0)
+//
+	  if (Comp >= 0)   // was >0
+	  {
+	     return snxt=kInfinity ;
+	  }
+	  else 
+	  {
+	     vdist=-pdist/Comp;
+
+	     if (vdist>smin)
+	     {
+		if (vdist<smax)
 		{
+		   smin = vdist;
+		}
+		else
+		{
+		   return snxt=kInfinity;
+		}
+	     }
+	  }
+       }
+       else
+       {
+//
 // Inside the plane -> couble  be an extent exit distance (smax)
-		    if (Comp>0)
-			{
-// Will leave extent
-			    if (pdist<-kCarTolerance/2)
-				{
-				    vdist=-pdist/Comp;
-				    if (vdist<smax)
-					{
-					    if (vdist>smin)
-						{
-						   smax=vdist;
-						}
-					    else
-						{
-						    return snxt=kInfinity;
-						}
-					}
-				}
-			    else
-				{
-				    return snxt=kInfinity;
-				}
-			}
-		}
-	    else
+//
+	  if (Comp>0)  // Will leave extent
+	  {
+	     vdist=-pdist/Comp;
+
+	     if (vdist<smax)
+	     {
+		if (vdist>smin)
 		{
-// Exactly on the plane
-		    if (Comp>0)
-			{
-			    return snxt=kInfinity;
-			}
+		   smax=vdist;
 		}
-	}
-
+		else
+		{
+		       return snxt=kInfinity;
+		}
+	     }	
+	  }
+       }
+   }
+//
 // Checks in non z plane intersections ensure smin<smax
-
-    if (smin>=0)
-	{
-	   snxt=smin;
-	}
+//
+    if (smin >=0 )
+    {
+       snxt = smin ;
+    }
     else
-	{
-       snxt=0;
-	}
+    {
+       snxt = 0 ;
+    }
     return snxt;
 }
 
diff --git a/source/geometry/solids/CSG/src/G4Trd.cc b/source/geometry/solids/CSG/src/G4Trd.cc
index 561f605f2f..fcc6c1c1d4 100644
--- a/source/geometry/solids/CSG/src/G4Trd.cc
+++ b/source/geometry/solids/CSG/src/G4Trd.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trd.cc,v 1.3.2.1 1999/12/07 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trd.cc,v 1.4 1999/12/15 14:50:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Implementation for G4Trd class
@@ -61,11 +61,11 @@ G4Trd::CheckAndSetAllParameters (G4double pdx1,  G4double pdx2,
           // G4double  Minimum_length= (1+per_thousand) * kCarTolerance/2.;
           //  FIX-ME : temporary solution for ZERO or very-small parameters.
           G4double  Minimum_length= kCarTolerance/2.;
-          fDx1=max(pdx1,Minimum_length); 
-          fDx2=max(pdx2,Minimum_length); 
-          fDy1=max(pdy1,Minimum_length); 
-          fDy2=max(pdy2,Minimum_length); 
-          fDz=max(pdz,Minimum_length);
+          fDx1=G4std::max(pdx1,Minimum_length); 
+          fDx2=G4std::max(pdx2,Minimum_length); 
+          fDy1=G4std::max(pdy1,Minimum_length); 
+          fDy2=G4std::max(pdy2,Minimum_length); 
+          fDz=G4std::max(pdz,Minimum_length);
       }
       else G4Exception("Error in G4Trd::G4Trd - One or more parameters are < 0");
     }
diff --git a/source/geometry/solids/CSG/src/G4Tubs.cc b/source/geometry/solids/CSG/src/G4Tubs.cc
index 8d43a71858..60758d8acb 100644
--- a/source/geometry/solids/CSG/src/G4Tubs.cc
+++ b/source/geometry/solids/CSG/src/G4Tubs.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Tubs.cc,v 1.11.2.1 1999/12/07 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Tubs.cc,v 1.12 1999/12/15 14:50:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Tubs
diff --git a/source/geometry/solids/History b/source/geometry/solids/History
index fbb2ba5992..01655603e7 100644
--- a/source/geometry/solids/History
+++ b/source/geometry/solids/History
@@ -1,3 +1,29 @@
+$Id: History,v 1.2 2000/01/19 20:03:50 gcosmo Exp $
+-------------------------------------------------------------------
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                      Sub-Category History file
+                      -------------------------
+This file should be used by G4 developers and category coordinators
+to briefly summarize all major modifications introduced in the code
+and keep track of all directory-tags.
+It DOES NOT substitute the  CVS log-message one should put at every
+committal in the CVS repository !
+
+     ----------------------------------------------------------
+     * Reverse chronological order (last date on top), please *
+     ----------------------------------------------------------
+
+Jan   19th, 2000   G. Cosmo                -  geomsolids-V01-00-00
+
+- Syncronized HEAD versioning of files after ISO-C++ migration
+  (essentially CVS headers changes).
+- CSG: fixed bug in DistanceToIn(p,v). (V.Grichine)
+  Modified files: G4Trap.cc and testG4Trap.cc.
+
 Dec    1st, 1998   J. Apostolakis          -  solids-00-04-02
 
   Small additions to History
diff --git a/source/geometry/solids/STEP/GNUmakefile b/source/geometry/solids/STEP/GNUmakefile
index ea08fc6207..99a49c6e37 100644
--- a/source/geometry/solids/STEP/GNUmakefile
+++ b/source/geometry/solids/STEP/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/01/07 16:08:00 gunter Exp $
+# $Id: GNUmakefile,v 1.2 1999/12/15 18:06:43 gracia Exp $
 # -------------------------------------------------------------
 # GNUmakefile for STEP library.  Gabriele Cosmo, 15/11/96.
 # -------------------------------------------------------------
@@ -27,3 +27,13 @@ $(G4TMP)/$(G4SYSTEM)/$(name)/SdaiCONFIG_CONTROL_DESIGN.o: src/SdaiCONFIG_CONTROL
 	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN.cc
 $(G4TMP)/$(G4SYSTEM)/$(name)/SdaiCONFIG_CONTROL_DESIGN_init.o: src/SdaiCONFIG_CONTROL_DESIGN_init.cc
 	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN_init.cc
+
+
+
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  CXXFLAGS_WITH_ZM = $(filter-out -Zm%,$(CXXFLAGS)) -Zm500
+
+$(G4TMPDIR)/SdaiCONFIG_CONTROL_DESIGN.o: src/SdaiCONFIG_CONTROL_DESIGN.cc
+	$(CXX) $(CXXFLAGS_WITH_ZM) $(CPPFLAGS) -c $(OUT_OBJ)$@ \
+	  src/SdaiCONFIG_CONTROL_DESIGN.cc
+endif
diff --git a/source/geometry/solids/STEP/include/EntityInst.h b/source/geometry/solids/STEP/include/EntityInst.h
index 37e227c341..9551b4d001 100644
--- a/source/geometry/solids/STEP/include/EntityInst.h
+++ b/source/geometry/solids/STEP/include/EntityInst.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: EntityInst.h,v 1.2 1999/05/21 20:20:28 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ENTITYINST_H
 #define	ENTITYINST_H 1
diff --git a/source/geometry/solids/STEP/include/Enumeration.h b/source/geometry/solids/STEP/include/Enumeration.h
index b8e9732c81..0f59774fc1 100644
--- a/source/geometry/solids/STEP/include/Enumeration.h
+++ b/source/geometry/solids/STEP/include/Enumeration.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Enumeration.h,v 1.2 1999/05/21 20:20:29 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Enumeration.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ENUMERATION_H
 #define	ENUMERATION_H 
@@ -34,7 +34,7 @@
 #define ENUM_NULL -1
 
 class STEPenumeration  {
-    friend     ostream &operator<< ( ostream&, const STEPenumeration& );
+    friend     G4std::ostream &operator<< ( G4std::ostream&, const STEPenumeration& );
   protected:
     int v;	//  integer value of enumeration instance 
 	//  mapped to a symbolic value in the elements
@@ -55,18 +55,18 @@ class STEPenumeration  {
 			    int optional, char *tokenList,
 			    int needDelims = 0, int clearError = 1);
 
-    Severity EnumValidLevel(istream &in, ErrorDescriptor *err, 
+    Severity EnumValidLevel(G4std::istream &in, ErrorDescriptor *err, 
 			    int optional, char *tokenList,
 			    int needDelims = 0, int clearError = 1);
 
     const int asInt () const {	return v;    }
     
     const char * asStr (SCLstring &s) const;
-    void STEPwrite (ostream& out = G4cout)  const;
+    void STEPwrite (G4std::ostream& out = G4cout)  const;
     const char * STEPwrite (SCLstring &s) const;
 
     Severity StrToVal (const char * s, ErrorDescriptor *err, int optional = 1);
-    Severity STEPread(istream& in, ErrorDescriptor *err, int optional = 1);
+    Severity STEPread(G4std::istream& in, ErrorDescriptor *err, int optional = 1);
     Severity STEPread(const char *s, ErrorDescriptor *err, int optional = 1);
 
     int put (int val)  {  return set_value (val);    }
@@ -76,9 +76,9 @@ class STEPenumeration  {
     STEPenumeration& operator= (const int);
     STEPenumeration& operator= (const STEPenumeration&);
         
-    void DebugDisplay (ostream& out =G4cout) const;
+    void DebugDisplay (G4std::ostream& out =G4cout) const;
   protected:
-    Severity ReadEnum(istream& in, ErrorDescriptor *err, int AssignVal = 1,
+    Severity ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
 		      int needDelims = 1);
 };
 
diff --git a/source/geometry/solids/STEP/include/ExpDict.h b/source/geometry/solids/STEP/include/ExpDict.h
index e5457ded25..836956af66 100644
--- a/source/geometry/solids/STEP/include/ExpDict.h
+++ b/source/geometry/solids/STEP/include/ExpDict.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: ExpDict.h,v 1.2 1999/05/21 20:20:29 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef EXPDICT_H
 #define EXPDICT_H
diff --git a/source/geometry/solids/STEP/include/Registry.h b/source/geometry/solids/STEP/include/Registry.h
index d4e3483f0f..c3a5e8f55a 100644
--- a/source/geometry/solids/STEP/include/Registry.h
+++ b/source/geometry/solids/STEP/include/Registry.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: Registry.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
diff --git a/source/geometry/solids/STEP/include/STEPaggregate.h b/source/geometry/solids/STEP/include/STEPaggregate.h
index d4b6a27438..6e25ffc1fd 100644
--- a/source/geometry/solids/STEP/include/STEPaggregate.h
+++ b/source/geometry/solids/STEP/include/STEPaggregate.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPaggregate.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPaggregate.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPAGGREGATE_H
 #define STEPAGGREGATE_H
@@ -66,7 +66,7 @@ class STEPaggregate :  public SingleLinkList
 
   protected:
 
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -80,7 +80,7 @@ class STEPaggregate :  public SingleLinkList
 			    int clearError =0);
     
 
-    virtual Severity AggrValidLevel(istream &in, ErrorDescriptor *err, 
+    virtual Severity AggrValidLevel(G4std::istream &in, ErrorDescriptor *err, 
 			    const TypeDescriptor *elem_type, InstMgr *insts, 
 			    int optional, char *tokenList, int addFileId =0, 
 			    int clearError =0);
@@ -89,12 +89,12 @@ class STEPaggregate :  public SingleLinkList
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err =0, 
 			      const TypeDescriptor *elem_type =0,
 			      InstMgr *insts =0, int addFileId = 0);
-    virtual Severity STEPread (istream& in, ErrorDescriptor *err, 
+    virtual Severity STEPread (G4std::istream& in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type =0,
 			       InstMgr *insts =0, int addFileId =0);
 // OUTPUT
     virtual const char *asStr(SCLstring & s) const;
-    virtual void STEPwrite  (ostream& out =G4cout) const;
+    virtual void STEPwrite  (G4std::ostream& out =G4cout) const;
 
 //    SingleLinkNode * GetHead () const
 //	{ return (STEPnode *) SingleLinkList::GetHead(); }
@@ -135,7 +135,7 @@ typedef  GenericAggregate * GenericAggregateH;
 class EntityAggregate  :  public  STEPaggregate 
 {
   public:
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -156,7 +156,7 @@ typedef   EntityAggregate * EntityAggregateH;
 class SelectAggregate  :  public STEPaggregate 
 {
   public:
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -277,15 +277,15 @@ class STEPnode :  public SingleLinkNode  {
 
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void STEPwrite (ostream& out =G4cout);
+    virtual void STEPwrite (G4std::ostream& out =G4cout);
 };
 typedef  STEPnode *  STEPnodeH;
 
@@ -302,15 +302,15 @@ class GenericAggrNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     GenericAggrNode (const char *str);
@@ -332,20 +332,20 @@ class EntityNode  : public STEPnode {
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err, 
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err, 
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     EntityNode (STEPentity * e);
@@ -361,7 +361,7 @@ class EntityNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return StrToVal(s, err, 0, 0, 0);
     }
-    Severity StrToVal(istream &in, ErrorDescriptor *err)
+    Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -374,7 +374,7 @@ class EntityNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return STEPread(s, err, 0, 0, 0);
     }
-    Severity STEPread(istream &in, ErrorDescriptor *err)
+    Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -400,20 +400,20 @@ class SelectNode  : public STEPnode {
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err, 
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err, 
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     SelectNode (SdaiSelect * s) :  node (s) {    }
@@ -429,7 +429,7 @@ class SelectNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return StrToVal(s, err, 0, 0, 0);
     }
-    Severity StrToVal(istream &in, ErrorDescriptor *err)
+    Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -442,7 +442,7 @@ class SelectNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return STEPread(s, err, 0, 0, 0);
     }
-    Severity STEPread(istream &in, ErrorDescriptor *err)
+    Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -465,15 +465,15 @@ class StringNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     StringNode(StringNode& sn);
@@ -499,15 +499,15 @@ class BinaryNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     BinaryNode(BinaryNode& bn);
@@ -532,15 +532,15 @@ class EnumNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     EnumNode (STEPenumeration * e) :  node (e) {    }
@@ -557,15 +557,15 @@ class RealNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     RealNode ()  { value = S_REAL_NULL; }
@@ -581,15 +581,15 @@ class IntNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     IntNode ()  { value = S_INT_NULL; }
diff --git a/source/geometry/solids/STEP/include/STEPattribute.h b/source/geometry/solids/STEP/include/STEPattribute.h
index 6ae06c43ff..4524853242 100644
--- a/source/geometry/solids/STEP/include/STEPattribute.h
+++ b/source/geometry/solids/STEP/include/STEPattribute.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPattribute.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPattribute.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPATTRIBUTE_H
 #define	STEPATTRIBUTE_H	1
@@ -51,11 +51,7 @@ class TypeDescriptor;
 class AttrDescriptor;
 class EntityDescriptor;
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 #include <ExpDict.h>
 
 #define s_String	char *
@@ -65,12 +61,12 @@ extern int SetErrOnNull(const char *attrValue, ErrorDescriptor *error);
 ////////////////////
 
 extern Severity 
-CheckRemainingInput(istream &in, ErrorDescriptor *err, 
+CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err, 
 		    const char *typeName, // used in error message
 		    const char *tokenList); // e.g. ",)"
 
 extern STEPentity *
-ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList, 
+ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId);
 
 extern STEPentity *
@@ -99,18 +95,18 @@ extern STEPentity *STEPread_reference (const char * s, ErrorDescriptor *err,
 				       InstMgr * instances, int addFileId);
 ////////////////////
 
-extern int   QuoteInString(istream& in);
+extern int   QuoteInString(G4std::istream& in);
 
 extern void  AppendChar(char c, int& index, char *&s, int& sSize);
 
 extern void 
-PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 //extern  Severity ValidateEntityType(STEPentity *se, 
 //					const AttrDescriptor *ad, 
@@ -118,7 +114,7 @@ PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
 
 class STEPattribute {
 
-    friend ostream &operator<< ( ostream&, STEPattribute& );
+    friend G4std::ostream &operator<< ( G4std::ostream&, STEPattribute& );
     friend class STEPentity;
     
   protected:
@@ -150,7 +146,7 @@ class STEPattribute {
 	} ptr;
 
   protected:
-    char SkipBadAttr(istream& in, char *StopChars);
+    char SkipBadAttr(G4std::istream& in, char *StopChars);
     void AddErrorInfo();
 
   public:
@@ -159,11 +155,11 @@ class STEPattribute {
 
     Severity StrToVal(const char *s, InstMgr *instances =0, 
 		      int addFileId =0);
-    Severity STEPread(istream& in = cin, InstMgr *instances =0, 
+    Severity STEPread(G4std::istream& in = G4cin, InstMgr *instances =0, 
 		      int addFileId =0);
 
     const char * asStr(SCLstring &) const; // return the attr value as a string
-    void STEPwrite(ostream& out = G4cout);
+    void STEPwrite(G4std::ostream& out = G4cout);
 
     BOOLEAN ShallowCopy(STEPattribute *sa);
 
diff --git a/source/geometry/solids/STEP/include/STEPattributeList.h b/source/geometry/solids/STEP/include/STEPattributeList.h
index 1571fd5c60..92a5b1f7d3 100644
--- a/source/geometry/solids/STEP/include/STEPattributeList.h
+++ b/source/geometry/solids/STEP/include/STEPattributeList.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: STEPattributeList.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef _STEPattributeList_h
diff --git a/source/geometry/solids/STEP/include/STEPcomplex.h b/source/geometry/solids/STEP/include/STEPcomplex.h
index da288f4b82..7a99490cb6 100644
--- a/source/geometry/solids/STEP/include/STEPcomplex.h
+++ b/source/geometry/solids/STEP/include/STEPcomplex.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPcomplex.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPcomplex.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPCOMPLEX_H
 #define STEPCOMPLEX_H
@@ -46,14 +46,14 @@ class STEPcomplex : public STEPentity {
 // READ
     virtual Severity STEPread(int id, int addFileId, 
 				   InstMgr * instance_set,
-				   istream& in =cin);
-    virtual void STEPread_error(char c, int index, istream& in);
+				   G4std::istream& in =G4cin);
+    virtual void STEPread_error(char c, int index, G4std::istream& in);
 
 // WRITE
-    virtual void STEPwrite(ostream& out =G4cout, int writeComment = 1);
+    virtual void STEPwrite(G4std::ostream& out =G4cout, int writeComment = 1);
     virtual const char * STEPwrite(SCLstring &buf);
 
-    virtual void WriteExtMapEntities(ostream& out =G4cout);
+    virtual void WriteExtMapEntities(G4std::ostream& out =G4cout);
     virtual const char * WriteExtMapEntities(SCLstring &buf);
     virtual void AppendEntity(STEPcomplex *stepc);
 
diff --git a/source/geometry/solids/STEP/include/STEPentity.h b/source/geometry/solids/STEP/include/STEPentity.h
index 992591527d..d9432600e1 100644
--- a/source/geometry/solids/STEP/include/STEPentity.h
+++ b/source/geometry/solids/STEP/include/STEPentity.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPentity.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPentity.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPENTITY_H
 #define	STEPENTITY_H 1
@@ -114,18 +114,18 @@ class STEPentity : public EntityInstance {
 // READ
     virtual Severity STEPread(int id, int addFileId, 
 			      class InstMgr * instance_set,
-			      istream& in =cin);
-    virtual void STEPread_error(char c, int index, istream& in);
+			      G4std::istream& in =G4cin);
+    virtual void STEPread_error(char c, int index, G4std::istream& in);
 
 // WRITE
-    virtual void STEPwrite(ostream& out =G4cout, int writeComment = 1);
+    virtual void STEPwrite(G4std::ostream& out =G4cout, int writeComment = 1);
     virtual const char * STEPwrite(SCLstring &buf);
 
-    void	 STEPwrite_reference (ostream& out =G4cout);
+    void	 STEPwrite_reference (G4std::ostream& out =G4cout);
     const char * STEPwrite_reference (SCLstring &buf);
 
-    void beginSTEPwrite(ostream& out =G4cout); // writes out the SCOPE section
-    void endSTEPwrite(ostream& out =G4cout);
+    void beginSTEPwrite(G4std::ostream& out =G4cout); // writes out the SCOPE section
+    void endSTEPwrite(G4std::ostream& out =G4cout);
 
 // MULTIPLE INHERITANCE
     int MultipleInheritance() { return !(headMiEntity == 0); }
@@ -156,7 +156,7 @@ typedef STEPentity* STEPentityPtr;
 typedef STEPentity* STEPentityH;
 
 extern STEPentity *
-ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList, 
+ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId);
 
 //typedef  STEPentity * (* Creator) () const;
diff --git a/source/geometry/solids/STEP/include/STEPfile.h b/source/geometry/solids/STEP/include/STEPfile.h
index 39725e2e46..d6a145f5bf 100644
--- a/source/geometry/solids/STEP/include/STEPfile.h
+++ b/source/geometry/solids/STEP/include/STEPfile.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPfile.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPfile.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _STEPFILE_H
 #define	_STEPFILE_H
@@ -35,7 +35,7 @@
 
 #include <instmgr.h>
 #include <Registry.h>
-#include <fstream.h>
+#include "g4std/fstream"
 #include <dirobj.h>
 #include <errordesc.h>
 #include <time.h>
@@ -143,12 +143,12 @@ class STEPfile
     Severity ReadWorkingFile (const char* filename =0);
     Severity AppendWorkingFile (const char* filename =0);
 
-    Severity AppendFile (istream* in) ;
+    Severity AppendFile (G4std::istream* in) ;
 
-    Severity WriteExchangeFile (ostream& out, int validate =1);
+    Severity WriteExchangeFile (G4std::ostream& out, int validate =1);
     Severity WriteExchangeFile (const char* filename =0, int validate =1);
 
-    Severity WriteWorkingFile (ostream& out);
+    Severity WriteWorkingFile (G4std::ostream& out);
     Severity WriteWorkingFile (const char* filename =0);
 
     stateEnum EntityWfState(char c);
@@ -163,10 +163,10 @@ class STEPfile
 //member functions
     
 //called by ReadExchangeFile
-    istream* OpenInputFile (const char* filename = "");
-    void CloseInputFile(istream* in);
+    G4std::istream* OpenInputFile (const char* filename = "");
+    void CloseInputFile(G4std::istream* in);
     
-    Severity ReadHeader(istream& in);
+    Severity ReadHeader(G4std::istream& in);
 
     InstMgr* HeaderConvertToNew(InstMgr& oldinst);
     Severity HeaderVerifyInstances(InstMgr* im);
@@ -180,53 +180,53 @@ class STEPfile
                                                 //   J.Apostolakis Oct 30, 98
     int HeaderIdOld (const char* nm ="\0");
 
-    int ReadData1 (istream& in); // first pass to create instances
-    int ReadData2 (istream& in); // second pass to read instances
+    int ReadData1 (G4std::istream& in); // first pass to create instances
+    int ReadData2 (G4std::istream& in); // second pass to read instances
 
 // obsolete
-    int ReadWorkingData1 (istream& in);
-    int ReadWorkingData2 (istream& in);
+    int ReadWorkingData1 (G4std::istream& in);
+    int ReadWorkingData2 (G4std::istream& in);
 
-    void ReadRestOfFile(istream& in);
+    void ReadRestOfFile(G4std::istream& in);
 
 	// create instance - used by ReadData1()
-    STEPentity *  CreateInstance(istream& in, ostream& out);
+    STEPentity *  CreateInstance(G4std::istream& in, G4std::ostream& out);
 	// create complex instance - used by CreateInstance()
-    STEPentity * CreateSubSuperInstance(istream& in, int fileid);
+    STEPentity * CreateSubSuperInstance(G4std::istream& in, int fileid);
 
 	// read the instance - used by ReadData2()
-    STEPentity * ReadInstance (istream& in, ostream& out, SCLstring &cmtStr);
+    STEPentity * ReadInstance (G4std::istream& in, G4std::ostream& out, SCLstring &cmtStr);
 
   //  reading scopes are still incomplete
   //  these functions are stubs
-    Severity CreateScopeInstances(istream& in, STEPentityH ** scopelist);
-    Severity ReadScopeInstances(istream& in);
-//    Severity ReadSubSuperInstance(istream& in);
+    Severity CreateScopeInstances(G4std::istream& in, STEPentityH ** scopelist);
+    Severity ReadScopeInstances(G4std::istream& in);
+//    Severity ReadSubSuperInstance(G4std::istream& in);
 
-    int FindDataSection (istream& in);
-    int FindHeaderSection (istream& in);
+    int FindDataSection (G4std::istream& in);
+    int FindHeaderSection (G4std::istream& in);
 
 // writing working session files
-    void WriteWorkingData(ostream& out);
+    void WriteWorkingData(G4std::ostream& out);
 
 //called by WriteExchangeFile
-    ofstream* OpenOutputFile(const char* filename =0);
-    void CloseOutputFile(ostream* out);
+    G4std::ofstream* OpenOutputFile(const char* filename =0);
+    void CloseOutputFile(G4std::ostream* out);
 
-    void WriteHeader (ostream& out);
-    void WriteHeaderInstance (STEPentity *obj, ostream& out);
-    void WriteHeaderInstanceFileName (ostream& out);
-    void WriteHeaderInstanceFileDescription (ostream& out);
-    void WriteHeaderInstanceFileSchema (ostream& out);
+    void WriteHeader (G4std::ostream& out);
+    void WriteHeaderInstance (STEPentity *obj, G4std::ostream& out);
+    void WriteHeaderInstanceFileName (G4std::ostream& out);
+    void WriteHeaderInstanceFileDescription (G4std::ostream& out);
+    void WriteHeaderInstanceFileSchema (G4std::ostream& out);
 
-    void WriteData (ostream& out);
+    void WriteData (G4std::ostream& out);
     
     int IncrementFileId (int fileid);
     int FileIdIncr() { return _fileIdIncr; }
     void SetFileIdIncrement ();
     void MakeBackupFile();
 
-//    void ReadWhiteSpace(istream& in);
+//    void ReadWhiteSpace(G4std::istream& in);
 };
 
 //inline functions
diff --git a/source/geometry/solids/STEP/include/STEPselect.h b/source/geometry/solids/STEP/include/STEPselect.h
index 19d980d560..0b19b699aa 100644
--- a/source/geometry/solids/STEP/include/STEPselect.h
+++ b/source/geometry/solids/STEP/include/STEPselect.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPselect.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPselect.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _STEPSELECT_H
 #define _STEPSELECT_H
@@ -84,8 +84,8 @@ class SdaiSelect {
 
   // reading and writing
         const char * STEPwrite(SCLstring& s)  const;
-	void STEPwrite (ostream& out =G4cout) const;
-        virtual void STEPwrite_content (ostream& out) const =0;
+	void STEPwrite (G4std::ostream& out =G4cout) const;
+        virtual void STEPwrite_content (G4std::ostream& out) const =0;
 //	char * asStr() const;
 
 
@@ -94,11 +94,11 @@ class SdaiSelect {
         virtual Severity StrToVal_content (const char *, 
 					   InstMgr * instances =0) =0;
 
-	Severity STEPread(istream& in, ErrorDescriptor *err, 
+	Severity STEPread(G4std::istream& in, ErrorDescriptor *err, 
 			  InstMgr * instances = 0, int addFileId =0);
 
 		// abstract function
-        virtual Severity STEPread_content (istream& in =cin, 
+        virtual Severity STEPread_content (G4std::istream& in =G4cin, 
 					   InstMgr * instances =0, 
 					   int addFileId =0) =0;
 
diff --git a/source/geometry/solids/STEP/include/STEPstring.h b/source/geometry/solids/STEP/include/STEPstring.h
index 5f9ea6667e..7a9bb97f1e 100644
--- a/source/geometry/solids/STEP/include/STEPstring.h
+++ b/source/geometry/solids/STEP/include/STEPstring.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPstring.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPstring.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPSTRING_H
 #define	STEPSTRING_H  1
@@ -49,11 +49,11 @@ public:
 
   // format for STEP
   const char * asStr (SCLstring & s) const  {  return s = chars ();  }
-  void STEPwrite (ostream& out =G4cout)  const;
+  void STEPwrite (G4std::ostream& out =G4cout)  const;
   void STEPwrite (SCLstring &s) const;
 
   Severity StrToVal (const char *s);
-  Severity STEPread (istream& in, ErrorDescriptor *err);
+  Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
   Severity STEPread (const char *s, ErrorDescriptor *err);
 
  protected:
diff --git a/source/geometry/solids/STEP/include/STEPundefined.h b/source/geometry/solids/STEP/include/STEPundefined.h
index 3078540f55..d113345710 100644
--- a/source/geometry/solids/STEP/include/STEPundefined.h
+++ b/source/geometry/solids/STEP/include/STEPundefined.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPundefined.h,v 1.2 1999/05/21 20:20:33 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPundefined.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef	STEPUNDEFINED_H
 #define	STEPUNDEFINED_H
@@ -39,15 +39,15 @@ class SCLundefined  {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring &s) const;
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
     int set_null ();
     int is_null ();
diff --git a/source/geometry/solids/STEP/include/SdaiBinary.h b/source/geometry/solids/STEP/include/SdaiBinary.h
index 8abb791a25..3690c417a9 100644
--- a/source/geometry/solids/STEP/include/SdaiBinary.h
+++ b/source/geometry/solids/STEP/include/SdaiBinary.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiBinary.h,v 1.2 1999/05/21 20:20:33 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiBinary.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef SDAIBINARY_H
 #define	SDAIBINARY_H 1
@@ -30,11 +30,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 class ErrorDescriptor;
 #include <scl_string.h>
@@ -64,22 +60,22 @@ class SdaiBinary : public SCLstring
 
     // format for STEP
     const char * asStr () const  {  return chars ();  }
-    void STEPwrite (ostream& out =G4cout)  const;
+    void STEPwrite (G4std::ostream& out =G4cout)  const;
     const char * STEPwrite (SCLstring &s) const;
 
     Severity StrToVal (const char *s, ErrorDescriptor *err);
-    Severity STEPread (istream& in, ErrorDescriptor *err);
+    Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
     Severity STEPread (const char *s, ErrorDescriptor *err);
 
     Severity BinaryValidLevel (const char *value, ErrorDescriptor *err,
 			       int optional, char *tokenList,
 			       int needDelims = 0, int clearError = 1);
-    Severity BinaryValidLevel (istream &in, ErrorDescriptor *err, 
+    Severity BinaryValidLevel (G4std::istream &in, ErrorDescriptor *err, 
 			       int optional, char *tokenList,
 			       int needDelims = 0, int clearError = 1);
 
  protected:
-  Severity ReadBinary(istream& in, ErrorDescriptor *err, int AssignVal = 1,
+  Severity ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
 		      int needDelims = 1);
 };
 
diff --git a/source/geometry/solids/STEP/include/SdaiCONFIG_CONTROL_DESIGN.h b/source/geometry/solids/STEP/include/SdaiCONFIG_CONTROL_DESIGN.h
index efb2f69394..af50600950 100644
--- a/source/geometry/solids/STEP/include/SdaiCONFIG_CONTROL_DESIGN.h
+++ b/source/geometry/solids/STEP/include/SdaiCONFIG_CONTROL_DESIGN.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.2 1999/05/21 20:20:35 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SDAICONFIG_CONTROL_DESIGN_H
 #define  SDAICONFIG_CONTROL_DESIGN_H
@@ -1760,8 +1760,8 @@ class SdaiCharacterized_product_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -1846,8 +1846,8 @@ class SdaiShape_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -1936,8 +1936,8 @@ class SdaiCharacterized_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2006,8 +2006,8 @@ class SdaiChange_request_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2083,8 +2083,8 @@ class SdaiReversible_topology_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2186,8 +2186,8 @@ class SdaiAxis2_placement  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2265,8 +2265,8 @@ class SdaiSpecified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2361,8 +2361,8 @@ class SdaiMeasure_value  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2442,8 +2442,8 @@ class SdaiPerson_organization_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2513,8 +2513,8 @@ class SdaiPcurve_or_surface  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2590,8 +2590,8 @@ class SdaiClassified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2675,8 +2675,8 @@ class SdaiVector_or_direction  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2754,8 +2754,8 @@ class SdaiWireframe_model  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2832,8 +2832,8 @@ class SdaiGeometric_set_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2908,8 +2908,8 @@ class SdaiStart_request_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2989,8 +2989,8 @@ class SdaiPerson_organization_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3125,8 +3125,8 @@ class SdaiDate_time_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3254,8 +3254,8 @@ class SdaiShell  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3341,8 +3341,8 @@ class SdaiTransformation  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3419,8 +3419,8 @@ class SdaiBoolean_operand  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3487,8 +3487,8 @@ class SdaiCertified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3563,8 +3563,8 @@ class SdaiDate_time_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3635,8 +3635,8 @@ class SdaiCurve_on_surface  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3727,8 +3727,8 @@ class SdaiTrimming_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3801,8 +3801,8 @@ class SdaiContracted_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3873,8 +3873,8 @@ class SdaiUnit  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3944,8 +3944,8 @@ class SdaiReversible_topology  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4016,8 +4016,8 @@ class SdaiWork_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4090,8 +4090,8 @@ class SdaiSupported_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4190,8 +4190,8 @@ class SdaiApproved_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4326,8 +4326,8 @@ class SdaiSurface_model  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
diff --git a/source/geometry/solids/STEP/include/SingleLinkList.h b/source/geometry/solids/STEP/include/SingleLinkList.h
index 72c3d1d5d5..b96f7ca471 100644
--- a/source/geometry/solids/STEP/include/SingleLinkList.h
+++ b/source/geometry/solids/STEP/include/SingleLinkList.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: SingleLinkList.h,v 1.2 1999/05/21 20:20:36 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef singlelinklist_h
 #define	singlelinklist_h
diff --git a/source/geometry/solids/STEP/include/Str.h b/source/geometry/solids/STEP/include/Str.h
index 5933239b9e..5a8e41f439 100644
--- a/source/geometry/solids/STEP/include/Str.h
+++ b/source/geometry/solids/STEP/include/Str.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Str.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Str.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef STR_H
@@ -51,7 +51,7 @@ char * PrettyNewName (const char * oldname);
 char * EntityClassName ( char * oldname);
 
 extern Severity CheckRemainingInput
-   (istream &in, ErrorDescriptor *err, 
+   (G4std::istream &in, ErrorDescriptor *err, 
     const char *typeName, // used in error message
     const char *tokenList); // e.g. ",)"
 
diff --git a/source/geometry/solids/STEP/include/baseType.h b/source/geometry/solids/STEP/include/baseType.h
index 38ebb3d39a..acf815c357 100644
--- a/source/geometry/solids/STEP/include/baseType.h
+++ b/source/geometry/solids/STEP/include/baseType.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: baseType.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef BASETYPE_H
 #define	BASETYPE_H
diff --git a/source/geometry/solids/STEP/include/classes.h b/source/geometry/solids/STEP/include/classes.h
index 6bfd42aa86..b92a74c36a 100644
--- a/source/geometry/solids/STEP/include/classes.h
+++ b/source/geometry/solids/STEP/include/classes.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: classes.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
 ** Fed-x parser output module for generating C++  class definitions
diff --git a/source/geometry/solids/STEP/include/cmdmgr.h b/source/geometry/solids/STEP/include/cmdmgr.h
index e694cfe48e..a3215de550 100644
--- a/source/geometry/solids/STEP/include/cmdmgr.h
+++ b/source/geometry/solids/STEP/include/cmdmgr.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: cmdmgr.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef cmdmgr_h
 #define cmdmgr_h
diff --git a/source/geometry/solids/STEP/include/dir.h b/source/geometry/solids/STEP/include/dir.h
index d72f67512f..665e295fac 100644
--- a/source/geometry/solids/STEP/include/dir.h
+++ b/source/geometry/solids/STEP/include/dir.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: dir.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifdef __O3DB__
diff --git a/source/geometry/solids/STEP/include/dirobj.h b/source/geometry/solids/STEP/include/dirobj.h
index 3bce4e42ae..594cc4934f 100644
--- a/source/geometry/solids/STEP/include/dirobj.h
+++ b/source/geometry/solids/STEP/include/dirobj.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: dirobj.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dirobj_h
diff --git a/source/geometry/solids/STEP/include/dispnode.h b/source/geometry/solids/STEP/include/dispnode.h
index 158ff87432..e541aee6dc 100644
--- a/source/geometry/solids/STEP/include/dispnode.h
+++ b/source/geometry/solids/STEP/include/dispnode.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnode.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dispnode_h
diff --git a/source/geometry/solids/STEP/include/dispnodelist.h b/source/geometry/solids/STEP/include/dispnodelist.h
index 5265d708ec..11dcd79a9e 100644
--- a/source/geometry/solids/STEP/include/dispnodelist.h
+++ b/source/geometry/solids/STEP/include/dispnodelist.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnodelist.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dispnodelist_h
diff --git a/source/geometry/solids/STEP/include/editordefines.h b/source/geometry/solids/STEP/include/editordefines.h
index f03b782838..e9f88f20af 100644
--- a/source/geometry/solids/STEP/include/editordefines.h
+++ b/source/geometry/solids/STEP/include/editordefines.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: editordefines.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef editordefines_h
diff --git a/source/geometry/solids/STEP/include/errordesc.h b/source/geometry/solids/STEP/include/errordesc.h
index 2b42f8b407..b33d6b2870 100644
--- a/source/geometry/solids/STEP/include/errordesc.h
+++ b/source/geometry/solids/STEP/include/errordesc.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: errordesc.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: errordesc.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ERRORDESC_H
@@ -69,7 +69,7 @@ enum  DebugLevel  {
  ** Description:  
  **	the error is a detailed error message + a severity level
  **	also keeps a user message separately
- **	detailed message gets sent to ostream
+ **	detailed message gets sent to G4std::ostream
  **	uses SCLstring class to keep the user messages
  **	keeps severity of error
  **	created with or without error
@@ -77,13 +77,13 @@ enum  DebugLevel  {
  ******************************************************************/
 
 class ErrorDescriptor {
-//  friend     istream &operator<< ( istream&, ErrorDescriptor& );
+//  friend     G4std::istream &operator<< ( G4std::istream&, ErrorDescriptor& );
   protected:
   
     Severity	_severity;
 
     static DebugLevel	_debug_level;
-    static ostream* _out;
+    static G4std::ostream* _out;
     
     SCLstring *_userMsg;
     SCLstring *_detailMsg;
@@ -134,7 +134,7 @@ class ErrorDescriptor {
 
     DebugLevel debug_level() const        { return _debug_level; }
     void debug_level(DebugLevel d)   { _debug_level = d; }
-    void SetOutput(ostream *o)      { _out = o; }
+    void SetOutput(G4std::ostream *o)      { _out = o; }
     
     // void operator =  (const char* y)  {  SCLstring::operator = (y);  }
     
diff --git a/source/geometry/solids/STEP/include/gennode.h b/source/geometry/solids/STEP/include/gennode.h
index 248162bd47..426cae9cc0 100644
--- a/source/geometry/solids/STEP/include/gennode.h
+++ b/source/geometry/solids/STEP/include/gennode.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: gennode.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: gennode.h,v 1.3 1999/12/15 18:04:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennode_h
@@ -29,11 +29,8 @@
 #include <OpenOODB.h>
 #endif
 
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+#include "G4ios.hh"
+
 class GenNodeList;
 class MgrNodeList;
 class DisplayNodeList;
diff --git a/source/geometry/solids/STEP/include/gennodearray.h b/source/geometry/solids/STEP/include/gennodearray.h
index a3b4a822f4..c1c875546a 100644
--- a/source/geometry/solids/STEP/include/gennodearray.h
+++ b/source/geometry/solids/STEP/include/gennodearray.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: gennodearray.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennodearray_h
diff --git a/source/geometry/solids/STEP/include/gennodelist.h b/source/geometry/solids/STEP/include/gennodelist.h
index 83becf6bde..38d25a4d0e 100644
--- a/source/geometry/solids/STEP/include/gennodelist.h
+++ b/source/geometry/solids/STEP/include/gennodelist.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: gennodelist.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: gennodelist.h,v 1.3 1999/12/15 18:04:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennodelist_h
@@ -29,11 +29,7 @@
 #include <OpenOODB.h>
 #endif
 
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+#include "G4ios.hh"
 
 //////////////////////////////////////////////////////////////////////////////
 // class GenNodeList
diff --git a/source/geometry/solids/STEP/include/instmgr.h b/source/geometry/solids/STEP/include/instmgr.h
index d82cb78958..c8b497b5e0 100644
--- a/source/geometry/solids/STEP/include/instmgr.h
+++ b/source/geometry/solids/STEP/include/instmgr.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: instmgr.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef instmgr_h
diff --git a/source/geometry/solids/STEP/include/mgrnode.h b/source/geometry/solids/STEP/include/mgrnode.h
index 55c7320e81..bc8ef8cfe4 100644
--- a/source/geometry/solids/STEP/include/mgrnode.h
+++ b/source/geometry/solids/STEP/include/mgrnode.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnode.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef mgrnode_h
 #define mgrnode_h
diff --git a/source/geometry/solids/STEP/include/mgrnodearray.h b/source/geometry/solids/STEP/include/mgrnodearray.h
index 9e677b8006..74ab7496f8 100644
--- a/source/geometry/solids/STEP/include/mgrnodearray.h
+++ b/source/geometry/solids/STEP/include/mgrnodearray.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: mgrnodearray.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: mgrnodearray.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef mgrnodearray_h
@@ -91,7 +91,7 @@ public:
 
     virtual int Insert(GenericNode* gn);
     virtual int Insert(GenericNode* gn, int index) 
-	{ cerr << 
+	{ G4cerr << 
 	  "Call MgrNodeArraySorted::Insert() without index argument instead.\n"
 		<< "index argument: " << index << " being ignored.\n";
 	  return Insert(gn); }
diff --git a/source/geometry/solids/STEP/include/mgrnodelist.h b/source/geometry/solids/STEP/include/mgrnodelist.h
index c0bb231860..0171f6bd46 100644
--- a/source/geometry/solids/STEP/include/mgrnodelist.h
+++ b/source/geometry/solids/STEP/include/mgrnodelist.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnodelist.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef mgrnodelist_h
diff --git a/source/geometry/solids/STEP/include/read_func.h b/source/geometry/solids/STEP/include/read_func.h
index 15c04dc627..378aa633bf 100644
--- a/source/geometry/solids/STEP/include/read_func.h
+++ b/source/geometry/solids/STEP/include/read_func.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: read_func.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: read_func.h,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef READ_FUNC_H
 #define	READ_FUNC_H
@@ -18,11 +18,11 @@
 // Print Error information for debugging purposes
 extern void PrintErrorState(ErrorDescriptor &err);
 
-// Print istream error information for debugging purposes
-extern void IStreamState(istream &in);
+// Print G4std::istream error information for debugging purposes
+extern void IStreamState(G4std::istream &in);
 
 extern int 
-ReadInteger(SdaiInteger &val, istream &in, ErrorDescriptor *err, 
+ReadInteger(SdaiInteger &val, G4std::istream &in, ErrorDescriptor *err, 
 	    char *tokenList);
 
 extern int 
@@ -34,7 +34,7 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
 	       int clearError, int optional, char *tokenList);
 
 extern int
-ReadReal(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadReal(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	 char *tokenList);
 
 extern int
@@ -46,7 +46,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
 		int clearError, int optional, char *tokenList);
 
 extern int
-ReadNumber(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadNumber(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	   char *tokenList);
 
 extern int
@@ -60,45 +60,45 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
 
 ////////////////////
 
-extern int   QuoteInString(istream& in);
+extern int   QuoteInString(G4std::istream& in);
 
 extern void 
-PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 ////////////////////
 
 extern Severity 
-FindStartOfInstance(istream& in, SCLstring&  inst);
+FindStartOfInstance(G4std::istream& in, SCLstring&  inst);
 
 	//  used for instances that aren\'t valid - reads to next \';\'
 extern Severity 
-SkipInstance (istream& in, SCLstring & inst);
+SkipInstance (G4std::istream& in, SCLstring & inst);
 
 extern const char *
-SkipSimpleRecord(istream &in, SCLstring &buf, ErrorDescriptor *err);
+SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err);
 
  // this includes entity names
 extern const char *
-ReadStdKeyword(istream& in, SCLstring &buf, int skipInitWS = 1);
+ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS = 1);
 
 extern const char* 
-GetKeyword(istream& in, const char* delims, ErrorDescriptor &err);
+GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err);
 
 extern int 
-FoundEndSecKywd(istream& in, ErrorDescriptor &err);
+FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err);
 
 extern const char *ReadComment(SCLstring &ss, const char *s);
 
-extern const char *ReadComment(istream& in, SCLstring &s);
+extern const char *ReadComment(G4std::istream& in, SCLstring &s);
 
-extern Severity    ReadPcd(istream& in);   //Print control directive
+extern Severity    ReadPcd(G4std::istream& in);   //Print control directive
 
-extern void        ReadTokenSeparator(istream& in, SCLstring *comments = 0);
+extern void        ReadTokenSeparator(G4std::istream& in, SCLstring *comments = 0);
 
 #endif
diff --git a/source/geometry/solids/STEP/include/s_HEADER_SCHEMA.h b/source/geometry/solids/STEP/include/s_HEADER_SCHEMA.h
index b9b1324234..fa561edf67 100644
--- a/source/geometry/solids/STEP/include/s_HEADER_SCHEMA.h
+++ b/source/geometry/solids/STEP/include/s_HEADER_SCHEMA.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: s_HEADER_SCHEMA.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  S_HEADER_SCHEMA_H
 #define  S_HEADER_SCHEMA_H
diff --git a/source/geometry/solids/STEP/include/schema.h b/source/geometry/solids/STEP/include/schema.h
index 7be6b1ae56..7741c27c0d 100644
--- a/source/geometry/solids/STEP/include/schema.h
+++ b/source/geometry/solids/STEP/include/schema.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: schema.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SCHEMA_H
 #define  SCHEMA_H
diff --git a/source/geometry/solids/STEP/include/scl_hash.h b/source/geometry/solids/STEP/include/scl_hash.h
index 0a8d57d166..a21e976710 100644
--- a/source/geometry/solids/STEP/include/scl_hash.h
+++ b/source/geometry/solids/STEP/include/scl_hash.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: scl_hash.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef SCL_HASH_H
diff --git a/source/geometry/solids/STEP/include/scl_string.h b/source/geometry/solids/STEP/include/scl_string.h
index 81009aa4a0..d2aa6055f9 100644
--- a/source/geometry/solids/STEP/include/scl_string.h
+++ b/source/geometry/solids/STEP/include/scl_string.h
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: scl_string.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: scl_string.h,v 1.3 1999/12/15 18:04:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _SCL_STRING_H
 #define _SCL_STRING_H
@@ -36,11 +36,8 @@
 // this file is not in gnu C++ but it doesn't seem to be needed.
 #include <stdarg.h>
 #endif
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+
+#include "G4ios.hh"
 #include <string.h>
 
 /******************************************************************
diff --git a/source/geometry/solids/STEP/include/sdai.h b/source/geometry/solids/STEP/include/sdai.h
index 79672a5f39..c4b0a54bba 100644
--- a/source/geometry/solids/STEP/include/sdai.h
+++ b/source/geometry/solids/STEP/include/sdai.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: sdai.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef SDAI_H
 #define	SDAI_H
diff --git a/source/geometry/solids/STEP/include/seeinfodefault.h b/source/geometry/solids/STEP/include/seeinfodefault.h
index 94121b9f6c..3ddd35148c 100644
--- a/source/geometry/solids/STEP/include/seeinfodefault.h
+++ b/source/geometry/solids/STEP/include/seeinfodefault.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: seeinfodefault.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef seeinfodefault_h
 #define seeinfodefault_h
diff --git a/source/geometry/solids/STEP/include/stat.h b/source/geometry/solids/STEP/include/stat.h
index fd578e6456..cc92b470a3 100644
--- a/source/geometry/solids/STEP/include/stat.h
+++ b/source/geometry/solids/STEP/include/stat.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: stat.h,v 1.2 1999/05/21 20:20:45 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifdef __O3DB__
diff --git a/source/geometry/solids/STEP/src/Enumeration.cc b/source/geometry/solids/STEP/src/Enumeration.cc
index 4548843cab..c7e259b802 100644
--- a/source/geometry/solids/STEP/src/Enumeration.cc
+++ b/source/geometry/solids/STEP/src/Enumeration.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Enumeration.cc,v 1.2 1999/05/21 20:20:47 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Enumeration.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include <Enumeration.h>
@@ -26,11 +26,7 @@
 
 //static char rcsid[] ="";
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 // Josh L, 3/31/95
 // These constants have to be initialized outside the SDAI struct.  They
@@ -103,7 +99,7 @@ int Boolean::operator ==( LOGICAL log ) const
 
 /******************************************************************
  ** Procedure:  DebugDisplay
- ** Parameters:  ostream& out
+ ** Parameters:  G4std::ostream& out
  ** Returns:  
  ** Description:  prints out some information on the enumerated 
  **               item for debugging purposes
@@ -111,7 +107,7 @@ int Boolean::operator ==( LOGICAL log ) const
  ** Status:  ok 2/1/91
  ******************************************************************/
 void
-STEPenumeration::DebugDisplay (ostream& out) const  {
+STEPenumeration::DebugDisplay (G4std::ostream& out) const  {
     SCLstring tmp;
     out << "Value  :  " <<  v  << "  " 
 	<< asStr (tmp) 
@@ -142,7 +138,7 @@ STEPenumeration::DebugDisplay (ostream& out) const  {
 // true or false => non-matching delimiters are flagged as an error
 
 Severity 
-STEPenumeration::ReadEnum(istream& in, ErrorDescriptor *err, int AssignVal,
+STEPenumeration::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
 			  int needDelims)
 {
     if(AssignVal)
@@ -155,7 +151,7 @@ STEPenumeration::ReadEnum(istream& in, ErrorDescriptor *err, int AssignVal,
 
     int validDelimiters = 1;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
 
     if( in.good() )
     {
@@ -272,7 +268,7 @@ STEPenumeration::ReadEnum(istream& in, ErrorDescriptor *err, int AssignVal,
 	    err->AppendToUserMsg(messageBuf);
 	}
     }
-    else // Hit eof (assuming there was no error state for istream passed in)
+    else // Hit eof (assuming there was no error state for G4std::istream passed in)
     {
 	err->GreaterSeverity(SEVERITY_INCOMPLETE);
     }
@@ -291,7 +287,7 @@ STEPenumeration::StrToVal (const char * s)
 Severity 
 STEPenumeration::StrToVal (const char * s, ErrorDescriptor *err, int optional)
 {
-    istrstream in ((char *)s); // sz defaults to length of s
+    G4std::istrstream in ((char *)s); // sz defaults to length of s
 
     Severity sev = ReadEnum(in, err, 1, 0);
     if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
@@ -304,13 +300,13 @@ STEPenumeration::StrToVal (const char * s, ErrorDescriptor *err, int optional)
 Severity
 STEPenumeration::STEPread (const char *s, ErrorDescriptor *err, int optional)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return STEPread (in, err, optional);
 }
 
 // reads an enumerated value in STEP file format 
 Severity
-STEPenumeration::STEPread (istream& in, ErrorDescriptor *err, int optional)
+STEPenumeration::STEPread (G4std::istream& in, ErrorDescriptor *err, int optional)
 {
     Severity sev = ReadEnum(in, err, 1, 1);
     if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
@@ -332,7 +328,7 @@ STEPenumeration::asStr (SCLstring &s) const  {
 }
 
 void 
-STEPenumeration::STEPwrite (ostream& out)  const  {
+STEPenumeration::STEPwrite (G4std::ostream& out)  const  {
     if( is_null() )
 	out << '$';
     else
@@ -379,14 +375,14 @@ STEPenumeration::set_elements (const char * const e [])  {
 }
 #endif
 Severity 
-STEPenumeration::EnumValidLevel(istream &in, ErrorDescriptor *err,
+STEPenumeration::EnumValidLevel(G4std::istream &in, ErrorDescriptor *err,
 				int optional, char *tokenList, 
 				int needDelims, int clearError)
 {
     if(clearError)
 	err->ClearErrorMsg();
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
     char c = ' '; 
     c = in.peek();
     if(c == '$' || in.eof())
@@ -423,7 +419,7 @@ STEPenumeration::EnumValidLevel(const char *value, ErrorDescriptor *err,
 				int optional, char *tokenList, 
 				int needDelims, int clearError)
 {
-    istrstream in((char *)value);
+    G4std::istrstream in((char *)value);
     return EnumValidLevel (in, err, optional, tokenList, needDelims,
 			   clearError);
 /*
@@ -551,7 +547,7 @@ STEPenumeration::operator= (const STEPenumeration& Senum)
     return *this;
 }
 
-ostream &operator<< ( ostream& out, const STEPenumeration& a )
+G4std::ostream &operator<< ( G4std::ostream& out, const STEPenumeration& a )
 {
     SCLstring tmp;
     out << a.asStr( tmp );
@@ -628,7 +624,7 @@ STEPenumeration::StrToVal (const char * s, ErrorDescriptor *err, int optional)
 
 
 Severity
-STEPenumeration::STEPread (istream& in, ErrorDescriptor *err, int optional)
+STEPenumeration::STEPread (G4std::istream& in, ErrorDescriptor *err, int optional)
 {
     char enumValue [BUFSIZ];
     char c;
diff --git a/source/geometry/solids/STEP/src/ExpDict.cc b/source/geometry/solids/STEP/src/ExpDict.cc
index 44f2b5ff70..cf2dd724c9 100644
--- a/source/geometry/solids/STEP/src/ExpDict.cc
+++ b/source/geometry/solids/STEP/src/ExpDict.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: ExpDict.cc,v 1.2 1999/05/21 20:20:47 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExpDict.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -335,13 +335,13 @@ EntityDescriptor::FindLongestAttribute()
     while( attrPtr != 0)
     {
 	if(attrPtr->AttrDesc()->IsEntityType())
-	    maxAttrLen = max(maxAttrLen, 
+	    maxAttrLen = G4std::max(maxAttrLen, 
 		    (strlen(attrPtr->AttrDesc()->EntityType()->Name()) +
 		      strlen(attrPtr->AttrDesc()->Name()) + 3
 		     )
 		    );
 	else
-	    maxAttrLen = max(maxAttrLen, 
+	    maxAttrLen = G4std::max(maxAttrLen, 
 	      (strlen(attrPtr->AttrDesc()->DomainType()->NameOrDescription()) +
 	       strlen(attrPtr->AttrDesc()->Name()) + 3
 	      )
diff --git a/source/geometry/solids/STEP/src/ExpDict_inline.cc b/source/geometry/solids/STEP/src/ExpDict_inline.cc
index 2533a9a647..2cb4291ae0 100644
--- a/source/geometry/solids/STEP/src/ExpDict_inline.cc
+++ b/source/geometry/solids/STEP/src/ExpDict_inline.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: ExpDict_inline.cc,v 1.2 1999/05/21 20:20:48 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/Registry_inline.cc b/source/geometry/solids/STEP/src/Registry_inline.cc
index 6877a4347d..fe094950f7 100644
--- a/source/geometry/solids/STEP/src/Registry_inline.cc
+++ b/source/geometry/solids/STEP/src/Registry_inline.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: Registry_inline.cc,v 1.2 1999/05/21 20:20:48 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/STEPaggregate.cc b/source/geometry/solids/STEP/src/STEPaggregate.cc
index 4664512232..5acc428492 100644
--- a/source/geometry/solids/STEP/src/STEPaggregate.cc
+++ b/source/geometry/solids/STEP/src/STEPaggregate.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPaggregate.cc,v 1.2 1999/05/21 20:20:48 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPaggregate.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -80,7 +80,7 @@ STEPaggregate::AggrValidLevel(const char *value, ErrorDescriptor *err,
     if(clearError)
 	err->ClearErrorMsg();
 
-    istrstream in ((char *)value); // sz defaults to length of s
+    G4std::istrstream in ((char *)value); // sz defaults to length of s
 
     ReadValue(in, err, elem_type, insts, addFileId, 0, 0);
     CheckRemainingInput(in, err, elem_type->AttrTypeName(), tokenList);
@@ -91,7 +91,7 @@ STEPaggregate::AggrValidLevel(const char *value, ErrorDescriptor *err,
 
     // require exchange file format
 Severity 
-STEPaggregate::AggrValidLevel(istream &in, ErrorDescriptor *err, 
+STEPaggregate::AggrValidLevel(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type, InstMgr *insts, 
 			      int optional, char *tokenList, int addFileId, 
 			      int clearError)
@@ -109,7 +109,7 @@ STEPaggregate::AggrValidLevel(istream &in, ErrorDescriptor *err,
 // if exchangeFileFormat == 1 then paren delims are required.
 
 Severity 
-STEPaggregate::ReadValue(istream &in, ErrorDescriptor *err, 
+STEPaggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			 const TypeDescriptor *elem_type, 
 			 InstMgr *insts, int addFileId, 
 			 int assignVal, int exchangeFileFormat)
@@ -124,7 +124,7 @@ STEPaggregate::ReadValue(istream &in, ErrorDescriptor *err,
     char c;
     int validDelims = 1;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
 
     c = in.peek(); // does not advance input
 
@@ -184,7 +184,7 @@ STEPaggregate::ReadValue(istream &in, ErrorDescriptor *err,
 	if(assignVal) // pass the node to STEPaggregate
 	    AddNode (item);
 
-	in >> ws; // skip white space (although should already be skipped)
+	in >> G4std::ws; // skip white space (although should already be skipped)
 	in.get(c); // read delim
 
 	// CheckRemainingInput should have left the input right at the delim
@@ -222,14 +222,14 @@ STEPaggregate::StrToVal(const char *s, ErrorDescriptor *err,
 			const TypeDescriptor *elem_type, InstMgr *insts, 
 			int addFileId)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return ReadValue(in, err, elem_type, insts, addFileId, 1, 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 Severity 
-STEPaggregate::STEPread(istream& in, ErrorDescriptor *err, 
+STEPaggregate::STEPread(G4std::istream& in, ErrorDescriptor *err, 
 			const TypeDescriptor *elem_type, 
 			InstMgr *insts, int addFileId)
 {
@@ -258,7 +258,7 @@ STEPaggregate::asStr(SCLstring & s) const
 }
 
 void
-STEPaggregate::STEPwrite(ostream& out) const
+STEPaggregate::STEPwrite(G4std::ostream& out) const
 {
     if(!_null)
     {
@@ -320,7 +320,7 @@ STEPnode::StrToVal(const char *s, ErrorDescriptor *err)
 }
 
 Severity
-STEPnode::StrToVal(istream &in, ErrorDescriptor *err)
+STEPnode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     // defined in subtypes
   G4cerr << "Internal error:  " << __FILE__ << ": " <<  __LINE__ << "\n" ;
@@ -352,7 +352,7 @@ STEPnode::STEPread(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-STEPnode::STEPread(istream &in, ErrorDescriptor *err)
+STEPnode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
   G4cerr << "Internal error:  " << __FILE__ << ": " <<  __LINE__ << "\n" ;
   G4cerr << "function:  STEPnode::STEPread called instead of virtual function.\n"
@@ -388,7 +388,7 @@ STEPnode::STEPwrite (SCLstring &s)
 }
 
 void 
-STEPnode::STEPwrite (ostream& out)
+STEPnode::STEPwrite (G4std::ostream& out)
 {
   G4cerr << "Internal error:  " << __FILE__ << ": " <<  __LINE__ << "\n" ;
  G4cerr << "function:  STEPnode::STEPwrite called instead of virtual function.\n"
@@ -463,7 +463,7 @@ GenericAggrNode::StrToVal(const char *s, ErrorDescriptor *err)
 
 //TODO
 Severity 
-GenericAggrNode::StrToVal(istream &in, ErrorDescriptor *err)
+GenericAggrNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -471,12 +471,12 @@ GenericAggrNode::StrToVal(istream &in, ErrorDescriptor *err)
 Severity 
 GenericAggrNode::STEPread(const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *) s);
+    G4std::istrstream in((char *) s);
     return value.STEPread(in, err);
 }
 
 Severity 
-GenericAggrNode::STEPread(istream &in, ErrorDescriptor *err)
+GenericAggrNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -503,7 +503,7 @@ GenericAggrNode::STEPwrite(SCLstring &s)
 }
 
 void
-GenericAggrNode::STEPwrite (ostream& out)
+GenericAggrNode::STEPwrite (G4std::ostream& out)
 {
     value.STEPwrite(out);
 }
@@ -525,7 +525,7 @@ EntityAggregate::~EntityAggregate ()
 // if exchangeFileFormat == 1 then delims are required.
 
 Severity 
-EntityAggregate::ReadValue(istream &in, ErrorDescriptor *err, 
+EntityAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			 const TypeDescriptor *elem_type, 
 			 InstMgr *insts, int addFileId, 
 			 int assignVal, int exchangeFileFormat)
@@ -540,7 +540,7 @@ EntityAggregate::ReadValue(istream &in, ErrorDescriptor *err,
     char c;
     int validDelims = 1;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
 
     c = in.peek(); // does not advance input
 
@@ -599,7 +599,7 @@ EntityAggregate::ReadValue(istream &in, ErrorDescriptor *err,
 	if(assignVal)
 	    AddNode (item);
 
-	in >> ws; // skip white space (although should already be skipped)
+	in >> G4std::ws; // skip white space (although should already be skipped)
 	in.get(c); // read delim
 
 	// CheckRemainingInput should have left the input right at the delim
@@ -698,7 +698,7 @@ EntityNode::StrToVal(const char *s, ErrorDescriptor *err,
 }
 
 Severity 
-EntityNode::StrToVal(istream &in, ErrorDescriptor *err, 
+EntityNode::StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 		     const TypeDescriptor *elem_type,
 		     InstMgr *insts, int addFileId)
 {
@@ -710,12 +710,12 @@ EntityNode::STEPread(const char *s, ErrorDescriptor *err,
 		     const TypeDescriptor *elem_type, 
 		     InstMgr *insts, int addFileId)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return STEPread(in, err, elem_type, insts, addFileId);
 }
 
 Severity 
-EntityNode::STEPread(istream &in, ErrorDescriptor *err, 
+EntityNode::STEPread(G4std::istream &in, ErrorDescriptor *err, 
 		     const TypeDescriptor *elem_type,
 		     InstMgr *insts, int addFileId)
 {
@@ -767,7 +767,7 @@ EntityNode::STEPwrite(SCLstring &s)
 }
 
 void 
-EntityNode::STEPwrite(ostream& out)
+EntityNode::STEPwrite(G4std::ostream& out)
 {
     if (!node || (node == S_ENTITY_NULL))     //  nothing
       out << "$";
@@ -793,7 +793,7 @@ SelectAggregate::~SelectAggregate ()
 // if exchangeFileFormat == 1 then delims are required.
 
 Severity 
-SelectAggregate::ReadValue(istream &in, ErrorDescriptor *err, 
+SelectAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			   const TypeDescriptor *elem_type, 
 			   InstMgr *insts, int addFileId, 
 			   int assignVal, int exchangeFileFormat)
@@ -808,7 +808,7 @@ SelectAggregate::ReadValue(istream &in, ErrorDescriptor *err,
     char c;
     int validDelims = 1;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
 
     c = in.peek(); // does not advance input
 
@@ -869,7 +869,7 @@ SelectAggregate::ReadValue(istream &in, ErrorDescriptor *err,
 	if(assignVal)
 	    AddNode (item);
 
-	in >> ws; // skip white space (although should already be skipped)
+	in >> G4std::ws; // skip white space (although should already be skipped)
 	in.get(c); // read delim
 
 	// CheckRemainingInput should have left the input right at the delim
@@ -945,14 +945,14 @@ SelectNode::StrToVal(const char *s, ErrorDescriptor *err,
 	node = S_ENTITY_NULL;
 */
 	// KC you will have to decide what to do here
-    istrstream in((char*)s);
+    G4std::istrstream in((char*)s);
     if (err->severity( node->STEPread(in, err, insts) ) != SEVERITY_NULL)
 	err->AppendToDetailMsg (node ->Error ());
     return err->severity();
 }
 
 Severity 
-SelectNode::StrToVal(istream &in, ErrorDescriptor *err, 
+SelectNode::StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 		     const TypeDescriptor *elem_type,
 		     InstMgr *insts, int addFileId)
 {
@@ -964,12 +964,12 @@ SelectNode::STEPread(const char *s, ErrorDescriptor *err,
 		     const TypeDescriptor *elem_type, 
 		     InstMgr *insts, int addFileId)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return STEPread(in, err, elem_type, insts, addFileId);
 }
 
 Severity 
-SelectNode::STEPread(istream &in, ErrorDescriptor *err, 
+SelectNode::STEPread(G4std::istream &in, ErrorDescriptor *err, 
 		     const TypeDescriptor *elem_type,
 		     InstMgr *insts, int addFileId)
 {
@@ -1011,7 +1011,7 @@ SelectNode::STEPwrite(SCLstring &s)
 }
 
 void 
-SelectNode::STEPwrite(ostream& out)
+SelectNode::STEPwrite(G4std::ostream& out)
 {
     if ( !node || (node->is_null()) )     //  nothing
       out << "$";
@@ -1098,7 +1098,7 @@ StringNode::StrToVal(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-StringNode::StrToVal(istream &in, ErrorDescriptor *err)
+StringNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -1108,7 +1108,7 @@ StringNode::StrToVal(istream &in, ErrorDescriptor *err)
 Severity 
 StringNode::STEPread(const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
 
     value.STEPread(in, err);
     CheckRemainingInput(in, err, "string", ",)");
@@ -1118,7 +1118,7 @@ StringNode::STEPread(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-StringNode::STEPread(istream &in, ErrorDescriptor *err)
+StringNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -1140,7 +1140,7 @@ StringNode::STEPwrite (SCLstring &s)
 }
 
 void
-StringNode::STEPwrite (ostream& out)
+StringNode::STEPwrite (G4std::ostream& out)
 {
     value.STEPwrite(out);
 }
@@ -1216,7 +1216,7 @@ BinaryNode::StrToVal(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-BinaryNode::StrToVal(istream &in, ErrorDescriptor *err)
+BinaryNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -1227,7 +1227,7 @@ BinaryNode::StrToVal(istream &in, ErrorDescriptor *err)
 Severity 
 BinaryNode::STEPread(const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
 
     value.STEPread(in, err);
     CheckRemainingInput(in, err, "binary", ",)");
@@ -1237,7 +1237,7 @@ BinaryNode::STEPread(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-BinaryNode::STEPread(istream &in, ErrorDescriptor *err)
+BinaryNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     return value.STEPread(in, err);
 }
@@ -1257,7 +1257,7 @@ BinaryNode::STEPwrite (SCLstring &s)
 }
 
 void
-BinaryNode::STEPwrite (ostream& out)
+BinaryNode::STEPwrite (G4std::ostream& out)
 {
     value.STEPwrite(out);
 }
@@ -1421,7 +1421,7 @@ EnumNode::StrToVal(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-EnumNode::StrToVal(istream &in, ErrorDescriptor *err)
+EnumNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     return node->STEPread(in, err);
 }
@@ -1432,7 +1432,7 @@ EnumNode::StrToVal(istream &in, ErrorDescriptor *err)
 Severity 
 EnumNode::STEPread(const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *)s); // sz defaults to length of s
+    G4std::istrstream in((char *)s); // sz defaults to length of s
 
     int nullable = 0;
     node->STEPread (in, err,  nullable);
@@ -1443,7 +1443,7 @@ EnumNode::STEPread(const char *s, ErrorDescriptor *err)
 // this function assumes you will check for garbage following input
 
 Severity 
-EnumNode::STEPread(istream &in, ErrorDescriptor *err)
+EnumNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     int nullable = 0;
     node->STEPread (in, err,  nullable);
@@ -1483,7 +1483,7 @@ EnumNode::STEPwrite (SCLstring &s)
 }
 
 void 
-EnumNode::STEPwrite (ostream& out)
+EnumNode::STEPwrite (G4std::ostream& out)
 {
 //    out << '.' << asStr() << '.';
     node->STEPwrite(out);
@@ -1599,7 +1599,7 @@ RealNode::StrToVal(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-RealNode::StrToVal(istream &in, ErrorDescriptor *err)
+RealNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     if( ReadReal(value, in, err, ",)") ) // returns true if value is assigned
 	_null = 0;
@@ -1626,7 +1626,7 @@ RealNode::STEPread(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-RealNode::STEPread(istream &in, ErrorDescriptor *err)
+RealNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     if( ReadReal(value, in, err, ",)") ) // returns true if value is assigned
 	_null = 0;
@@ -1661,7 +1661,7 @@ RealNode::STEPwrite(SCLstring &s)
 }
 
 void 
-RealNode::STEPwrite(ostream& out)
+RealNode::STEPwrite(G4std::ostream& out)
 {
     SCLstring s;
     out << STEPwrite(s);
@@ -1691,7 +1691,7 @@ IntNode::StrToVal(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-IntNode::StrToVal(istream &in, ErrorDescriptor *err)
+IntNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     if( ReadInteger(value, in, err, ",)") )// returns true if value is assigned
 	_null = 0;
@@ -1717,7 +1717,7 @@ IntNode::STEPread(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-IntNode::STEPread(istream &in, ErrorDescriptor *err)
+IntNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     if( ReadInteger(value, in, err, ",)") ) // returns true if value is assigned
 	_null = 0;
@@ -1751,7 +1751,7 @@ IntNode::STEPwrite(SCLstring &s)
 }
 
 void 
-IntNode::STEPwrite(ostream& out)
+IntNode::STEPwrite(G4std::ostream& out)
 {
     SCLstring s;
     out << STEPwrite(s);
diff --git a/source/geometry/solids/STEP/src/STEPattribute.cc b/source/geometry/solids/STEP/src/STEPattribute.cc
index eea662760c..e81499dc3c 100644
--- a/source/geometry/solids/STEP/src/STEPattribute.cc
+++ b/source/geometry/solids/STEP/src/STEPattribute.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPattribute.cc,v 1.2 1999/05/21 20:20:49 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPattribute.cc,v 1.4 1999/12/15 18:04:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
 * NIST STEP Core Class Library
@@ -23,6 +23,11 @@
 
 //static char rcsid[] ="";
 
+#ifndef G4USE_STD_NAMESPACE
+  #ifndef WIN32
+    #include <stream.h>
+  #endif
+#endif
 
 #include <read_func.h>
 #include <STEPattribute.h>
@@ -113,7 +118,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
 	return _error.severity (SEVERITY_INPUT_ERROR);
     }
 
-    istrstream in ((char *)s); // sz defaults to length of s
+    G4std::istrstream in ((char *)s); // sz defaults to length of s
     int valAssigned = 0;
 
     // read in value for attribute
@@ -202,7 +207,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
  ** Returns:  Severity, which indicates success, or failure
  **         value >= SEVERITY_WARNING means program can continue parsing input,
  **         value <= SEVERITY_INPUT_ERROR  is fatal read error
- ** Description:  the value of the attribute is read from istream
+ ** Description:  the value of the attribute is read from G4std::istream
  **               the format expected is STEP exchange file
  **          modified to accept '$' as value for OPTIONAL ATTRIBUTE,
  **             (since this function is used for reading files in both
@@ -213,7 +218,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
 // the delim separating the last attribute from the end of the entity (')').
 
 Severity
-STEPattribute::STEPread (istream& in, InstMgr * instances, int addFileId)
+STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
     char errStr[BUFSIZ];
@@ -225,7 +230,7 @@ STEPattribute::STEPread (istream& in, InstMgr * instances, int addFileId)
     //  set the value to be null (reinitialize the attribute value)
     set_null();
 
-    in >> ws; // skip whitespace
+    in >> G4std::ws; // skip whitespace
     in >> c;
     in.putback (c);    //  leave input stream alone
 
@@ -253,7 +258,7 @@ STEPattribute::STEPread (istream& in, InstMgr * instances, int addFileId)
 	return _error.severity();
 
       case '*':
-	in.get(c);  // take * off the istream
+	in.get(c);  // take * off the G4std::istream
 	if (IsDerived ())  
 	    _error.severity(SEVERITY_NULL);
 	else {
@@ -470,7 +475,7 @@ STEPattribute::asStr (SCLstring& str) const
 // The output is in physical file format.
 
 void
-STEPattribute::STEPwrite (ostream& out) 
+STEPattribute::STEPwrite (G4std::ostream& out) 
 { 
     if (IsDerived ())  {
       out << "*";
@@ -504,11 +509,10 @@ STEPattribute::STEPwrite (ostream& out)
         // style output used below should shift such things to e-notation
         // automagically.
         
-#ifndef WIN32
-        out << form("%.*g", (int) Real_Num_Precision,tmp);
-#else
-        out << (int) Real_Num_Precision << " " << tmp;
-#endif
+        char* outBuf="";
+        sprintf(outBuf, "%.*G", (int) Real_Num_Precision,tmp);
+        out << outBuf;
+
 	break;	  
       }
 
@@ -938,13 +942,13 @@ STEPattribute::ValidLevel (const char *attrValue, ErrorDescriptor *error,
   
 /******************************************************************
  ** Procedure:  operator <<
- ** Parameters:  ostream & out -- output stream
+ ** Parameters:  G4std::ostream & out -- output stream
  **              STEPattribute & a -- attribute to output
- ** Returns:  ostream &
+ ** Returns:  G4std::ostream &
  ** Description:  overloads the output operator to Print an attribute 
  ******************************************************************/
 
-ostream &operator<< ( ostream& out, STEPattribute& a )
+G4std::ostream &operator<< ( G4std::ostream& out, STEPattribute& a )
 {
     a.STEPwrite (out);
     return out;
@@ -991,10 +995,16 @@ STEPattribute::AddErrorInfo()
 // if it hits one of StopChars it puts it back.
 // RETURNS: the last char it read.
 char
-STEPattribute::SkipBadAttr(istream& in, char *StopChars)
+STEPattribute::SkipBadAttr(G4std::istream& in, char *StopChars)
 {
-#ifndef WIN32
-    int sk = in.skip(0);  //turn skipping whitespace off
+
+// turn skipping whitespace off
+#ifdef G4USE_STD_NAMESPACE
+    in.unsetf(G4std::ios::skipws);
+#else
+    #ifndef WIN32
+      int sk = in.skip(0);  
+    #endif
 #endif
 
 	// read bad data until end of this attribute or entity.
@@ -1022,9 +1032,16 @@ STEPattribute::SkipBadAttr(istream& in, char *StopChars)
 	_error.AppendToDetailMsg(errStr);
     }
     in.putback (c);
-#ifndef WIN32
-    in.skip(sk);     //set skip whitespace to its original state
+
+// set skip whitespace to its original state
+#ifdef G4USE_STD_NAMESPACE
+    in.setf(G4std::ios::skipws);
+#else
+    #ifndef WIN32
+      in.skip(sk);
+    #endif
 #endif
+
     return c;
 }
 
diff --git a/source/geometry/solids/STEP/src/STEPattributeList.cc b/source/geometry/solids/STEP/src/STEPattributeList.cc
index 741cb8dfa6..b0fa768fd4 100644
--- a/source/geometry/solids/STEP/src/STEPattributeList.cc
+++ b/source/geometry/solids/STEP/src/STEPattributeList.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: STEPattributeList.cc,v 1.2 1999/05/21 20:20:49 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/STEPattribute_inline.cc b/source/geometry/solids/STEP/src/STEPattribute_inline.cc
index c2dee5c34c..fcc76fd139 100644
--- a/source/geometry/solids/STEP/src/STEPattribute_inline.cc
+++ b/source/geometry/solids/STEP/src/STEPattribute_inline.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: STEPattribute_inline.cc,v 1.2 1999/05/21 20:20:49 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/STEPcomplex.cc b/source/geometry/solids/STEP/src/STEPcomplex.cc
index 33fca57326..1d5369965f 100644
--- a/source/geometry/solids/STEP/src/STEPcomplex.cc
+++ b/source/geometry/solids/STEP/src/STEPcomplex.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPcomplex.cc,v 1.2 1999/05/21 20:20:50 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPcomplex.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include <ctype.h>
@@ -14,7 +14,7 @@
 #include <STEPcomplex.h>
 
 extern const char *
-ReadStdKeyword(istream& in, SCLstring &buf, int skipInitWS);
+ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS);
 
 
 STEPcomplex::STEPcomplex(Registry *registry, int fileid)
@@ -183,7 +183,7 @@ STEPcomplex::AddEntityPart(const char *name)
 	}
 	else
 	{
-	    G4cout << scomplex->_error.DetailMsg() << endl;
+	    G4cout << scomplex->_error.DetailMsg() << G4endl;
 	    delete scomplex;
 	}
     }
@@ -237,7 +237,7 @@ STEPcomplex::AppendEntity(STEPcomplex *stepc)
 // READ
 Severity 
 STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
-		 istream& in)
+		 G4std::istream& in)
 {
     char c;
     SCLstring typeNm;
@@ -253,18 +253,18 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 	stepc = stepc->sc;
     }
 
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
     if(c == '(') // opening paren for subsuperRecord
     {
-	in >> ws;
+	in >> G4std::ws;
 	c = in.peek();
 	while(c != ')')
 	{
 	    typeNm.set_null();
-	    in >> ws;
+	    in >> G4std::ws;
 	    ReadStdKeyword(in, typeNm, 1); // read the type name
-	    in >> ws;
+	    in >> G4std::ws;
 	    c = in.peek();
 	    if(c != '(')
 	    {
@@ -287,7 +287,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 		STEPread_error(c,0,in);
 		return _error.severity();
 	    }
-	    in >> ws;
+	    in >> G4std::ws;
 	    c = in.peek();
 	}
 	if(c != ')')
@@ -302,7 +302,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 // READ
 Severity 
 STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
-		 istream& in)
+		 G4std::istream& in)
 {
     ClearError(1);
     STEPfile_id = id;
@@ -315,12 +315,12 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
     }
 
     char c;
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
     if(c == '(')
     {
 	SCLstring s;
-	in >> ws;
+	in >> G4std::ws;
 	in.get(c);
 	while( in && (c != '(') && !isspace(c) ) // get the entity name
 	{
@@ -329,7 +329,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 	}
 	if(isspace(c))
 	{
-	    in >> ws;
+	    in >> G4std::ws;
 	    in.get(c);
 	}
 //    STEPcomplex *EntityPart(const char *name);
@@ -346,11 +346,11 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 	else // c == '('
 	    in.putback(c);
 	
-	G4cout << s.chars() << endl;
+	G4cout << s.chars() << G4endl;
 	BuildAttrs( s.chars() );
 	STEPentity::STEPread(id, addFileId, instance_set, in);
 	
-	in >> ws;
+	in >> G4std::ws;
 	in.get(c);
 	while(c != ')')
 	{
@@ -362,7 +362,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 	    }
 	    if(isspace(c))
 	    {
-		in >> ws;
+		in >> G4std::ws;
 		in.get(c);
 	    }
 	    if(c != '(')
@@ -377,13 +377,13 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
 	    else // c == '('
 		in.putback(c);
 
-	    G4cout << s.chars() << endl; // diagnostics DAS
+	    G4cout << s.chars() << G4endl; // diagnostics DAS
 	    
 	    STEPcomplex *stepc = new STEPcomplex( _registry );
 	    AppendEntity(stepc);
 	    stepc->BuildAttrs( s.chars() );
 	    stepc->STEPentity::STEPread(id, addFileId, instance_set, in);
-	    in >> ws;
+	    in >> G4std::ws;
 	    in.get(c);
 	}
     }
@@ -497,14 +497,14 @@ STEPcomplex::BuildAttrs(const char *s )
 }
 
 void 
-STEPcomplex::STEPread_error(char c, int index, istream& in)
+STEPcomplex::STEPread_error(char c, int index, G4std::istream& in)
 {
     G4cout << "STEPcomplex::STEPread_error() \n";
 }
 
 // WRITE
 void 
-STEPcomplex::STEPwrite(ostream& out, int writeComment)
+STEPcomplex::STEPwrite(G4std::ostream& out, int writeComment)
 {
     if(writeComment && p21Comment && !p21Comment->is_null() )
 	out << p21Comment->chars();
@@ -526,11 +526,11 @@ STEPcomplex::STEPwrite(SCLstring &buf)
     sprintf(instanceInfo, "#%d=", STEPfile_id );
 */
 /*
-    strstream ss;
+    G4std::strstream ss;
     ss << "#" << STEPfile_id << "=(";
     WriteExtMapEntities(ss);
     ss << ");";
-    ss << ends;
+    ss << G4std::ends;
 
     char *tmpstr = ss.str();
     buf.Append(tmpstr);
@@ -543,7 +543,7 @@ STEPcomplex::STEPwrite(SCLstring &buf)
 }
 
 void 
-STEPcomplex::WriteExtMapEntities(ostream& out)
+STEPcomplex::WriteExtMapEntities(G4std::ostream& out)
 {
     SCLstring tmp;
     out << StrToUpper (EntityName(), tmp);
diff --git a/source/geometry/solids/STEP/src/STEPentity.cc b/source/geometry/solids/STEP/src/STEPentity.cc
index 530731253a..dcd88a25a1 100644
--- a/source/geometry/solids/STEP/src/STEPentity.cc
+++ b/source/geometry/solids/STEP/src/STEPentity.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPentity.cc,v 1.2 1999/05/21 20:20:50 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPentity.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 
@@ -129,7 +129,7 @@ STEPentity::AddP21Comment(SCLstring &s, int replace)
 }
 
 void 
-STEPentity::STEPwrite_reference (ostream& out)
+STEPentity::STEPwrite_reference (G4std::ostream& out)
 {  
   out << "#" << STEPfile_id; 
 }
@@ -288,13 +288,13 @@ void STEPentity::EnforceOptionality(int on)
 */
 /******************************************************************
  ** Procedure:  beginSTEPwrite
- ** Parameters:  ostream& out -- stream to write to
+ ** Parameters:  G4std::ostream& out -- stream to write to
  ** Returns:  
  ** Side Effects:  writes out the SCOPE section for an entity
  ** Status:  stub 
  ******************************************************************/
 
-void STEPentity::beginSTEPwrite(ostream& out)
+void STEPentity::beginSTEPwrite(G4std::ostream& out)
 {
     out << "begin STEPwrite ... \n" ;
     out.flush();
@@ -309,7 +309,7 @@ void STEPentity::beginSTEPwrite(ostream& out)
 
 /******************************************************************
  ** Procedure:  STEPwrite
- ** Parameters:  ostream& out -- stream to write to
+ ** Parameters:  G4std::ostream& out -- stream to write to
  ** Returns:  
  ** Side Effects:  writes out the data associated with an instance 
                    in STEP format
@@ -317,7 +317,7 @@ void STEPentity::beginSTEPwrite(ostream& out)
  **
  ******************************************************************/
 
-void STEPentity::STEPwrite(ostream& out, int writeComment)
+void STEPentity::STEPwrite(G4std::ostream& out, int writeComment)
 {
     SCLstring tmp;
     if(writeComment && p21Comment && !p21Comment->is_null() )
@@ -332,7 +332,7 @@ void STEPentity::STEPwrite(ostream& out, int writeComment)
     out << ");\n";
 }
 
-void STEPentity::endSTEPwrite(ostream& out)
+void STEPentity::endSTEPwrite(G4std::ostream& out)
 {
     out << "end STEPwrite ... \n" ;
     out.flush();
@@ -388,14 +388,14 @@ STEPentity::PrependEntityErrMsg()
  ** Procedure:  STEPentity::STEPread_error
  ** Parameters:  char c --  character which caused error
  **     int i --  index of attribute which caused error
- **     istream& in  --  input stream for recovery
+ **     G4std::istream& in  --  input stream for recovery
  ** Returns:  
  ** Description:  reports the error found, reads until it finds the end of an
  **     instance. i.e. a close quote followed by a semicolon optionally having
  **     whitespace between them.
  ******************************************************************/
 void
-STEPentity::STEPread_error(char c, int i, istream& in)
+STEPentity::STEPread_error(char c, int i, G4std::istream& in)
 {
     char errStr[BUFSIZ];
     errStr[0] = '\0';
@@ -453,7 +453,7 @@ STEPentity::STEPread_error(char c, int i, istream& in)
 	}
 	if(in.good() && (c == ')') )
 	{
-	    in >> ws; // skip whitespace
+	    in >> G4std::ws; // skip whitespace
 	    in.get(c);
 	    tmp.Append(c);
 //	    G4cerr << c;
@@ -486,13 +486,13 @@ STEPentity::STEPread_error(char c, int i, istream& in)
  ** Parameters:  int id
  **              int idIncrement
  **              InstMgr instances
- **              istream& in
+ **              G4std::istream& in
  ** Side Effects:  gobbles up input stream
  ** Status:
  ******************************************************************/
 
 Severity
-STEPentity::STEPread(int id,  int idIncr, InstMgr * instance_set, istream& in)
+STEPentity::STEPread(int id,  int idIncr, InstMgr * instance_set, G4std::istream& in)
 {
     STEPfile_id = id;
     char c ='\0';
@@ -503,7 +503,7 @@ STEPentity::STEPread(int id,  int idIncr, InstMgr * instance_set, istream& in)
     // L. Broglia
     // ClearError(1);
 
-    in >> ws;
+    in >> G4std::ws;
     in >> c; 
 
     // read the open paren
@@ -514,7 +514,7 @@ STEPentity::STEPread(int id,  int idIncr, InstMgr * instance_set, istream& in)
 		       "  Missing initial open paren... Trying to recover.\n");
 	in.putback(c); // assume you can recover by reading 1st attr value
     }
-    in >> ws;
+    in >> G4std::ws;
 
     int n = attributes.list_length();
     if( n == 0)  // no attributes
@@ -588,14 +588,14 @@ STEPentity::STEPread(int id,  int idIncr, InstMgr * instance_set, istream& in)
 ///////////////////////////////////////////////////////////////////////////////
 
 STEPentity *
-ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList, 
+ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId)
 {
     char c;
     char errStr[BUFSIZ];
     errStr[0] = '\0';
     
-    in >> ws;
+    in >> G4std::ws;
     in >> c;
     switch (c)
     {
@@ -692,7 +692,7 @@ STEPentity *
 ReadEntityRef(const char * s, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return ReadEntityRef(in, err, tokenList, instances, addFileId);
 }
 
@@ -924,7 +924,7 @@ STEPentity::AttributeCount ()  {
 #ifdef OBSOLETE
 Severity 
 STEPentity::ReadAttrs(int id, int addFileId, 
-		       class InstMgr * instance_set, istream& in)
+		       class InstMgr * instance_set, G4std::istream& in)
 {
     char c ='\0';
     char errStr[BUFSIZ];
@@ -987,7 +987,7 @@ STEPentity::ReadAttrs(int id, int addFileId,
 	}
 	else if(c == ')')
 	{
-	    in >> ws;
+	    in >> G4std::ws;
 	    char z = in.peek();
 	    if (z == ';')
 	    {
diff --git a/source/geometry/solids/STEP/src/STEPfile.cc b/source/geometry/solids/STEP/src/STEPfile.cc
index c4c2db94dc..b95d277662 100644
--- a/source/geometry/solids/STEP/src/STEPfile.cc
+++ b/source/geometry/solids/STEP/src/STEPfile.cc
@@ -1,7 +1,7 @@
 // This code is utilised in the GEANT4 detector simulation toolkit.
 //
-// $Id: STEPfile.cc,v 1.2 1999/05/21 20:20:51 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPfile.cc,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -36,7 +36,7 @@
 #include <s_HEADER_SCHEMA.h>
 
 // STEPundefined contains
-// void PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err)
+// void PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
 #include <STEPundefined.h> 
 
 /***************************
@@ -79,21 +79,21 @@ STEPfile::SetFileName (const char* newName)
 /***************************
 function:     ReadHeader
 returns:      Severity
-parameters:   (istream&) The input stream from which the file is read.
+parameters:   (G4std::istream&) The input stream from which the file is read.
 description:
    This function reads in the header section of an exchange file. It
    can read it in either version (N279) or (Part 21, July 1992). It
    parses the header section, popluates the _headerInstances, and
    returns an error descriptor.
    It expects to find the "HEADER;" symbol at the beginning of the
-   istream.
+   G4std::istream.
 side effects: The function  gobbles all characters up to and including the
    next "ENDSEC;" from in. 
    The STEPfile::_headerInstances may change.
 ***************************/
 
 Severity 
-STEPfile::ReadHeader (istream& in) 
+STEPfile::ReadHeader (G4std::istream& in) 
 {
     SCLstring cmtStr;
 
@@ -129,7 +129,7 @@ STEPfile::ReadHeader (istream& in)
 	}
 	  
 	//check for user defined instances
-	//if it is userDefined, the '!' does not get put back on the istream
+	//if it is userDefined, the '!' does not get put back on the G4std::istream
 	in.get(c);
 	if (c == '!') { userDefined = 1; }
 	else          { in.putback(c);   }
@@ -201,12 +201,12 @@ STEPfile::ReadHeader (istream& in)
 			break;			    
 		}
 
-		//read the values from the istream
+		//read the values from the G4std::istream
 		objsev = obj->STEPread(fileid,0,(InstMgr*)0,in);
 		if( !cmtStr.is_null() )
 		    obj->AddP21Comment(cmtStr);
 
-		in >> ws;
+		in >> G4std::ws;
 		c = in.peek(); // check for semicolon or keyword 'ENDSEC'
 		if(c != 'E')
 		    in >> c; // read the semicolon
@@ -594,7 +594,7 @@ STEPfile::EntityWfState(char c)
     //  starts at the data section
 
 int
-STEPfile::ReadData1(istream& in)
+STEPfile::ReadData1(G4std::istream& in)
 {
     int endsec = 0;
     _entsNotCreated = 0;
@@ -650,7 +650,7 @@ STEPfile::ReadData1(istream& in)
 		tmpbuf.set_null();
 		FindStartOfInstance(in,tmpbuf);
 	       G4cout << "ERROR: trying to recover from invalid data. skipping: "
-		     << tmpbuf.chars() << endl;
+		     << tmpbuf.chars() << G4endl;
 		in >> c;
 		ReadTokenSeparator(in);
 	    }
@@ -726,7 +726,7 @@ STEPfile::ReadData1(istream& in)
 #if bzpoibujqoiwejsdlfj
 
 int
-STEPfile::ReadData1(istream& in)
+STEPfile::ReadData1(G4std::istream& in)
 {
     int endsec = 0;
     _entsNotCreated = 0;
@@ -756,7 +756,7 @@ STEPfile::ReadData1(istream& in)
 	}
 	else
 	{
-	    G4cout << "Invalid editing state character: " << c << endl;
+	    G4cout << "Invalid editing state character: " << c << G4endl;
 	    G4cout << "Assigning editing state to be INCOMPLETE\n";
 	    inst_state = incompleteSE;
 	}
@@ -769,7 +769,7 @@ STEPfile::ReadData1(istream& in)
 	tmpbuf.set_null();
 	SkipInstance(in,tmpbuf);
 	G4cout << "ERROR: trying to recover from invalid data. skipping: "
-	     << tmpbuf.chars() << endl;
+	     << tmpbuf.chars() << G4endl;
 	ReadTokenSeparator(in);
     }
 
@@ -833,7 +833,7 @@ STEPfile::ReadData1(istream& in)
 	    }
 	    if( !endsec && (c != ENTITY_NAME_DELIM) )
 	    {
-		G4cout << "Invalid editing state character: " << c << endl;
+		G4cout << "Invalid editing state character: " << c << G4endl;
 		G4cout << "Assigning editing state to be INCOMPLETE\n";
 		ReadTokenSeparator(in);
 		in >> c;		// read the ENTITY_NAME_DELIM
@@ -850,7 +850,7 @@ STEPfile::ReadData1(istream& in)
 		tmpbuf.set_null();
 		SkipInstance(in,tmpbuf);
 	       G4cout << "ERROR: trying to recover from invalid data. skipping: "
-		     << tmpbuf.chars() << endl;
+		     << tmpbuf.chars() << G4endl;
 		ReadTokenSeparator(in);
 	    }
 	    if( c == ENTITY_NAME_DELIM )
@@ -882,7 +882,7 @@ STEPfile::ReadData1(istream& in)
 #endif
 
 int
-STEPfile::ReadWorkingData1 (istream& in)
+STEPfile::ReadWorkingData1 (G4std::istream& in)
 {
     return ReadData1(in);
 
@@ -940,7 +940,7 @@ STEPfile::ReadWorkingData1 (istream& in)
 	      return instance_count;
 	  }
 
-	  in >> ws;
+	  in >> G4std::ws;
 	  in >> c;
 	  if( c != ENTITY_NAME_DELIM)
 	  {
@@ -1028,13 +1028,13 @@ STEPfile::ReadWorkingData1 (istream& in)
 
 /******************************************************************
  ** Procedure:  ReadData2
- ** Parameters:  istream
+ ** Parameters:  G4std::istream
  ** Returns:  number of valid instances read
  ** Description:  reads in the data portion of the instances 
  **               in an exchange file
  ******************************************************************/
 int
-STEPfile::ReadData2 (istream& in)
+STEPfile::ReadData2 (G4std::istream& in)
 {
     _entsInvalid = 0;
     _entsIncomplete = 0;
@@ -1078,7 +1078,7 @@ STEPfile::ReadData2 (istream& in)
 	    // don't need this error msg for the 2nd pass (it was Done on 1st)
 	    else
 	    {
-		G4cout << "Invalid editing state character: " << c << endl;
+		G4cout << "Invalid editing state character: " << c << G4endl;
 		G4cout << "Assigning editing state to be INCOMPLETE\n";
 		inst_state = incompleteSE;
 	    }
@@ -1095,7 +1095,7 @@ STEPfile::ReadData2 (istream& in)
 		tmpbuf.set_null();
 		FindStartOfInstance(in,tmpbuf);
 	       G4cout << "ERROR: trying to recover from invalid data. skipping: "
-		     << tmpbuf.chars() << endl;
+		     << tmpbuf.chars() << G4endl;
 		in >> c;
 		ReadTokenSeparator( in, &cmtStr );
 	    }
@@ -1161,7 +1161,7 @@ STEPfile::ReadData2 (istream& in)
 		"Second pass complete - instance summary:", total_instances, 
 		_entsInvalid, _entsIncomplete, "Warnings", 
 		_entsWarning);
-	G4cout << buf << endl;
+	G4cout << buf << G4endl;
 	_error.AppendToUserMsg(buf);
 	_error.AppendToDetailMsg(buf);
 	_error.GreaterSeverity(SEVERITY_WARNING);
@@ -1176,7 +1176,7 @@ STEPfile::ReadData2 (istream& in)
 
 #if xpqosdblkxfnvkbybbbbb
 int
-STEPfile::ReadData2 (istream& in)
+STEPfile::ReadData2 (G4std::istream& in)
 {
     _entsInvalid = 0;
     _entsIncomplete = 0;
@@ -1210,7 +1210,7 @@ STEPfile::ReadData2 (istream& in)
 	}
 	else if( c != ENTITY_NAME_DELIM )
 	{
-	    G4cout << "Invalid editing state character: " << c << endl;
+	    G4cout << "Invalid editing state character: " << c << G4endl;
 	    G4cout << "Assigning editing state to be INCOMPLETE\n";
 	    ReadTokenSeparator( in, &cmtStr );
 	    in >> c;		// read the ENTITY_NAME_DELIM
@@ -1280,7 +1280,7 @@ STEPfile::ReadData2 (istream& in)
 	    }
 	    else if( c != ENTITY_NAME_DELIM )
 	    {
-		G4cout << "Invalid editing state character: " << c << endl;
+		G4cout << "Invalid editing state character: " << c << G4endl;
 		G4cout << "Assigning editing state to be INCOMPLETE\n";
 		ReadTokenSeparator( in, &cmtStr );
 		in >> c;		// read the ENTITY_NAME_DELIM
@@ -1292,7 +1292,7 @@ STEPfile::ReadData2 (istream& in)
 	    tmpbuf.set_null();
 	    SkipInstance(in,tmpbuf);
 	    G4cout << "ERROR: trying to recover from invalid data. skipping: "
-		 << tmpbuf.chars() << endl;
+		 << tmpbuf.chars() << G4endl;
 	    ReadTokenSeparator(in);
 	}
 
@@ -1305,7 +1305,7 @@ STEPfile::ReadData2 (istream& in)
 		"Reading File 2nd pass instance summary:", total_instances, 
 		_entsInvalid, _entsIncomplete, _entsWarning, 
 		"issued warnings");
-//	G4cout << buf << endl;
+//	G4cout << buf << G4endl;
 	_error.AppendToUserMsg(buf);
 	_error.AppendToDetailMsg(buf);
 	_error.GreaterSeverity(SEVERITY_WARNING);
@@ -1322,7 +1322,7 @@ STEPfile::ReadData2 (istream& in)
 #ifdef junk
 // old version 8/23/94
 int
-STEPfile::ReadData2 (istream& in)
+STEPfile::ReadData2 (G4std::istream& in)
 {
     _errorCount = 0;  // reset error count
     _warningCount = 0;  // reset error count
@@ -1369,7 +1369,7 @@ STEPfile::ReadData2 (istream& in)
 #endif
 
 int
-STEPfile::ReadWorkingData2 (istream& in)
+STEPfile::ReadWorkingData2 (G4std::istream& in)
 {
     return ReadData2 (in);
 #ifdef junk
@@ -1452,7 +1452,7 @@ STEPfile::ReadWorkingData2 (istream& in)
  */
 
 int
-STEPfile::FindDataSection (istream& in)  
+STEPfile::FindDataSection (G4std::istream& in)  
 {
     ErrorDescriptor errs;
     SdaiString tmp;
@@ -1483,7 +1483,7 @@ STEPfile::FindDataSection (istream& in)
 		    if (c == 'A')
 		    {
 			in.get(c);	// read 'A'
-			in >> ws; // may want to skip comments or Print control directives?
+			in >> G4std::ws; // may want to skip comments or Print control directives?
 			c = in.peek();	// look for semicolon
 			if (c == ';')
 			{
@@ -1516,7 +1516,7 @@ STEPfile::FindDataSection (istream& in)
 }
 
 int
-STEPfile::FindHeaderSection (istream& in)  
+STEPfile::FindHeaderSection (G4std::istream& in)  
 {
     char buf[BUFSIZ];
     char *b = buf;
@@ -1545,23 +1545,23 @@ STEPfile::FindHeaderSection (istream& in)
 /***************************
  description:
     This function creates an instance based on the KEYWORD
-    read from the istream.
+    read from the G4std::istream.
     It expects an ENTITY_NAME (int) from the first set of
-    characters on the istream. If the (int) is not found,
+    characters on the G4std::istream. If the (int) is not found,
     ENTITY_NULL is returned.
 
   side effects:
-    The function leaves the istream set to the end of the stream 
+    The function leaves the G4std::istream set to the end of the stream 
     of characters representing the ENTITY_INSTANCE. It attempts to
     recover on errors by reading up to and including the next ';'.
 
 an ENTITY_INSTANCE consists of:
    '#'(int)'=' [SCOPE] SIMPLE_RECORD ';' ||
    '#'(int)'=' [SCOPE] SUBSUPER_RECORD ';'
-The '#' is read from the istream before CreateInstance is called.
+The '#' is read from the G4std::istream before CreateInstance is called.
 ***************************/
 STEPentity *
-STEPfile::CreateInstance(istream& in, ostream &out) 
+STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out) 
 {
     SCLstring tmpbuf;
     char errbuf[BUFSIZ];
@@ -1582,7 +1582,7 @@ STEPfile::CreateInstance(istream& in, ostream &out)
     {
 	SkipInstance(in, tmpbuf);
 	out <<  "ERROR: instance #" << fileid 
-	    << " already exists.\n\tData lost: " << tmpbuf << endl;
+	    << " already exists.\n\tData lost: " << tmpbuf << G4endl;
 	return ENTITY_NULL;
     }
     
@@ -1593,12 +1593,12 @@ STEPfile::CreateInstance(istream& in, ostream &out)
 	// ERROR: '=' expected
 	SkipInstance(in, tmpbuf);
 	out << "ERROR: instance #" << fileid 
-	    << " \'=\' expected.\n\tData lost: " << tmpbuf << endl;
+	    << " \'=\' expected.\n\tData lost: " << tmpbuf << G4endl;
 	return ENTITY_NULL;
     }
 
     ReadTokenSeparator(in);
-    c = in.peek(); // peek at the next character on the istream
+    c = in.peek(); // peek at the next character on the G4std::istream
 
     //check for optional "&SCOPE" Construct
     if (c == '&')  // TODO check this out
@@ -1607,7 +1607,7 @@ STEPfile::CreateInstance(istream& in, ostream &out)
 	if (s < SEVERITY_WARNING) 
 	    {  return ENTITY_NULL;  }
 	ReadTokenSeparator(in);
-	c = in.peek(); // peek at next char on istream again
+	c = in.peek(); // peek at next char on G4std::istream again
     }
 
     //check for subtype/supertype record
@@ -1642,7 +1642,7 @@ STEPfile::CreateInstance(istream& in, ostream &out)
 	    out << "WARNING: instance #" << fileid 
 		<< " User Defined Entity in DATA section ignored.\n"
 		<< "\tData lost: \'!" << objnm.chars() << "\': " << tmpbuf 
-		<< endl;
+		<< G4endl;
 	    return ENTITY_NULL;
 	}
 	else 
@@ -1677,15 +1677,15 @@ STEPfile::CreateInstance(istream& in, ostream &out)
     instance to the instance manager.
  side-effects:
     It first searches for "&SCOPE" and reads all characters
-    from the istream up to and including "ENDSCOPE"
+    from the G4std::istream up to and including "ENDSCOPE"
  returns: ErrorDescriptor
-    >= SEVERITY_WARNING: the istream was read up to and including the
+    >= SEVERITY_WARNING: the G4std::istream was read up to and including the
                       "ENDSCOPE" and the export List /#1, ... #N/
-    <  SEVERITY_WARNING: the istream was read up to and including the next ";"
+    <  SEVERITY_WARNING: the G4std::istream was read up to and including the next ";"
     < SEVERITY_BUG: fatal
 **************************************************/
 Severity
-STEPfile::CreateScopeInstances(istream& in, STEPentityH ** scopelist)
+STEPfile::CreateScopeInstances(G4std::istream& in, STEPentityH ** scopelist)
 {
     Severity rval = SEVERITY_NULL;
     STEPentity * se;
@@ -1787,7 +1787,7 @@ STEPfile::CreateScopeInstances(istream& in, STEPentityH ** scopelist)
 }
 
 STEPentity *
-STEPfile::CreateSubSuperInstance(istream& in, int fileid)
+STEPfile::CreateSubSuperInstance(G4std::istream& in, int fileid)
 {
     SCLstring tmpstr;
     char errbuf[BUFSIZ];
@@ -1801,7 +1801,7 @@ STEPfile::CreateSubSuperInstance(istream& in, int fileid)
     SCLstring *entNmArr[enaSize]; // array of entity type names
     int enaIndex = 0;
 
-    in >> ws;
+    in >> G4std::ws;
     in.get(c); // read the open paren
     c = in.peek(); // see if you have closed paren (ending the record)
     while(in.good() && (c != ')') && (enaIndex < enaSize) )
@@ -1819,7 +1819,7 @@ STEPfile::CreateSubSuperInstance(istream& in, int fileid)
 	    buf.set_null();
 	    enaIndex++;
 	}
-	in >> ws;
+	in >> G4std::ws;
 	c = in.peek(); // see if you have closed paren (ending the record)
 	  // If someone separates the entities with commas (or some other 
 	  // garbage or a comment) this will keep the read function from 
@@ -1848,13 +1848,13 @@ STEPfile::CreateSubSuperInstance(istream& in, int fileid)
 /**************************************************
  description:
     This function reads the SCOPE List for an entity instance,
-    and reads the values for each instance from the istream.
+    and reads the values for each instance from the G4std::istream.
  side-effects:
     It first searches for "&SCOPE" and reads all characters
-    from the istream up to and including "ENDSCOPE"
+    from the G4std::istream up to and including "ENDSCOPE"
 **************************************************/
 Severity
-STEPfile::ReadScopeInstances (istream& in)
+STEPfile::ReadScopeInstances (G4std::istream& in)
 {
     Severity rval = SEVERITY_NULL;
     STEPentity * se;
@@ -1940,7 +1940,7 @@ STEPfile::ReadScopeInstances (istream& in)
 
 /*
 Severity
-STEPfile::ReadSubSuperInstance (istream& in)
+STEPfile::ReadSubSuperInstance (G4std::istream& in)
 {
   SCLstring tmp;
   SkipInstance(in, tmp);
@@ -1950,7 +1950,7 @@ STEPfile::ReadSubSuperInstance (istream& in)
     
 #ifdef junk
 void
-ReadEntityError(char c, int i, istream& in)
+ReadEntityError(char c, int i, G4std::istream& in)
 {
     char errStr[BUFSIZ];
     errStr[0] = '\0';
@@ -1999,7 +1999,7 @@ ReadEntityError(char c, int i, istream& in)
 	}
 	if(in.good() && (c == ')') )
 	{
-	    in >> ws; // skip whitespace
+	    in >> G4std::ws; // skip whitespace
 	    in.get(c);
 	    tmp.Append(c);
 //	    G4cerr << c;
@@ -2020,14 +2020,14 @@ ReadEntityError(char c, int i, istream& in)
 /*****************************************************
  description:
  This function populates a STEPentity with the values read from 
- the istream.
+ the G4std::istream.
 
  This function must keeps track of error messages encountered when
  reading the STEPentity. It passes STEPentity error information onto
  the STEPfile ErrorDescriptor.
 *****************************************************/
 STEPentity *
-STEPfile::ReadInstance(istream& in, ostream& out, SCLstring &cmtStr)
+STEPfile::ReadInstance(G4std::istream& in, G4std::ostream& out, SCLstring &cmtStr)
 {
     Severity sev = SEVERITY_NULL;
 
@@ -2052,7 +2052,7 @@ STEPfile::ReadInstance(istream& in, ostream& out, SCLstring &cmtStr)
     {
 	SkipInstance(in, tmpbuf);
 	out << "\nERROR: in 2nd pass, instance #" << fileid 
-	    << " not found.\n\tData lost: " << tmpbuf << endl;
+	    << " not found.\n\tData lost: " << tmpbuf << G4endl;
 	return ENTITY_NULL;
     }
     else if ((_fileType != WORKING_SESSION) && (node->CurrState() != newSE))
@@ -2060,7 +2060,7 @@ STEPfile::ReadInstance(istream& in, ostream& out, SCLstring &cmtStr)
 	SkipInstance(in, tmpbuf);
 	out << "\nERROR: in 2nd pass, instance #" << fileid 
 	    << " already exists - ignoring duplicate.\n\tData lost: " 
-	    << tmpbuf << endl;
+	    << tmpbuf << G4endl;
 	return ENTITY_NULL;
     }
 
@@ -2072,13 +2072,13 @@ STEPfile::ReadInstance(istream& in, ostream& out, SCLstring &cmtStr)
 	//ERROR: '=' expected
 	SkipInstance(in, tmpbuf);
 	out << "ERROR: instance #" << fileid 
-	    << " \'=\' expected.\n\tData lost: " << tmpbuf << endl;
+	    << " \'=\' expected.\n\tData lost: " << tmpbuf << G4endl;
 	return ENTITY_NULL;
     }
 
     ReadTokenSeparator(in, &cmtStr);
 
-    //peek at the next character on the istream
+    //peek at the next character on the G4std::istream
     c = in.peek();
 
     //check for optional "&SCOPE" Construct
@@ -2265,7 +2265,7 @@ STEPfile::MakeBackupFile()
 /***************************
 ***************************/
 Severity
-STEPfile::WriteExchangeFile(ostream& out, int validate) 
+STEPfile::WriteExchangeFile(G4std::ostream& out, int validate) 
 {
     Severity rval = SEVERITY_NULL;
     SetFileType(VERSION_CURRENT);
@@ -2307,7 +2307,7 @@ STEPfile::WriteExchangeFile(const char* filename, int validate)
 	  }
     }
     
-    ostream* out =  OpenOutputFile(filename);
+    G4std::ostream* out =  OpenOutputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) return _error.severity();
     rval = WriteExchangeFile(*out, 0);
     CloseOutputFile(out);
@@ -2389,7 +2389,7 @@ STEPfile::HeaderIdOld (const char* name)
 /***************************
 ***************************/
 void
-STEPfile::WriteHeader(ostream& out) 
+STEPfile::WriteHeader(G4std::ostream& out) 
 {
     out << "HEADER;\n";
 
@@ -2414,7 +2414,7 @@ STEPfile::WriteHeader(ostream& out)
 /***************************
 ***************************/
 void
-STEPfile::WriteHeaderInstance(STEPentity* obj, ostream& out)
+STEPfile::WriteHeaderInstance(STEPentity* obj, G4std::ostream& out)
 {
     SCLstring tmp;
     if(obj->P21CommentRep())
@@ -2432,7 +2432,7 @@ STEPfile::WriteHeaderInstance(STEPentity* obj, ostream& out)
 /***************************
 ***************************/
 void
-STEPfile::WriteHeaderInstanceFileName (ostream& out)
+STEPfile::WriteHeaderInstanceFileName (G4std::ostream& out)
 {
 // Get the FileName instance from _headerInstances
     STEPentity* se = _headerInstances->GetSTEPentity("File_Name");
@@ -2484,7 +2484,7 @@ STEPfile::WriteHeaderInstanceFileName (ostream& out)
 	  (STEPentity*)fn = _headerInstances->GetSTEPentity(mn);
       }
 
-// Write the values for the FileName instance to the ostream    
+// Write the values for the FileName instance to the G4std::ostream    
 	SCLstring tmp;
     out << StrToUpper (fn->EntityName()) << "(";
 
@@ -2536,7 +2536,7 @@ STEPfile::WriteHeaderInstanceFileName (ostream& out)
 
 
 void
-STEPfile::WriteHeaderInstanceFileDescription (ostream& out) 
+STEPfile::WriteHeaderInstanceFileDescription (G4std::ostream& out) 
 {
 // Get the FileDescription instance from _headerInstances
     STEPentity *se = _headerInstances->GetSTEPentity("File_Description");
@@ -2565,7 +2565,7 @@ STEPfile::WriteHeaderInstanceFileDescription (ostream& out)
       {
 	  (STEPentity*)fd = _headerInstances->GetSTEPentity(mn);
       }
-// Write the values for the FileDescription instance to the ostream    
+// Write the values for the FileDescription instance to the G4std::ostream    
     out << StrToUpper (fd->EntityName()) << "(";
 
     //write description
@@ -2582,7 +2582,7 @@ STEPfile::WriteHeaderInstanceFileDescription (ostream& out)
 }
 
 void
-STEPfile::WriteHeaderInstanceFileSchema (ostream& out) 
+STEPfile::WriteHeaderInstanceFileSchema (G4std::ostream& out) 
 {
 // Get the FileName instance from _headerInstances
     STEPentity *se = _headerInstances->GetSTEPentity("File_Schema");
@@ -2611,7 +2611,7 @@ STEPfile::WriteHeaderInstanceFileSchema (ostream& out)
       {
 	  (STEPentity*)fs = _headerInstances->GetSTEPentity(mn);
       }
-// Write the values for the FileName instance to the ostream    
+// Write the values for the FileName instance to the G4std::ostream    
     out << StrToUpper (fs->EntityName()) << "(";
 
     // write schema_identifiers
@@ -2626,7 +2626,7 @@ STEPfile::WriteHeaderInstanceFileSchema (ostream& out)
 ***************************/
 
 void
-STEPfile::WriteData(ostream& out)
+STEPfile::WriteData(G4std::ostream& out)
 {
     out << "DATA;\n";
 
@@ -2638,7 +2638,7 @@ STEPfile::WriteData(ostream& out)
 }    
 
 Severity 
-STEPfile::AppendFile (istream* in) 
+STEPfile::AppendFile (G4std::istream* in) 
 {
     Severity rval = SEVERITY_NULL;
     char errbuf[BUFSIZ];
@@ -2649,7 +2649,7 @@ STEPfile::AppendFile (istream* in)
     
     ReadTokenSeparator(*in);
     SCLstring keywd = GetKeyword(*in, "; #", _error);
-    // get the delimiter off the istream
+    // get the delimiter off the G4std::istream
     char c;
     in->get(c);
     
@@ -2702,7 +2702,7 @@ STEPfile::AppendFile (istream* in)
 		_errorCount, _warningCount);
 	G4cout << errbuf;
     }
-    else G4cout << endl;
+    else G4cout << G4endl;
     
     if (!FindDataSection (*in))
     {
@@ -2731,7 +2731,7 @@ STEPfile::AppendFile (istream* in)
 
     _errorCount = 0;  // reset the error count so you\'re not counting things twice
 //    delete in; // yikes -- deleted by caller
-    istream * in2;
+    G4std::istream * in2;
     if (! ((in2 = OpenInputFile ()) && (in2 -> good ())) )
       {  //  if the stream is not readable, there's an error
 	  _error.AppendToUserMsg ("Cannot open file for 2nd pass -- No data read.\n");
@@ -2793,7 +2793,7 @@ STEPfile::AppendFile (istream* in)
       {
 	  ReadTokenSeparator(*in2);
 	  keywd = GetKeyword (*in2,";", _error);
-	  //yank the ";" from the istream
+	  //yank the ";" from the G4std::istream
 	  //if (';' == in2->peek()) in2->get();
 	  char c; in2->get(c); if (c == ';') ;
       }
@@ -2816,7 +2816,7 @@ STEPfile::AppendFile (istream* in)
 /***************************
 ***************************/
 Severity
-STEPfile::WriteWorkingFile(ostream& out)
+STEPfile::WriteWorkingFile(G4std::ostream& out)
 {
     SetFileType (WORKING_SESSION);
     _error.ClearErrorMsg();
@@ -2843,7 +2843,7 @@ Severity
 STEPfile::WriteWorkingFile(const char* filename) 
 {
     _error.ClearErrorMsg();
-    ostream* out =  OpenOutputFile(filename);
+    G4std::ostream* out =  OpenOutputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) return _error.severity();
     Severity rval = WriteWorkingFile(*out);
     CloseOutputFile(out);
@@ -2855,7 +2855,7 @@ STEPfile::WriteWorkingFile(const char* filename)
 /***************************
 ***************************/
 void
-STEPfile::WriteWorkingData(ostream& out) 
+STEPfile::WriteWorkingData(G4std::ostream& out) 
 {
     out << "DATA;\n";
 //    STEPentity* se;
diff --git a/source/geometry/solids/STEP/src/STEPfile_inline.cc b/source/geometry/solids/STEP/src/STEPfile_inline.cc
index 0b950080a4..31d282fc05 100644
--- a/source/geometry/solids/STEP/src/STEPfile_inline.cc
+++ b/source/geometry/solids/STEP/src/STEPfile_inline.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPfile_inline.cc,v 1.2 1999/05/21 20:20:51 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPfile_inline.cc,v 1.4 1999/12/15 18:20:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -129,7 +129,7 @@ STEPfile::SetFileType(FileTypeCode ft)
 const char*
 STEPfile::TruncFileName(const char* filename) const
 {
-    char* tmp = strrchr(filename,'/');
+    const char* tmp = strrchr(filename,'/');
     if (tmp) return tmp++;
     else return filename;
     
@@ -142,7 +142,7 @@ STEPfile::ReadExchangeFile(const char* filename)
 {
     _error.ClearErrorMsg();
     _errorCount = 0;
-    istream* in = OpenInputFile(filename);
+    G4std::istream* in = OpenInputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) 
       {	  
 	CloseInputFile(in);
@@ -163,7 +163,7 @@ STEPfile::AppendExchangeFile (const char* filename)
 {
     _error.ClearErrorMsg();
     _errorCount = 0;
-    istream* in = OpenInputFile(filename);
+    G4std::istream* in = OpenInputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) 
       {	      
 	CloseInputFile(in);
@@ -180,7 +180,7 @@ STEPfile::ReadWorkingFile(const char* filename)
 {
     _error.ClearErrorMsg();
     _errorCount = 0;
-    istream* in = OpenInputFile(filename);
+    G4std::istream* in = OpenInputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) 
       {	  
 	CloseInputFile(in);
@@ -203,7 +203,7 @@ STEPfile::AppendWorkingFile(const char* filename)
 {
     _error.ClearErrorMsg();
     _errorCount = 0;
-    istream* in = OpenInputFile(filename);
+    G4std::istream* in = OpenInputFile(filename);
     if (_error.severity() < SEVERITY_WARNING) 
       {	      
 	CloseInputFile(in);
@@ -219,7 +219,7 @@ STEPfile::AppendWorkingFile(const char* filename)
 
 
 /******************************************************/
-istream*
+G4std::istream*
 STEPfile::OpenInputFile (const char* filename)
 {
     //  if there's no filename to use, fail
@@ -239,10 +239,10 @@ STEPfile::OpenInputFile (const char* filename)
 	      return (0);
 	  }
     }
-    //  istream* in = new istream(FileName(), io_readonly, a_useonly);
+    //  G4std::istream* in = new G4std::istream(FileName(), io_readonly, a_useonly);
     // port 29-Mar-1994 kcm
-    istream* in = new ifstream(FileName());
-    // default for ostream is readonly and protections are set to 644 
+    G4std::istream* in = new G4std::ifstream(FileName());
+    // default for G4std::ostream is readonly and protections are set to 644 
 //    if ( !in || !(in -> readable ()) )
     if ( !in || !(in -> good ()) )
       {
@@ -257,7 +257,7 @@ STEPfile::OpenInputFile (const char* filename)
 
 /******************************************************/
 void
-STEPfile::CloseInputFile(istream* in)
+STEPfile::CloseInputFile(G4std::istream* in)
 {
     delete in;
 }
@@ -267,7 +267,7 @@ STEPfile::CloseInputFile(istream* in)
 
 /*
 void
-STEPfile::ReadWhiteSpace (istream& in)
+STEPfile::ReadWhiteSpace (G4std::istream& in)
 {
 
   char c = ' ';
@@ -280,7 +280,7 @@ STEPfile::ReadWhiteSpace (istream& in)
 
 /***************************
 ***************************/
-ofstream*
+G4std::ofstream*
 STEPfile::OpenOutputFile(const char* filename)
 {
     if (!filename) 
@@ -304,10 +304,10 @@ STEPfile::OpenOutputFile(const char* filename)
 
     if (_currentDir->FileExists(TruncFileName(FileName())))
 	MakeBackupFile();
-//    ostream* out  = new ostream(FileName(), io_writeonly, a_create);  
+//    G4std::ostream* out  = new G4std::ostream(FileName(), io_writeonly, a_create);  
     // - port 29-Mar-1994 kcm
-    ofstream* out  = new ofstream(FileName());  
-    // default for ostream is writeonly and protections are set to 644 
+    G4std::ofstream* out  = new G4std::ofstream(FileName());  
+    // default for G4std::ostream is writeonly and protections are set to 644 
     if (!out) 
       {
 	  _error.AppendToUserMsg("unable to open file for output\n");
@@ -317,7 +317,7 @@ STEPfile::OpenOutputFile(const char* filename)
 }
 
 void
-STEPfile::CloseOutputFile(ostream* out) 
+STEPfile::CloseOutputFile(G4std::ostream* out) 
 {
     delete out;
 }
diff --git a/source/geometry/solids/STEP/src/STEPselect.cc b/source/geometry/solids/STEP/src/STEPselect.cc
index db09e487bd..83e7d41529 100644
--- a/source/geometry/solids/STEP/src/STEPselect.cc
+++ b/source/geometry/solids/STEP/src/STEPselect.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPselect.cc,v 1.3 1999/11/17 08:34:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPselect.cc,v 1.4 1999/12/15 14:50:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -25,11 +25,7 @@
 #include <STEPselect.h>
 #include <stdio.h> // to get the BUFSIZ #define
 #include <ExpDict.h>
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 #include <STEPentity.h>
 
 /**********
@@ -155,7 +151,7 @@ SdaiSelect::SelectValidLevel(const char *attrValue, ErrorDescriptor *err,
 //    s = tmp -> StrToVal 
 //      (attrValue, CurrentUnderlyingType () -> Name (), err, im);
 //  else
-  istrstream paska((char *)attrValue);
+  G4std::istrstream paska((char *)attrValue);
   s = tmp -> STEPread (paska, err, im);
   delete tmp;
   return s;
@@ -212,7 +208,7 @@ SdaiSelect::StrToVal(const char *Val, const char *selectType,
 	  case INTEGER_TYPE:
 	  default:
 	  {
-	    istrstream paska((char *)Val);
+	    G4std::istrstream paska((char *)Val);
 	      err->GreaterSeverity( STEPread_content( paska ) );
 	      if(_error.severity() != SEVERITY_NULL)
 		  err->AppendFromErrorArg(&_error);
@@ -223,7 +219,7 @@ SdaiSelect::StrToVal(const char *Val, const char *selectType,
 }
 
 Severity
-SdaiSelect::STEPread  (istream& in, ErrorDescriptor *err, InstMgr * instances, 
+SdaiSelect::STEPread  (G4std::istream& in, ErrorDescriptor *err, InstMgr * instances, 
 		       int addFileId)
 {
     char c ='\0';
@@ -232,7 +228,7 @@ SdaiSelect::STEPread  (istream& in, ErrorDescriptor *err, InstMgr * instances,
     // find out what case we have
     //  NOTE case C falls out of recursive calls in cases A and B
 
-    in >> ws;
+    in >> G4std::ws;
     in >> c;
 //    c = in.peek();
     if( isalpha(c) ) //  case B 
@@ -251,12 +247,12 @@ SdaiSelect::STEPread  (istream& in, ErrorDescriptor *err, InstMgr * instances,
 
 	if( SetUnderlyingType( CanBe( tmp.chars() ) ) )
 	{  //  assign the value to the underlying type
-	    in >> ws; // skip white space
+	    in >> G4std::ws; // skip white space
 	    STEPread_content (in, instances, addFileId);
 //  STEPread_content uses the ErrorDesc data member from the STEPselect class
 	    err->AppendToDetailMsg (Error ());
 	    err->GreaterSeverity( severity () );
-	    in >> ws >> c;  
+	    in >> G4std::ws >> c;  
 	    if( c != ')' )
 	    {
 		err->AppendToDetailMsg( 
@@ -414,7 +410,7 @@ SdaiSelect::STEPread  (istream& in, ErrorDescriptor *err, InstMgr * instances,
 
 
 void
-SdaiSelect::STEPwrite(ostream& out)  const
+SdaiSelect::STEPwrite(G4std::ostream& out)  const
 {
     if (!exists ()) {  
 	out << "$";
@@ -434,9 +430,9 @@ SdaiSelect::STEPwrite(ostream& out)  const
 const char *
 SdaiSelect::STEPwrite(SCLstring& s)  const
 {
-  strstream buf;
+  G4std::strstream buf;
   STEPwrite (buf);
-  buf << ends;  // have to add the terminating \0 char
+  buf << G4std::ends;  // have to add the terminating \0 char
   char * tmp;
   tmp = buf.str ();
   s = tmp;
@@ -455,10 +451,10 @@ SdaiSelect::STEPwrite(SCLstring& s)  const
 char* 
 SdaiSelect::asStr()  const
 {
-  strstream buf;
+  G4std::strstream buf;
   STEPwrite (buf);
 /*  STEPwrite_content (buf);*/
-  buf << ends;  // have to add the terminating \0 char
+  buf << G4std::ends;  // have to add the terminating \0 char
   return buf.str ();  // need to delete this space
 }
 #endif
diff --git a/source/geometry/solids/STEP/src/STEPstring.cc b/source/geometry/solids/STEP/src/STEPstring.cc
index 5bbafb4220..f00ec0f1d9 100644
--- a/source/geometry/solids/STEP/src/STEPstring.cc
+++ b/source/geometry/solids/STEP/src/STEPstring.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPstring.cc,v 1.2 1999/05/21 20:20:52 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPstring.cc,v 1.3 1999/12/15 14:50:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -22,14 +22,10 @@
 /*  */
 
 #include <STEPstring.h>
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 void 
-SdaiString::STEPwrite (ostream& out) const
+SdaiString::STEPwrite (G4std::ostream& out) const
 {
     const char *str = 0;
 // strings that exist but do not contain any chars should be written as '',
@@ -89,17 +85,17 @@ SdaiString::StrToVal (const char * s)
 //  STEPread reads a string in exchange file format
 //  starting with a single quote
 Severity 
-SdaiString::STEPread (istream& in, ErrorDescriptor *err)
+SdaiString::STEPread (G4std::istream& in, ErrorDescriptor *err)
 {
     int foundEndQuote = 0; // need so this string is not ok: 'hi''
     set_null ();  // clear the old string
     char c;
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
     in >> c;
 
 	// remember the current format state to restore the previous settings
     long int flags = in.flags();
-    in.unsetf(ios::skipws);
+    in.unsetf(G4std::ios::skipws);
 
     if (c == STRING_DELIM)
     {
@@ -146,6 +142,6 @@ SdaiString::STEPread (istream& in, ErrorDescriptor *err)
 Severity 
 SdaiString::STEPread (const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return STEPread (in, err);
 }
diff --git a/source/geometry/solids/STEP/src/STEPundefined.cc b/source/geometry/solids/STEP/src/STEPundefined.cc
index 33ad8bba97..01c4f8a8e5 100644
--- a/source/geometry/solids/STEP/src/STEPundefined.cc
+++ b/source/geometry/solids/STEP/src/STEPundefined.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPundefined.cc,v 1.2 1999/05/21 20:20:53 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPundefined.cc,v 1.3 1999/12/15 14:50:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -40,7 +40,7 @@ SCLundefined::StrToVal(const char *s, ErrorDescriptor *err)
 }
 
 Severity 
-SCLundefined::StrToVal(istream &in, ErrorDescriptor *err)
+SCLundefined::StrToVal(G4std::istream &in, ErrorDescriptor *err)
 {
     return STEPread(in, err);
 }
@@ -48,20 +48,20 @@ SCLundefined::StrToVal(istream &in, ErrorDescriptor *err)
 Severity 
 SCLundefined::STEPread(const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *) s);
+    G4std::istrstream in((char *) s);
     return STEPread(in, err);
 }
 
 Severity 
-SCLundefined::STEPread(istream &in, ErrorDescriptor *err)
+SCLundefined::STEPread(G4std::istream &in, ErrorDescriptor *err)
 {
     char c = '\0';
-    strstream ss;
+    G4std::strstream ss;
     SCLstring str;
 
     int terminal = 0;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
     in >> c;
     if(c == '$')
     {
@@ -118,7 +118,7 @@ SCLundefined::STEPread(istream &in, ErrorDescriptor *err)
 //	  if (!in.readable ()) terminal =1;
     }	  
 
-    ss << ends;
+    ss << G4std::ends;
     val = ss.str();
 
     err->GreaterSeverity(SEVERITY_NULL);
@@ -145,7 +145,7 @@ SCLundefined::STEPwrite(SCLstring &s)
 }
 
 void 
-SCLundefined::	STEPwrite (ostream& out)
+SCLundefined::	STEPwrite (G4std::ostream& out)
 {
     if(val.rep())
 	out << val.chars();
@@ -196,7 +196,7 @@ SCLundefined::is_null ()
 
 /*
 int
-SCLundefined::STEPread(istream& in )  
+SCLundefined::STEPread(G4std::istream& in )  
 {
     char c ='\0';
     char buf [BUFSIZ];
diff --git a/source/geometry/solids/STEP/src/SdaiBinary.cc b/source/geometry/solids/STEP/src/SdaiBinary.cc
index 5d004c2948..ac0b2a95f6 100644
--- a/source/geometry/solids/STEP/src/SdaiBinary.cc
+++ b/source/geometry/solids/STEP/src/SdaiBinary.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiBinary.cc,v 1.2 1999/05/21 20:20:53 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiBinary.cc,v 1.3 1999/12/15 14:50:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -24,12 +24,12 @@
 #include <SdaiBinary.h>
 
 extern Severity 
-CheckRemainingInput(istream &in, ErrorDescriptor *err, 
+CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err, 
 		    const char *typeName, // used in error message
 		    const char *tokenList); // e.g. ",)"
 
 void 
-SdaiBinary::STEPwrite (ostream& out) const
+SdaiBinary::STEPwrite (G4std::ostream& out) const
 {
     const char *str = 0;
     if (is_null ())
@@ -71,7 +71,7 @@ SdaiBinary::STEPwrite (SCLstring &s) const
 }
 
 Severity 
-SdaiBinary::ReadBinary(istream& in, ErrorDescriptor *err, int AssignVal,
+SdaiBinary::ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
 		       int needDelims)
 {
     if(AssignVal)
@@ -84,7 +84,7 @@ SdaiBinary::ReadBinary(istream& in, ErrorDescriptor *err, int AssignVal,
 
     int validDelimiters = 1;
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
 
     if( in.good() )
     {
@@ -165,7 +165,7 @@ SdaiBinary::ReadBinary(istream& in, ErrorDescriptor *err, int AssignVal,
 Severity
 SdaiBinary::StrToVal (const char * s, ErrorDescriptor *err)
 {
-    istrstream in ((char *)s); // sz defaults to length of s
+    G4std::istrstream in ((char *)s); // sz defaults to length of s
     return ReadBinary(in, err, 1, 0);
 }
 
@@ -256,19 +256,19 @@ SdaiBinary::StrToVal (const char * s, ErrorDescriptor *err)
 //  delimited by double quotes
 
 Severity 
-SdaiBinary::STEPread (istream& in, ErrorDescriptor *err)
+SdaiBinary::STEPread (G4std::istream& in, ErrorDescriptor *err)
 {
     return ReadBinary(in, err, 1, 1);
 /*
     int foundEndQuote = 0; // need so this string is not ok: 'hi''
     set_null ();  // clear the old string
     char c;
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
     in >> c;
 
 	// remember the current format state to restore the previous settings
     long int flags = in.flags();
-    in.unsetf(ios::skipws);
+    in.unsetf(G4std::ios::skipws);
 
     if (c == BINARY_DELIM)
     {
@@ -299,7 +299,7 @@ SdaiBinary::STEPread (istream& in, ErrorDescriptor *err)
 Severity 
 SdaiBinary::STEPread (const char *s, ErrorDescriptor *err)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return STEPread (in, err);
 }
 
@@ -324,14 +324,14 @@ SdaiBinary::STEPread (const char *s, ErrorDescriptor *err)
 ///////////////////////////////////////////////////////////////////////////////
 
 Severity 
-SdaiBinary::BinaryValidLevel (istream &in, ErrorDescriptor *err,
+SdaiBinary::BinaryValidLevel (G4std::istream &in, ErrorDescriptor *err,
 				int optional, char *tokenList, 
 				int needDelims, int clearError)
 {
     if(clearError)
 	err->ClearErrorMsg();
 
-    in >> ws; // skip white space
+    in >> G4std::ws; // skip white space
     char c = in.peek();
     if(c == '$' || in.eof())
     {
@@ -366,7 +366,7 @@ SdaiBinary::BinaryValidLevel (const char *value, ErrorDescriptor *err,
 				int optional, char *tokenList, 
 				int needDelims, int clearError)
 {
-    istrstream in((char *)value);
+    G4std::istrstream in((char *)value);
     return BinaryValidLevel (in, err, optional, tokenList, 
 			     needDelims, clearError);
 }
diff --git a/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc b/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc
index 5859908d31..0d1123cad6 100644
--- a/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc
+++ b/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiCONFIG_CONTROL_DESIGN.cc,v 1.2 1999/05/21 20:20:57 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiCONFIG_CONTROL_DESIGN.cc,v 1.3 1999/12/15 14:50:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SDAICONFIG_CONTROL_DESIGN_CC
 #define  SDAICONFIG_CONTROL_DESIGN_CC
@@ -457,7 +457,7 @@ SdaiCharacterized_product_definition::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -471,7 +471,7 @@ SdaiCharacterized_product_definition::NewSelect ()
 // STEP Part 21
 
 void
-SdaiCharacterized_product_definition::STEPwrite_content (ostream& out) const
+SdaiCharacterized_product_definition::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition)
 	_stepentityh -> STEPwrite_reference (out);
@@ -485,7 +485,7 @@ SdaiCharacterized_product_definition::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiCharacterized_product_definition::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiCharacterized_product_definition::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition)   {
@@ -520,7 +520,7 @@ SdaiCharacterized_product_definition::STEPread_content (istream& in, InstMgr * i
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -536,7 +536,7 @@ SdaiCharacterized_product_definition::StrToVal_content (const char * str, InstMg
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -895,7 +895,7 @@ SdaiShape_definition::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -909,7 +909,7 @@ SdaiShape_definition::NewSelect ()
 // STEP Part 21
 
 void
-SdaiShape_definition::STEPwrite_content (ostream& out) const
+SdaiShape_definition::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_shape)
 	_stepentityh -> STEPwrite_reference (out);
@@ -925,7 +925,7 @@ SdaiShape_definition::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiShape_definition::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiShape_definition::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_shape)   {
@@ -974,7 +974,7 @@ SdaiShape_definition::STEPread_content (istream& in, InstMgr * instances, int ad
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -990,7 +990,7 @@ SdaiShape_definition::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -1397,7 +1397,7 @@ SdaiCharacterized_definition::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -1411,7 +1411,7 @@ SdaiCharacterized_definition::NewSelect ()
 // STEP Part 21
 
 void
-SdaiCharacterized_definition::STEPwrite_content (ostream& out) const
+SdaiCharacterized_definition::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designt_characterized_product_definition)
 	_sdaicharacterized_product_definition.STEPwrite (out);
@@ -1425,7 +1425,7 @@ SdaiCharacterized_definition::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiCharacterized_definition::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiCharacterized_definition::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designt_characterized_product_definition)   {
@@ -1440,7 +1440,7 @@ SdaiCharacterized_definition::STEPread_content (istream& in, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -1456,7 +1456,7 @@ SdaiCharacterized_definition::StrToVal_content (const char * str, InstMgr * inst
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -1604,7 +1604,7 @@ SdaiChange_request_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -1618,7 +1618,7 @@ SdaiChange_request_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiChange_request_item::STEPwrite_content (ostream& out) const
+SdaiChange_request_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -1630,7 +1630,7 @@ SdaiChange_request_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiChange_request_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiChange_request_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -1651,7 +1651,7 @@ SdaiChange_request_item::STEPread_content (istream& in, InstMgr * instances, int
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -1667,7 +1667,7 @@ SdaiChange_request_item::StrToVal_content (const char * str, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -1882,7 +1882,7 @@ SdaiReversible_topology_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -1896,7 +1896,7 @@ SdaiReversible_topology_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiReversible_topology_item::STEPwrite_content (ostream& out) const
+SdaiReversible_topology_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_edge)
 	_stepentityh -> STEPwrite_reference (out);
@@ -1918,7 +1918,7 @@ SdaiReversible_topology_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiReversible_topology_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiReversible_topology_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_edge)   {
@@ -2009,7 +2009,7 @@ SdaiReversible_topology_item::STEPread_content (istream& in, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -2025,7 +2025,7 @@ SdaiReversible_topology_item::StrToVal_content (const char * str, InstMgr * inst
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -2589,7 +2589,7 @@ SdaiAxis2_placement::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -2603,7 +2603,7 @@ SdaiAxis2_placement::NewSelect ()
 // STEP Part 21
 
 void
-SdaiAxis2_placement::STEPwrite_content (ostream& out) const
+SdaiAxis2_placement::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_axis2_placement_2d)
 	_stepentityh -> STEPwrite_reference (out);
@@ -2617,7 +2617,7 @@ SdaiAxis2_placement::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiAxis2_placement::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiAxis2_placement::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_axis2_placement_2d)   {
@@ -2652,7 +2652,7 @@ SdaiAxis2_placement::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -2668,7 +2668,7 @@ SdaiAxis2_placement::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -2948,7 +2948,7 @@ SdaiSpecified_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -2962,7 +2962,7 @@ SdaiSpecified_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiSpecified_item::STEPwrite_content (ostream& out) const
+SdaiSpecified_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition)
 	_stepentityh -> STEPwrite_reference (out);
@@ -2976,7 +2976,7 @@ SdaiSpecified_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiSpecified_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiSpecified_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition)   {
@@ -3011,7 +3011,7 @@ SdaiSpecified_item::STEPread_content (istream& in, InstMgr * instances, int addF
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -3027,7 +3027,7 @@ SdaiSpecified_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -3360,7 +3360,7 @@ SdaiMeasure_value::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -3374,7 +3374,7 @@ SdaiMeasure_value::NewSelect ()
 // STEP Part 21
 
 void
-SdaiMeasure_value::STEPwrite_content (ostream& out) const
+SdaiMeasure_value::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designt_area_measure)
 	out <<  _sdaireal;
@@ -3408,7 +3408,7 @@ SdaiMeasure_value::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiMeasure_value::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiMeasure_value::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designt_area_measure)   {
@@ -3474,7 +3474,7 @@ SdaiMeasure_value::STEPread_content (istream& in, InstMgr * instances, int addFi
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -3492,7 +3492,7 @@ SdaiMeasure_value::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -3798,7 +3798,7 @@ SdaiPerson_organization_select::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -3812,7 +3812,7 @@ SdaiPerson_organization_select::NewSelect ()
 // STEP Part 21
 
 void
-SdaiPerson_organization_select::STEPwrite_content (ostream& out) const
+SdaiPerson_organization_select::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_person_and_organization)
 	_stepentityh -> STEPwrite_reference (out);
@@ -3824,7 +3824,7 @@ SdaiPerson_organization_select::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiPerson_organization_select::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiPerson_organization_select::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_person_and_organization)   {
@@ -3845,7 +3845,7 @@ SdaiPerson_organization_select::STEPread_content (istream& in, InstMgr * instanc
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -3861,7 +3861,7 @@ SdaiPerson_organization_select::StrToVal_content (const char * str, InstMgr * in
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -4025,7 +4025,7 @@ SdaiPcurve_or_surface::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -4039,7 +4039,7 @@ SdaiPcurve_or_surface::NewSelect ()
 // STEP Part 21
 
 void
-SdaiPcurve_or_surface::STEPwrite_content (ostream& out) const
+SdaiPcurve_or_surface::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_pcurve)
 	_stepentityh -> STEPwrite_reference (out);
@@ -4053,7 +4053,7 @@ SdaiPcurve_or_surface::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiPcurve_or_surface::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiPcurve_or_surface::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_pcurve)   {
@@ -4088,7 +4088,7 @@ SdaiPcurve_or_surface::STEPread_content (istream& in, InstMgr * instances, int a
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -4104,7 +4104,7 @@ SdaiPcurve_or_surface::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -4341,7 +4341,7 @@ SdaiClassified_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -4355,7 +4355,7 @@ SdaiClassified_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiClassified_item::STEPwrite_content (ostream& out) const
+SdaiClassified_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -4369,7 +4369,7 @@ SdaiClassified_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiClassified_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiClassified_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -4404,7 +4404,7 @@ SdaiClassified_item::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -4420,7 +4420,7 @@ SdaiClassified_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -4773,7 +4773,7 @@ SdaiVector_or_direction::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -4787,7 +4787,7 @@ SdaiVector_or_direction::NewSelect ()
 // STEP Part 21
 
 void
-SdaiVector_or_direction::STEPwrite_content (ostream& out) const
+SdaiVector_or_direction::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_vector)
 	_stepentityh -> STEPwrite_reference (out);
@@ -4801,7 +4801,7 @@ SdaiVector_or_direction::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiVector_or_direction::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiVector_or_direction::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_vector)   {
@@ -4836,7 +4836,7 @@ SdaiVector_or_direction::STEPread_content (istream& in, InstMgr * instances, int
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -4852,7 +4852,7 @@ SdaiVector_or_direction::StrToVal_content (const char * str, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -5116,7 +5116,7 @@ SdaiWireframe_model::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -5130,7 +5130,7 @@ SdaiWireframe_model::NewSelect ()
 // STEP Part 21
 
 void
-SdaiWireframe_model::STEPwrite_content (ostream& out) const
+SdaiWireframe_model::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_shell_based_wireframe_model)
 	_stepentityh -> STEPwrite_reference (out);
@@ -5144,7 +5144,7 @@ SdaiWireframe_model::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiWireframe_model::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiWireframe_model::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_shell_based_wireframe_model)   {
@@ -5179,7 +5179,7 @@ SdaiWireframe_model::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -5195,7 +5195,7 @@ SdaiWireframe_model::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -5438,7 +5438,7 @@ SdaiGeometric_set_select::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -5452,7 +5452,7 @@ SdaiGeometric_set_select::NewSelect ()
 // STEP Part 21
 
 void
-SdaiGeometric_set_select::STEPwrite_content (ostream& out) const
+SdaiGeometric_set_select::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_point)
 	_stepentityh -> STEPwrite_reference (out);
@@ -5468,7 +5468,7 @@ SdaiGeometric_set_select::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiGeometric_set_select::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiGeometric_set_select::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_point)   {
@@ -5517,7 +5517,7 @@ SdaiGeometric_set_select::STEPread_content (istream& in, InstMgr * instances, in
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -5533,7 +5533,7 @@ SdaiGeometric_set_select::StrToVal_content (const char * str, InstMgr * instance
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -5756,7 +5756,7 @@ SdaiStart_request_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -5770,7 +5770,7 @@ SdaiStart_request_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiStart_request_item::STEPwrite_content (ostream& out) const
+SdaiStart_request_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -5782,7 +5782,7 @@ SdaiStart_request_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiStart_request_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiStart_request_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -5803,7 +5803,7 @@ SdaiStart_request_item::STEPread_content (istream& in, InstMgr * instances, int
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -5819,7 +5819,7 @@ SdaiStart_request_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -6058,7 +6058,7 @@ SdaiPerson_organization_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -6072,7 +6072,7 @@ SdaiPerson_organization_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiPerson_organization_item::STEPwrite_content (ostream& out) const
+SdaiPerson_organization_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_change)
 	_stepentityh -> STEPwrite_reference (out);
@@ -6102,7 +6102,7 @@ SdaiPerson_organization_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiPerson_organization_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiPerson_organization_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_change)   {
@@ -6249,7 +6249,7 @@ SdaiPerson_organization_item::STEPread_content (istream& in, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -6265,7 +6265,7 @@ SdaiPerson_organization_item::StrToVal_content (const char * str, InstMgr * inst
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -7231,7 +7231,7 @@ SdaiDate_time_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -7245,7 +7245,7 @@ SdaiDate_time_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiDate_time_item::STEPwrite_content (ostream& out) const
+SdaiDate_time_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition)
 	_stepentityh -> STEPwrite_reference (out);
@@ -7273,7 +7273,7 @@ SdaiDate_time_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiDate_time_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiDate_time_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition)   {
@@ -7406,7 +7406,7 @@ SdaiDate_time_item::STEPread_content (istream& in, InstMgr * instances, int addF
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -7422,7 +7422,7 @@ SdaiDate_time_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -8286,7 +8286,7 @@ SdaiShell::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -8300,7 +8300,7 @@ SdaiShell::NewSelect ()
 // STEP Part 21
 
 void
-SdaiShell::STEPwrite_content (ostream& out) const
+SdaiShell::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_open_shell)
 	_stepentityh -> STEPwrite_reference (out);
@@ -8318,7 +8318,7 @@ SdaiShell::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiShell::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiShell::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_open_shell)   {
@@ -8381,7 +8381,7 @@ SdaiShell::STEPread_content (istream& in, InstMgr * instances, int addFileId)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -8397,7 +8397,7 @@ SdaiShell::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -8761,7 +8761,7 @@ SdaiTransformation::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -8775,7 +8775,7 @@ SdaiTransformation::NewSelect ()
 // STEP Part 21
 
 void
-SdaiTransformation::STEPwrite_content (ostream& out) const
+SdaiTransformation::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_item_defined_transformation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -8789,7 +8789,7 @@ SdaiTransformation::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiTransformation::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiTransformation::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_item_defined_transformation)   {
@@ -8824,7 +8824,7 @@ SdaiTransformation::STEPread_content (istream& in, InstMgr * instances, int addF
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -8840,7 +8840,7 @@ SdaiTransformation::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -9106,7 +9106,7 @@ SdaiBoolean_operand::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -9120,7 +9120,7 @@ SdaiBoolean_operand::NewSelect ()
 // STEP Part 21
 
 void
-SdaiBoolean_operand::STEPwrite_content (ostream& out) const
+SdaiBoolean_operand::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_solid_model)
 	_stepentityh -> STEPwrite_reference (out);
@@ -9132,7 +9132,7 @@ SdaiBoolean_operand::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiBoolean_operand::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiBoolean_operand::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_solid_model)   {
@@ -9153,7 +9153,7 @@ SdaiBoolean_operand::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -9169,7 +9169,7 @@ SdaiBoolean_operand::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -9300,7 +9300,7 @@ SdaiCertified_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -9314,7 +9314,7 @@ SdaiCertified_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiCertified_item::STEPwrite_content (ostream& out) const
+SdaiCertified_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_supplied_part_relationship)
 	_stepentityh -> STEPwrite_reference (out);
@@ -9326,7 +9326,7 @@ SdaiCertified_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiCertified_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiCertified_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_supplied_part_relationship)   {
@@ -9347,7 +9347,7 @@ SdaiCertified_item::STEPread_content (istream& in, InstMgr * instances, int addF
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -9363,7 +9363,7 @@ SdaiCertified_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -9602,7 +9602,7 @@ SdaiDate_time_select::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -9616,7 +9616,7 @@ SdaiDate_time_select::NewSelect ()
 // STEP Part 21
 
 void
-SdaiDate_time_select::STEPwrite_content (ostream& out) const
+SdaiDate_time_select::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_date_and_time)
 	_stepentityh -> STEPwrite_reference (out);
@@ -9628,7 +9628,7 @@ SdaiDate_time_select::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiDate_time_select::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiDate_time_select::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_date_and_time)   {
@@ -9649,7 +9649,7 @@ SdaiDate_time_select::STEPread_content (istream& in, InstMgr * instances, int ad
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -9665,7 +9665,7 @@ SdaiDate_time_select::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -9835,7 +9835,7 @@ SdaiCurve_on_surface::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -9849,7 +9849,7 @@ SdaiCurve_on_surface::NewSelect ()
 // STEP Part 21
 
 void
-SdaiCurve_on_surface::STEPwrite_content (ostream& out) const
+SdaiCurve_on_surface::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_pcurve)
 	_stepentityh -> STEPwrite_reference (out);
@@ -9865,7 +9865,7 @@ SdaiCurve_on_surface::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiCurve_on_surface::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiCurve_on_surface::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_pcurve)   {
@@ -9914,7 +9914,7 @@ SdaiCurve_on_surface::STEPread_content (istream& in, InstMgr * instances, int ad
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -9930,7 +9930,7 @@ SdaiCurve_on_surface::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -10346,7 +10346,7 @@ SdaiTrimming_select::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -10360,7 +10360,7 @@ SdaiTrimming_select::NewSelect ()
 // STEP Part 21
 
 void
-SdaiTrimming_select::STEPwrite_content (ostream& out) const
+SdaiTrimming_select::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_cartesian_point)
 	_stepentityh -> STEPwrite_reference (out);
@@ -10374,7 +10374,7 @@ SdaiTrimming_select::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiTrimming_select::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiTrimming_select::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_cartesian_point)   {
@@ -10400,7 +10400,7 @@ SdaiTrimming_select::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -10416,7 +10416,7 @@ SdaiTrimming_select::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -10615,7 +10615,7 @@ SdaiContracted_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -10629,7 +10629,7 @@ SdaiContracted_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiContracted_item::STEPwrite_content (ostream& out) const
+SdaiContracted_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -10641,7 +10641,7 @@ SdaiContracted_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiContracted_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiContracted_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -10662,7 +10662,7 @@ SdaiContracted_item::STEPread_content (istream& in, InstMgr * instances, int add
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -10678,7 +10678,7 @@ SdaiContracted_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -10863,7 +10863,7 @@ SdaiUnit::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -10877,7 +10877,7 @@ SdaiUnit::NewSelect ()
 // STEP Part 21
 
 void
-SdaiUnit::STEPwrite_content (ostream& out) const
+SdaiUnit::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_named_unit)
 	_stepentityh -> STEPwrite_reference (out);
@@ -10889,7 +10889,7 @@ SdaiUnit::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiUnit::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiUnit::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_named_unit)   {
@@ -10910,7 +10910,7 @@ SdaiUnit::STEPread_content (istream& in, InstMgr * instances, int addFileId)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -10926,7 +10926,7 @@ SdaiUnit::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -11057,7 +11057,7 @@ SdaiReversible_topology::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -11071,7 +11071,7 @@ SdaiReversible_topology::NewSelect ()
 // STEP Part 21
 
 void
-SdaiReversible_topology::STEPwrite_content (ostream& out) const
+SdaiReversible_topology::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designt_reversible_topology_item)
 	_sdaireversible_topology_item.STEPwrite (out);
@@ -11087,7 +11087,7 @@ SdaiReversible_topology::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiReversible_topology::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiReversible_topology::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designt_reversible_topology_item)   {
@@ -11106,7 +11106,7 @@ SdaiReversible_topology::STEPread_content (istream& in, InstMgr * instances, int
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -11124,7 +11124,7 @@ SdaiReversible_topology::StrToVal_content (const char * str, InstMgr * instances
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -11295,7 +11295,7 @@ SdaiWork_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -11309,7 +11309,7 @@ SdaiWork_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiWork_item::STEPwrite_content (ostream& out) const
+SdaiWork_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -11321,7 +11321,7 @@ SdaiWork_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiWork_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiWork_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -11342,7 +11342,7 @@ SdaiWork_item::STEPread_content (istream& in, InstMgr * instances, int addFileId
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -11358,7 +11358,7 @@ SdaiWork_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -11555,7 +11555,7 @@ SdaiSupported_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -11569,7 +11569,7 @@ SdaiSupported_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiSupported_item::STEPwrite_content (ostream& out) const
+SdaiSupported_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_action_directive)
 	_stepentityh -> STEPwrite_reference (out);
@@ -11585,7 +11585,7 @@ SdaiSupported_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiSupported_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiSupported_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_action_directive)   {
@@ -11634,7 +11634,7 @@ SdaiSupported_item::STEPread_content (istream& in, InstMgr * instances, int addF
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -11650,7 +11650,7 @@ SdaiSupported_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -12138,7 +12138,7 @@ SdaiApproved_item::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -12152,7 +12152,7 @@ SdaiApproved_item::NewSelect ()
 // STEP Part 21
 
 void
-SdaiApproved_item::STEPwrite_content (ostream& out) const
+SdaiApproved_item::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
 	_stepentityh -> STEPwrite_reference (out);
@@ -12184,7 +12184,7 @@ SdaiApproved_item::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiApproved_item::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiApproved_item::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)   {
@@ -12345,7 +12345,7 @@ SdaiApproved_item::STEPread_content (istream& in, InstMgr * instances, int addFi
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -12361,7 +12361,7 @@ SdaiApproved_item::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
@@ -13366,7 +13366,7 @@ SdaiSurface_model::AssignEntity (STEPentity * se)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-  G4cerr << se -> EntityName () << endl;
+  G4cerr << se -> EntityName () << G4endl;
 #endif
   return 0;
 }
@@ -13380,7 +13380,7 @@ SdaiSurface_model::NewSelect ()
 // STEP Part 21
 
 void
-SdaiSurface_model::STEPwrite_content (ostream& out) const
+SdaiSurface_model::STEPwrite_content (G4std::ostream& out) const
 {
   if (CurrentUnderlyingType () == config_control_designe_shell_based_surface_model)
 	_stepentityh -> STEPwrite_reference (out);
@@ -13392,7 +13392,7 @@ SdaiSurface_model::STEPwrite_content (ostream& out) const
 }
 
 Severity
-SdaiSurface_model::STEPread_content (istream& in, InstMgr * instances, int addFileId)
+SdaiSurface_model::STEPread_content (G4std::istream& in, InstMgr * instances, int addFileId)
 {
 
   if (CurrentUnderlyingType () == config_control_designe_shell_based_surface_model)   {
@@ -13413,7 +13413,7 @@ SdaiSurface_model::STEPread_content (istream& in, InstMgr * instances, int addFi
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << instances << "  " << addFileId << endl;
+G4cerr << instances << "  " << addFileId << G4endl;
 #endif
 
   return severity ();
@@ -13429,7 +13429,7 @@ SdaiSurface_model::StrToVal_content (const char * str, InstMgr * instances)
    G4cerr << __FILE__ << ":" << __LINE__ <<  ":  WARNING:  possible misuse of SELECT TYPE from schema library.\n";
   Error( "Mismatch in underlying type." );
 #ifdef __SUNCPLUSPLUS__
-G4cerr << str << "  " << instances << endl;
+G4cerr << str << "  " << instances << G4endl;
 #endif
 	return SEVERITY_WARNING;
   }
diff --git a/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN_init.cc b/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN_init.cc
index 72d8640e98..8cb96e2ee3 100644
--- a/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN_init.cc
+++ b/source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN_init.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: SdaiCONFIG_CONTROL_DESIGN_init.cc,v 1.2 1999/05/21 20:21:03 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SDAICONFIG_CONTROL_DESIGN_INIT_CC
 #define  SDAICONFIG_CONTROL_DESIGN_INIT_CC
diff --git a/source/geometry/solids/STEP/src/SingleLinkList.cc b/source/geometry/solids/STEP/src/SingleLinkList.cc
index 2111e638e6..b44c099408 100644
--- a/source/geometry/solids/STEP/src/SingleLinkList.cc
+++ b/source/geometry/solids/STEP/src/SingleLinkList.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: SingleLinkList.cc,v 1.2 1999/05/21 20:21:05 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/SingleLinkList_inline.cc b/source/geometry/solids/STEP/src/SingleLinkList_inline.cc
index dcf0432f5b..65ed236324 100644
--- a/source/geometry/solids/STEP/src/SingleLinkList_inline.cc
+++ b/source/geometry/solids/STEP/src/SingleLinkList_inline.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SingleLinkList_inline.cc,v 1.2 1999/05/21 20:21:05 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SingleLinkList_inline.cc,v 1.4 1999/12/15 18:04:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -23,11 +23,8 @@
 /*  */
 
 #include <SingleLinkList.h>
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+
+#include "G4ios.hh"
 
 SingleLinkNode * 	
 SingleLinkNode::NextNode ()  const
@@ -61,7 +58,7 @@ SingleLinkNode *
 SingleLinkList::NewNode () 
 {
     //  defined in subtypes
-    cerr << "\n\n******BUG****** a virtually defined function should \n"
+    G4cerr << "\n\n******BUG****** a virtually defined function should \n"
 	 << "be called for SingleLinkList::NewNode()\n\n";
     return new SingleLinkNode();
 }
diff --git a/source/geometry/solids/STEP/src/Str.cc b/source/geometry/solids/STEP/src/Str.cc
index c955e6e44c..e7607044fe 100644
--- a/source/geometry/solids/STEP/src/Str.cc
+++ b/source/geometry/solids/STEP/src/Str.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Str.cc,v 1.2 1999/05/21 20:21:06 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Str.cc,v 1.3 1999/12/15 14:50:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -154,8 +154,8 @@ PrettyNewName (const char * oldname)
 // this function can push the file pointer up to but not past the delimiter
 // (i.e. not removing the delimiter from the input stream).  If you have a
 // string containing a single value and you expect the whole string to contain
-// a valid value, you can change the string to an istrstream, read the value 
-// then send the istrstream to this function with tokenList set to null 
+// a valid value, you can change the string to an G4std::istrstream, read the value 
+// then send the G4std::istrstream to this function with tokenList set to null 
 // and this function will set an error for you if any input remains following
 // the value.
 
@@ -178,7 +178,7 @@ PrettyNewName (const char * oldname)
 //	  no way to know when to stop.
 
 Severity 
-CheckRemainingInput(istream &in, ErrorDescriptor *err, 
+CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err, 
 		    const char *typeName, // used in error message
 		    const char *tokenList) // e.g. ",)"
 {
@@ -195,7 +195,7 @@ CheckRemainingInput(istream &in, ErrorDescriptor *err,
 	// preceding a delimiter if you are expecting one.
 
 	in.clear(); // clear the istreams error
-	in >> ws; // skip whitespace
+	in >> G4std::ws; // skip whitespace
 	if(in.eof()) // no input following the desired input (or following the 
 	{	     // missing desired input)
 	    return err->severity();
@@ -278,7 +278,7 @@ CheckRemainingInput(istream &in, ErrorDescriptor *err,
 	return err->severity();
     }
     else
-    { // badbit set (in.bad()) means there was a problem when reading istream
+    { // badbit set (in.bad()) means there was a problem when reading G4std::istream
       // this is bad news... it means the input stream is hopelessly messed up
 	err->GreaterSeverity(SEVERITY_INPUT_ERROR);
 	sprintf(name, "Invalid %s value.\n", typeName);
diff --git a/source/geometry/solids/STEP/src/cmdmgr.cc b/source/geometry/solids/STEP/src/cmdmgr.cc
index 4103d6f404..84ec10c754 100644
--- a/source/geometry/solids/STEP/src/cmdmgr.cc
+++ b/source/geometry/solids/STEP/src/cmdmgr.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: cmdmgr.cc,v 1.2 1999/05/21 20:21:06 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/dirobj.cc b/source/geometry/solids/STEP/src/dirobj.cc
index c233844fed..ab7f5ec4b4 100644
--- a/source/geometry/solids/STEP/src/dirobj.cc
+++ b/source/geometry/solids/STEP/src/dirobj.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: dirobj.cc,v 1.2 1999/05/21 20:21:07 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/dispnode.cc b/source/geometry/solids/STEP/src/dispnode.cc
index 71a801158f..559858ca53 100644
--- a/source/geometry/solids/STEP/src/dispnode.cc
+++ b/source/geometry/solids/STEP/src/dispnode.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnode.cc,v 1.2 1999/05/21 20:21:07 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/dispnodelist.cc b/source/geometry/solids/STEP/src/dispnodelist.cc
index 6742f50e85..821f5bab0e 100644
--- a/source/geometry/solids/STEP/src/dispnodelist.cc
+++ b/source/geometry/solids/STEP/src/dispnodelist.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnodelist.cc,v 1.2 1999/05/21 20:21:08 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/errordesc.cc b/source/geometry/solids/STEP/src/errordesc.cc
index 6b2758a7a0..c3f0e56c2d 100644
--- a/source/geometry/solids/STEP/src/errordesc.cc
+++ b/source/geometry/solids/STEP/src/errordesc.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: errordesc.cc,v 1.2 1999/05/21 20:21:08 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: errordesc.cc,v 1.3 1999/12/15 14:50:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -25,7 +25,7 @@
 #include <errordesc.h>
 
 DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF;
-ostream *  ErrorDescriptor::_out = 0;
+G4std::ostream *  ErrorDescriptor::_out = 0;
 
 ErrorDescriptor::ErrorDescriptor ( Severity s,  DebugLevel d)
 :     _severity (s), 
diff --git a/source/geometry/solids/STEP/src/gennode_inline.cc b/source/geometry/solids/STEP/src/gennode_inline.cc
index bf75d5d603..d94c8f3266 100644
--- a/source/geometry/solids/STEP/src/gennode_inline.cc
+++ b/source/geometry/solids/STEP/src/gennode_inline.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: gennode_inline.cc,v 1.2 1999/05/21 20:21:08 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennode_inline_cc
diff --git a/source/geometry/solids/STEP/src/gennodearray.cc b/source/geometry/solids/STEP/src/gennodearray.cc
index 1d9ddba92c..612c771e45 100644
--- a/source/geometry/solids/STEP/src/gennodearray.cc
+++ b/source/geometry/solids/STEP/src/gennodearray.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: gennodearray.cc,v 1.2 1999/05/21 20:21:09 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/instmgr.cc b/source/geometry/solids/STEP/src/instmgr.cc
index 2c5ca87b9a..bd7486e488 100644
--- a/source/geometry/solids/STEP/src/instmgr.cc
+++ b/source/geometry/solids/STEP/src/instmgr.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: instmgr.cc,v 1.3 1999/05/21 20:21:09 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: instmgr.cc,v 1.4 1999/12/15 14:50:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -55,7 +55,7 @@ InstMgr::PrintSortedFileIds()
     for(i = 0; i < count; i++)
       {
 	mn = (MgrNode *)((*sortedMaster)[i]);
-	G4cout << i << " " << mn->GetFileId() << endl;
+	G4cout << i << " " << mn->GetFileId() << G4endl;
       }
 }
 
diff --git a/source/geometry/solids/STEP/src/mgrnode.cc b/source/geometry/solids/STEP/src/mgrnode.cc
index fa5322cb50..dd8830203b 100644
--- a/source/geometry/solids/STEP/src/mgrnode.cc
+++ b/source/geometry/solids/STEP/src/mgrnode.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: mgrnode.cc,v 1.2 1999/05/21 20:21:09 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: mgrnode.cc,v 1.3 1999/12/15 18:04:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
@@ -30,11 +30,7 @@
 #include <instmgr.h>
 #include <STEPentity.h>
 
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+#include "G4ios.hh"
 
 void *MgrNode::SEE()
 {
diff --git a/source/geometry/solids/STEP/src/mgrnodearray.cc b/source/geometry/solids/STEP/src/mgrnodearray.cc
index 92ff1e8886..f00788246c 100644
--- a/source/geometry/solids/STEP/src/mgrnodearray.cc
+++ b/source/geometry/solids/STEP/src/mgrnodearray.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnodearray.cc,v 1.2 1999/05/21 20:21:10 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/mgrnodelist.cc b/source/geometry/solids/STEP/src/mgrnodelist.cc
index a2f4ddf021..e1e5193e6d 100644
--- a/source/geometry/solids/STEP/src/mgrnodelist.cc
+++ b/source/geometry/solids/STEP/src/mgrnodelist.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnodelist.cc,v 1.2 1999/05/21 20:21:10 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEP/src/read_func.cc b/source/geometry/solids/STEP/src/read_func.cc
index 8bb5540f34..be61a70aa3 100644
--- a/source/geometry/solids/STEP/src/read_func.cc
+++ b/source/geometry/solids/STEP/src/read_func.cc
@@ -5,8 +5,8 @@
 
 
 //
-// $Id: read_func.cc,v 1.2 1999/05/21 20:21:10 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: read_func.cc,v 1.3 1999/12/15 14:50:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef __O3DB__
 #include <OpenOODB.h>
@@ -45,20 +45,20 @@ PrintErrorState(ErrorDescriptor &err)
     G4cout << err.DetailMsg() << "\n";
 }
 
-// Print istream error information for debugging purposes
-void IStreamState(istream &in)
+// Print G4std::istream error information for debugging purposes
+void IStreamState(G4std::istream &in)
 {
     if( in.good())
     {
-	G4cerr << "istream GOOD\n" << flush;
+	G4cerr << "istream GOOD\n" << G4std::flush;
     }
     if( in.fail() )
     {
-	G4cerr << "istream FAIL\n" << flush;
+	G4cerr << "istream FAIL\n" << G4std::flush;
     }
     if( in.eof() )
     {
-	G4cerr << "istream EOF\n" << flush;
+	G4cerr << "istream EOF\n" << G4std::flush;
     }
 }
 
@@ -72,7 +72,7 @@ void IStreamState(istream &in)
 //   a severity level and error message (no error MESSAGE is set for severity
 //   incomplete).
 // * tokenList contains characters that Terminate reading the value.
-// * If tokenList is not zero then the istream will be read until a character 
+// * If tokenList is not zero then the G4std::istream will be read until a character 
 //   is found matching a character in tokenlist.  All values read up to the 
 //   terminating character (delimiter) must be valid or err will be set with an
 //   appropriate error message.  A valid value may still have been assigned 
@@ -84,11 +84,11 @@ void IStreamState(istream &in)
 ///////////////////////////////////////////////////////////////////////////////
 
 int
-ReadInteger(SdaiInteger &val, istream &in, ErrorDescriptor *err, 
+ReadInteger(SdaiInteger &val, G4std::istream &in, ErrorDescriptor *err, 
 	    char *tokenList)
 {
     SdaiInteger i = 0;
-    in >> ws;
+    in >> G4std::ws;
     in >> i;
 
     int valAssigned = 0;
@@ -112,7 +112,7 @@ int
 ReadInteger(SdaiInteger &val, const char *s, ErrorDescriptor *err, 
 	    char *tokenList)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return ReadInteger(val, in, err, tokenList);
 }
 
@@ -143,8 +143,8 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
     if(clearError)
 	err->ClearErrorMsg();
 
-    istrstream in((char *)attrValue);
-    in >> ws; // skip white space
+    G4std::istrstream in((char *)attrValue);
+    in >> G4std::ws; // skip white space
     char c = in.peek();
     if(in.eof())
     {
@@ -179,7 +179,7 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
 //   a severity level and error message (no error MESSAGE is set for severity
 //   incomplete).
 // * tokenList contains characters that Terminate reading the value.
-// * If tokenList is not zero then the istream will be read until a character 
+// * If tokenList is not zero then the G4std::istream will be read until a character 
 //   is found matching a character in tokenlist.  All values read up to the 
 //   terminating character (delimiter) must be valid or err will be set with an
 //   appropriate error message.  A valid value may still have been assigned 
@@ -190,11 +190,11 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
 ///////////////////////////////////////////////////////////////////////////////
 
 int
-ReadReal(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadReal(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	 char *tokenList)
 {
     SdaiReal d = 0;
-    in >> ws;
+    in >> G4std::ws;
     in >> d;
 
 //    IStreamState(in);
@@ -219,7 +219,7 @@ int
 ReadReal(SdaiReal &val, const char *s, ErrorDescriptor *err, 
 	 char *tokenList)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return ReadReal(val, in, err, tokenList);
 }
 
@@ -250,8 +250,8 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
     if(clearError)
 	err->ClearErrorMsg();
 
-    istrstream in((char *)attrValue);
-    in >> ws; // skip white space
+    G4std::istrstream in((char *)attrValue);
+    in >> G4std::ws; // skip white space
     char c = in.peek();
     if(in.eof())
     {
@@ -286,7 +286,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
 //   a severity level and error message (no error MESSAGE is set for severity
 //   incomplete).
 // * tokenList contains characters that Terminate reading the value.
-// * If tokenList is not zero then the istream will be read until a character 
+// * If tokenList is not zero then the G4std::istream will be read until a character 
 //   is found matching a character in tokenlist.  All values read up to the 
 //   terminating character (delimiter) must be valid or err will be set with an
 //   appropriate error message.  A valid value may still have been assigned 
@@ -297,11 +297,11 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
 ///////////////////////////////////////////////////////////////////////////////
 
 int
-ReadNumber(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadNumber(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	   char *tokenList)
 {
     SdaiReal d = 0;
-    in >> ws;
+    in >> G4std::ws;
     in >> d;
 
 //    IStreamState(in);
@@ -324,7 +324,7 @@ int
 ReadNumber(SdaiReal &val, const char *s, ErrorDescriptor *err, 
 	   char *tokenList)
 {
-    istrstream in((char *)s);
+    G4std::istrstream in((char *)s);
     return ReadNumber(val, in, err, tokenList);
 }
 
@@ -356,8 +356,8 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
     if(clearError)
 	err->ClearErrorMsg();
 
-    istrstream in((char *)attrValue);
-    in >> ws; // skip white space
+    G4std::istrstream in((char *)attrValue);
+    in >> G4std::ws; // skip white space
     char c = in.peek();
     if(in.eof())
     {
@@ -386,7 +386,7 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
 // return 1 if 'in' points at a quoted quote otherwise return 0
 
 int
-QuoteInString(istream& in)
+QuoteInString(G4std::istream& in)
 {
     char c1, c2;
     if( in.good() )
@@ -408,13 +408,13 @@ QuoteInString(istream& in)
 // 'in'.  
 
 void
-PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err)
+PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
 {
     char messageBuf[BUFSIZ];
     messageBuf[0] = '\0';
 
     char c;
-    in >> ws; // skip whitespace
+    in >> G4std::ws; // skip whitespace
     in >> c;
     if(c == STRING_DELIM)
     {
@@ -458,13 +458,13 @@ PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err)
 // aggregates.
 
 void
-PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err)
+PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
 {
     char messageBuf[BUFSIZ];
     messageBuf[0] = '\0';
 
     char c;
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
 
     if(c == '(')
@@ -506,13 +506,13 @@ PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err)
 // to contain an aggregate as an element.
 
 void
-PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err)
+PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
 {
     char messageBuf[BUFSIZ];
     messageBuf[0] = '\0';
 
     char c;
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
 
     if(c == '(')
@@ -552,11 +552,11 @@ PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err)
 /*************************** 
 * FindStartOfInstance reads to the beginning of an instance marked by #  
 * it copies what is read to the SCLstring inst.  It leaves the # on the 
-* istream.
+* G4std::istream.
 ***************************/
 
 Severity 
-FindStartOfInstance(istream& in, SCLstring&  inst)
+FindStartOfInstance(G4std::istream& in, SCLstring&  inst)
 {
     char c =0;
     ErrorDescriptor errs;
@@ -596,7 +596,7 @@ FindStartOfInstance(istream& in, SCLstring&  inst)
 ***************************/
 
 Severity
-SkipInstance (istream& in, SCLstring&  inst)
+SkipInstance (G4std::istream& in, SCLstring&  inst)
 {
     char c =0;
     ErrorDescriptor errs;
@@ -639,12 +639,12 @@ SkipInstance (istream& in, SCLstring&  inst)
 ***************************/
 
 const char *
-SkipSimpleRecord(istream &in, SCLstring &buf, ErrorDescriptor *err)
+SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err)
 {
     char c;
     SCLstring s;
 
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
     if(c == '(') // beginning of record
     {
@@ -687,11 +687,11 @@ SkipSimpleRecord(istream &in, SCLstring &buf, ErrorDescriptor *err)
 ***************************/
 
 const char *
-ReadStdKeyword(istream& in, SCLstring &buf, int skipInitWS)
+ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS)
 {
     char c;
     if(skipInitWS)
-	in >> ws;
+	in >> G4std::ws;
 
     while( in.get(c) && !isspace(c) && ( isalnum(c) || (c == '_') ) )
     {
@@ -706,9 +706,9 @@ ReadStdKeyword(istream& in, SCLstring &buf, int skipInitWS)
 
 /***************************
 This function returns a null terminated const char* for the
-characters read from the istream up to, but not including
+characters read from the G4std::istream up to, but not including
 the first character found in the set of delimiters, or the 
-whitespace character. It leaves the delimiter on the istream.
+whitespace character. It leaves the delimiter on the G4std::istream.
 
 The string is returned in a static buffer, so it will change 
 the next time the function is called.
@@ -719,7 +719,7 @@ digits, underscore characters, and possibly an exclamation mark.
 The "!" shall appear only once, and only as the first character.
 ***************************/
 const char* 
-GetKeyword(istream& in, const char* delims, ErrorDescriptor &err)
+GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err)
 {
     char c;
     int sz = 1;
@@ -755,17 +755,17 @@ GetKeyword(istream& in, const char* delims, ErrorDescriptor &err)
 // otherwise return 0. This gobbles up the input stream until it knows 
 // that it does or does not have the ENDSEC keyword (and semicolon). i.e.
 // the first character that stops matching the keyword ENDSEC; (including the 
-// semicolon) will be put back onto the istream, everything else will remain 
+// semicolon) will be put back onto the G4std::istream, everything else will remain 
 // read.  It is this way so that checking for the keywd the next time will
 // start with the correct char or if it doesn't find it the non-matching char
 // may be what you are looking for next (e.g. someone typed in END; and the 
 // next chars are DATA; for the beginning of the data section).
 
 int  
-FoundEndSecKywd(istream& in, ErrorDescriptor &err)
+FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err)
 {
     char c;
-    in >> ws;
+    in >> G4std::ws;
     in.get(c);
 
     if(c == 'E')
@@ -785,7 +785,7 @@ FoundEndSecKywd(istream& in, ErrorDescriptor &err)
 			in.get(c);
 			if(c == 'C')
 			{
-			    in >> ws;
+			    in >> G4std::ws;
 			    in.get(c);
 			    if(c == ';')
 			    {
@@ -877,11 +877,11 @@ const char * ReadComment(SCLstring &ss, const char *s)
 ***************************/
 
 const char * 
-ReadComment(istream& in, SCLstring &s)
+ReadComment(G4std::istream& in, SCLstring &s)
 {
     char c = '\0';
     int commentLength = 0;
-    in >> ws;
+    in >> G4std::ws;
     in >> c;
 
     // it looks like a comment so far
@@ -890,7 +890,7 @@ ReadComment(istream& in, SCLstring &s)
 	in.get(c);	// won't skip space
 	if (c == '*')   // it is a comment
 	{
-	    in >> ws; // skip leading comment space
+	    in >> G4std::ws; // skip leading comment space
 
 	    // only to keep it from completely gobbling up input
 	    while( commentLength <= MAX_COMMENT_LENGTH ) 
@@ -934,12 +934,12 @@ ReadComment(istream& in, SCLstring &s)
 }
 
 /***************************
- ** Read a Print Control Directive from the istream
+ ** Read a Print Control Directive from the G4std::istream
  ** "\F\" == formfeed
  ** "\N\" == newline
  ***************************/
 Severity
-ReadPcd(istream& in) 
+ReadPcd(G4std::istream& in) 
 {
     char c;
     in.get(c);
@@ -958,15 +958,15 @@ ReadPcd(istream& in)
 
 /******************************
 This function reads through token separators
-from an istream. It returns when a token
-separator is not the next thing on the istream.
+from an G4std::istream. It returns when a token
+separator is not the next thing on the G4std::istream.
 The token separators are blanks, explicit Print control directives,
 and comments.
 Part 21 considers the blank to be the space character, 
 but this function considers blanks to be the return value of isspace(c)
 ******************************/
 void 
-ReadTokenSeparator(istream& in, SCLstring *comments)
+ReadTokenSeparator(G4std::istream& in, SCLstring *comments)
 {
     char c;
     SCLstring s; // used if need to read a comment
@@ -980,7 +980,7 @@ ReadTokenSeparator(istream& in, SCLstring *comments)
 
     while (in)
     {
-	in >> ws; // skip white space.
+	in >> G4std::ws; // skip white space.
 	c = in.peek(); // look at next char on input stream
 
 	switch (c) 
diff --git a/source/geometry/solids/STEP/src/s_HEADER_SCHEMA.cc b/source/geometry/solids/STEP/src/s_HEADER_SCHEMA.cc
index 93badb155f..8125076948 100644
--- a/source/geometry/solids/STEP/src/s_HEADER_SCHEMA.cc
+++ b/source/geometry/solids/STEP/src/s_HEADER_SCHEMA.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: s_HEADER_SCHEMA.cc,v 1.2 1999/05/21 20:21:12 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  S_HEADER_SCHEMA_CC
 #define  S_HEADER_SCHEMA_CC
diff --git a/source/geometry/solids/STEP/src/s_HEADER_SCHEMA_init.cc b/source/geometry/solids/STEP/src/s_HEADER_SCHEMA_init.cc
index b12479932a..72fe7413bb 100644
--- a/source/geometry/solids/STEP/src/s_HEADER_SCHEMA_init.cc
+++ b/source/geometry/solids/STEP/src/s_HEADER_SCHEMA_init.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: s_HEADER_SCHEMA_init.cc,v 1.2 1999/05/21 20:21:12 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  S_HEADER_SCHEMA_INIT_CC
 #define  S_HEADER_SCHEMA_INIT_CC
diff --git a/source/geometry/solids/STEP/src/schema.cc b/source/geometry/solids/STEP/src/schema.cc
index 8108b49cc7..0671efe38e 100644
--- a/source/geometry/solids/STEP/src/schema.cc
+++ b/source/geometry/solids/STEP/src/schema.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: schema.cc,v 1.2 1999/05/21 20:21:12 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SCHEMA_CC
 #define  SCHEMA_CC
diff --git a/source/geometry/solids/STEP/src/scl_hash.cc b/source/geometry/solids/STEP/src/scl_hash.cc
index 5fcd65926e..6783d65d95 100644
--- a/source/geometry/solids/STEP/src/scl_hash.cc
+++ b/source/geometry/solids/STEP/src/scl_hash.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: scl_hash.cc,v 1.2 1999/05/21 20:21:13 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*  ""; */
 
diff --git a/source/geometry/solids/STEP/src/scl_string.cc b/source/geometry/solids/STEP/src/scl_string.cc
index 68923ee68f..d9d1795c66 100644
--- a/source/geometry/solids/STEP/src/scl_string.cc
+++ b/source/geometry/solids/STEP/src/scl_string.cc
@@ -6,7 +6,7 @@
 
 //
 // $Id: scl_string.cc,v 1.2 1999/05/21 20:21:13 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 /*
diff --git a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
index 19e9c4863d..0578c19138 100644
--- a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NISTStepReader.hh,v 1.1.4.1 1999/12/07 20:48:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NISTStepReader.hh,v 1.2 1999/12/15 14:50:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NISTSTEPFILEREADER_HH
 #define G4NISTSTEPFILEREADER_HH
diff --git a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
index fa75d5ca33..b44da8b021 100644
--- a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StepFileReader.hh,v 1.1.4.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StepFileReader.hh,v 1.2 1999/12/15 14:50:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4STEPFILEREADER_HH
 #define G4STEPFILEREADER_HH
diff --git a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
index c6b48722f2..34c3f393d1 100644
--- a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
@@ -65,14 +65,14 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& Ent)
   {
     //#define G4_STEPINTERFACE_DEBUG 1 
 #ifdef G4_STEPINTERFACE_DEBUG
-    G4cout<<"\n\n Creating the Context_Dependent_Shape_Representation"<<endl;
+    G4cout<<"\n\n Creating the Context_Dependent_Shape_Representation"<<G4endl;
 #endif
     index = 0;
   
     for( a=0; a< ConDepShapes; a++)
     {
 #ifdef G4_STEPINTERFACE_DEBUG
-      G4cout<<"loop "<<a+1<<" of "<<ConDepShapes<<endl;
+      G4cout<<"loop "<<a+1<<" of "<<ConDepShapes<<G4endl;
 #endif     
       // Be careful, tmpindex not correspond to STEPfile_id !
       tmpindex = 
@@ -98,7 +98,7 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& Ent)
 
 #ifdef G4_STEPINTERFACE_DEBUG
 	G4cout<<" Context_Dependent_Shape_Representation find in index "
-	      <<index<<endl;
+	      <<index<<G4endl;
 #endif
 
       }
@@ -112,13 +112,13 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& Ent)
   else
   {       
 #ifdef G4_STEPINTERFACE_DEBUG
-    G4cout<<"\n Creating the Shape_Definition_Representation"<<endl;
+    G4cout<<"\n Creating the Shape_Definition_Representation"<<G4endl;
 #endif
 
     for(a=0; a<  ShapeDefReps ; a++)
     {
 #ifdef G4_STEPINTERFACE_DEBUG
-      G4cout<<"loop "<<a+1<<" of "<<ShapeDefReps<<endl;
+      G4cout<<"loop "<<a+1<<" of "<<ShapeDefReps<<G4endl;
 #endif
       
       // Be careful, tmpindex not correspond to STEPfile_id !
@@ -142,7 +142,7 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& Ent)
 
 	index = ent->STEPfile_id ;
 #ifdef G4_STEPINTERFACE_DEBUG
-	G4cout<<" Shape_Definition_Representation find in index "<<index<<endl;
+	G4cout<<" Shape_Definition_Representation find in index "<<index<<G4endl;
 #endif
       }
       
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
index b6c9a113dd..4c1aa2bc39 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
@@ -4,7 +4,7 @@ G4Axis2PlacementsCreator G4Axis2PlacementsCreator::csc;
 
 G4Axis2PlacementsCreator::G4Axis2PlacementsCreator(){
   // G4cerr << " G4Axis2PlacementsCreator default constructor " 
-  // << " calling G4GeometryTable::RegisterObject(this) " << endl;
+  // << " calling G4GeometryTable::RegisterObject(this) " << G4endl;
   G4GeometryTable::RegisterObject(this);
 }
 
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
index 7530241b77..37ccb4604d 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
@@ -66,9 +66,9 @@ void* G4GeometryTable::CreateObject(STEPentity& Ent)
 #ifdef G4_STEPINTERFACE_DEBUG
     if (obj == 0) 
       G4cout << "G4 object of type " << gctmp->Name() 
-	     << " not necessary" << endl;
+	     << " not necessary" << G4endl;
     else 
-      //G4cout << "Created G4 object of type " << gctmp->Name() << endl;
+      //G4cout << "Created G4 object of type " << gctmp->Name() << G4endl;
 #endif
 
     return obj;
@@ -76,7 +76,7 @@ void* G4GeometryTable::CreateObject(STEPentity& Ent)
   else
   {
     G4String err = "Geometry creator for entity " + name +  " not found.";
-    G4cout << err << endl;
+    G4cout << err << G4endl;
     //      G4Exception(err);
     return 0;
   } 
@@ -114,17 +114,17 @@ void G4GeometryTable::PrintObjectNames()
   G4int objectCount = RegisteredObjects.length();
   if(!objectCount)
     {
-      G4cout << "No registered objects in table." << endl;
+      G4cout << "No registered objects in table." << G4endl;
       return;
     }
 
-  G4cout << "Objects in table:" << endl;  
+  G4cout << "Objects in table:" << G4endl;  
   
   for(a=0;a<objectCount;a++)
     {
       gc = RegisteredObjects[a];
       name = gc->Name();
-      G4cout << name << endl;
+      G4cout << name << G4endl;
     }
 
 }
diff --git a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
index ba57bd88b0..edcafde549 100644
--- a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
+++ b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NISTStepReader.cc,v 1.1.4.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NISTStepReader.cc,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4NISTStepReader.hh"
 
@@ -43,14 +43,14 @@ void G4NISTStepReader::ReadSTEPFile(G4String STEPfilename)
   // Reading the STEPfile instantiates all the objects in it.
   // The instances get pointers into the InstMgr, and each type
   // and entity gets a pointer into the registry.
-  G4cout << "\n### Reading exchange file from " << STEPfilename << endl;
+  G4cout << "\n### Reading exchange file from " << STEPfilename << G4endl;
   sfile->ReadExchangeFile(STEPfilename);    
 
   // Just checking... ;-)
   G4cout << "\n### The InstMgr says there are ";
-  G4cout << InstanceList.InstanceCount() << " instantiated objects" << endl;
+  G4cout << InstanceList.InstanceCount() << " instantiated objects" << G4endl;
     
-  // G4cout << "\n### Here is the exchange file:" << endl << endl;
+  // G4cout << "\n### Here is the exchange file:" << G4endl << G4endl;
   // sfile->WriteExchangeFile(G4cout);
 
   delete sfile;
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
index 7baec485b2..db52b4734f 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
@@ -18,18 +18,18 @@ void G4ShapeDefinitionRepresentationCreator::CreateG4Geometry(STEPentity& Ent)
 /*
   // Output messages
   G4cout<<"Shape definition representation created with "
-	<<"the Advanced Brep shape :"<<endl;
+	<<"the Advanced Brep shape :"<<G4endl;
 
-  G4cout<<" - BBox of the solid :"<<endl;
+  G4cout<<" - BBox of the solid :"<<G4endl;
   G4cout<< "    box min: "
 	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMin().x()<< " "
 	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMin().y()<< " "
-	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMin().z()<< endl;
+	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMin().z()<< G4endl;
 
   G4cout<< "    box max: "
 	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMax().x()<< " "
 	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMax().y()<< " "
-	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMax().z()<< endl;
+	<< ((G4BREPSolid*)ps->GetSolid())->GetBBox()->GetBoxMax().z()<< G4endl;
 
 */
 }
diff --git a/source/geometry/volumes/History b/source/geometry/volumes/History
index ee6c77140c..5b6bc73d9b 100644
--- a/source/geometry/volumes/History
+++ b/source/geometry/volumes/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.18 1999/12/02 13:20:17 gcosmo Exp $
+$Id: History,v 1.20 2000/01/20 10:52:16 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,11 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+January 19th, 2000   G. Cosmo - geomvol-V01-00-00
+
+Sycronized files versions with HEAD after ISO-C++ migration.
+(essentially CVS headers changes). Left out only G4Navigator[.hh.cc].
+
 December 2nd, 1999   G. Cosmo - geomvol-V00-01-02
 
 G4TransportationManager: Fixed definition of the singleton to conform
@@ -49,7 +54,13 @@ of static (class) data members
 G4PropagatorInField warning message about integration inaccuracy 
 now printed (for a maximum of 10 times) and in Verbose. 
 
+July     27th, 1999   J. Apostolakis - geomvol-01-01-02
 
+Modified G4Navigator to distinguish Candidate volume from Blocked volume
+
+July     27th, 1999   J. Apostolakis - geomvol-01-01-01
+
+Tagged  --- here ??? ---
 
 July     27th, 1999   J. Apostolakis
 G4PropagatorInField:
diff --git a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
index 9871eb1c56..86cff13866 100644
--- a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
+++ b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AuxiliaryNavServices.hh,v 1.1.10.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AuxiliaryNavServices.hh,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4NormalNavigation: Utility for navigation in volumes
diff --git a/source/geometry/volumes/include/G4BlockingList.hh b/source/geometry/volumes/include/G4BlockingList.hh
index aa557a01a0..1eb7a59362 100644
--- a/source/geometry/volumes/include/G4BlockingList.hh
+++ b/source/geometry/volumes/include/G4BlockingList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BlockingList.hh,v 1.2.2.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BlockingList.hh,v 1.3 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4BlockingList
 //
diff --git a/source/geometry/volumes/include/G4BlockingList.icc b/source/geometry/volumes/include/G4BlockingList.icc
index e03fccd4db..56940a50c6 100644
--- a/source/geometry/volumes/include/G4BlockingList.icc
+++ b/source/geometry/volumes/include/G4BlockingList.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BlockingList.icc,v 1.1.10.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BlockingList.icc,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4BlockingList  Inlined Implementation
diff --git a/source/geometry/volumes/include/G4GRSSolid.hh b/source/geometry/volumes/include/G4GRSSolid.hh
index 1df9bf1827..cc82f5deaa 100644
--- a/source/geometry/volumes/include/G4GRSSolid.hh
+++ b/source/geometry/volumes/include/G4GRSSolid.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSSolid.hh,v 1.1.10.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSSolid.hh,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSSolid     Paul Kent August 1996
diff --git a/source/geometry/volumes/include/G4GRSSolid.icc b/source/geometry/volumes/include/G4GRSSolid.icc
index 7f043111c3..fe46dc20f5 100644
--- a/source/geometry/volumes/include/G4GRSSolid.icc
+++ b/source/geometry/volumes/include/G4GRSSolid.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSSolid.icc,v 1.1.10.1 1999/12/07 20:48:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSSolid.icc,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSSolid inline implementation
diff --git a/source/geometry/volumes/include/G4GRSVolume.hh b/source/geometry/volumes/include/G4GRSVolume.hh
index f504682316..13faff34e8 100644
--- a/source/geometry/volumes/include/G4GRSVolume.hh
+++ b/source/geometry/volumes/include/G4GRSVolume.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSVolume.hh,v 1.1.10.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSVolume.hh,v 1.2 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSVolume     Paul Kent August 1996
diff --git a/source/geometry/volumes/include/G4GRSVolume.icc b/source/geometry/volumes/include/G4GRSVolume.icc
index ece8bec2cb..9262178aa8 100644
--- a/source/geometry/volumes/include/G4GRSVolume.icc
+++ b/source/geometry/volumes/include/G4GRSVolume.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSVolume.icc,v 1.2.8.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSVolume.icc,v 1.3 1999/12/15 14:50:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSVolume inline implementation
diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.hh b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
index 3298c4b456..da5d137d4a 100644
--- a/source/geometry/volumes/include/G4LogicalBorderSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalBorderSurface.hh,v 1.2.2.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalBorderSurface.hh,v 1.3 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalBorderSurface Definition
diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.hh b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
index d31542de55..ee820735f9 100644
--- a/source/geometry/volumes/include/G4LogicalSkinSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalSkinSurface.hh,v 1.2.2.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalSkinSurface.hh,v 1.3 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalSkinSurface Definition
diff --git a/source/geometry/volumes/include/G4NavigationHistory.hh b/source/geometry/volumes/include/G4NavigationHistory.hh
index 01f998001c..ce8665b29e 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.hh
+++ b/source/geometry/volumes/include/G4NavigationHistory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationHistory.hh,v 1.2.2.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationHistory.hh,v 1.4 1999/12/15 16:40:10 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4NavigationHistory
 //
@@ -31,16 +31,15 @@
 
 #include "g4rw/tvvector.h"
 #include "g4rw/tpvector.h"
+#include "g4std/iostream"
 
 const G4int kHistoryMax=15;	// Default max size of history
 const G4int kHistoryStride=16;   // History increase stride
 
-class ostream;
-
 class G4NavigationHistory
 {
 public:
-  friend ostream& operator << (ostream &os,const G4NavigationHistory &h);
+  friend G4std::ostream& operator << (G4std::ostream &os,const G4NavigationHistory &h);
 
   G4NavigationHistory();
   G4NavigationHistory(const G4NavigationHistory &h);
diff --git a/source/geometry/volumes/include/G4NavigationHistory.icc b/source/geometry/volumes/include/G4NavigationHistory.icc
index 219457b0a6..955a02dd82 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.icc
+++ b/source/geometry/volumes/include/G4NavigationHistory.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationHistory.icc,v 1.1.10.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationHistory.icc,v 1.2 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4NavigationHistory Inline implementation
diff --git a/source/geometry/volumes/include/G4NavigationLevel.hh b/source/geometry/volumes/include/G4NavigationLevel.hh
index bc2e9a4335..9999e4947a 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.hh
+++ b/source/geometry/volumes/include/G4NavigationLevel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationLevel.hh,v 1.8.8.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationLevel.hh,v 1.10 1999/12/15 16:40:10 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4NavigationLevel
 //
@@ -30,8 +30,6 @@
 #include "G4NavigationLevelRep.hh"
 #include "G4Allocator.hh"
 
-class ostream;
-
 class G4NavigationLevel
 {
 
diff --git a/source/geometry/volumes/include/G4NavigationLevel.icc b/source/geometry/volumes/include/G4NavigationLevel.icc
index 97bf1a657b..c2b62f60e0 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.icc
+++ b/source/geometry/volumes/include/G4NavigationLevel.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationLevel.icc,v 1.8.8.1 1999/12/07 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationLevel.icc,v 1.9 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 30.09.97 J.Apostolakis Initial version. 
 //                        
diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.hh b/source/geometry/volumes/include/G4NavigationLevelRep.hh
index 775382544c..729f9cb2c9 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.hh
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationLevelRep.hh,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationLevelRep.hh,v 1.3 1999/12/15 16:40:10 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4NavigationLevelRep
 //
@@ -30,8 +30,6 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4Allocator.hh"
 
-class ostream;
-
 class G4NavigationLevelRep
 {
 
diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.icc b/source/geometry/volumes/include/G4NavigationLevelRep.icc
index 91908a19b5..d8ef934ffb 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.icc
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationLevelRep.icc,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationLevelRep.icc,v 1.2 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  1 October 1997 J.Apostolakis Initial version. 
 //                        
diff --git a/source/geometry/volumes/include/G4Navigator.hh b/source/geometry/volumes/include/G4Navigator.hh
index 76aea5b2f0..c30fe1c04b 100644
--- a/source/geometry/volumes/include/G4Navigator.hh
+++ b/source/geometry/volumes/include/G4Navigator.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Navigator.hh,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Navigator.hh,v 1.1.10.1.2.2 1999/12/09 13:51:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Navigator Paul Kent July 95/96
@@ -207,12 +207,12 @@
 #include "G4ParameterisedNavigation.hh"
 #include "G4ReplicaNavigation.hh"
 
-class ostream;
+#include "g4std/iostream"
 
 class G4Navigator
 {
 public:
-  friend ostream& operator << (ostream &os, const G4Navigator &n);
+  friend G4std::ostream& operator << (G4std::ostream &os, const G4Navigator &n);
 
 // Constructor - initialisers and setup
   G4Navigator();
diff --git a/source/geometry/volumes/include/G4Navigator.icc b/source/geometry/volumes/include/G4Navigator.icc
index 84ecf47e21..5c04817880 100644
--- a/source/geometry/volumes/include/G4Navigator.icc
+++ b/source/geometry/volumes/include/G4Navigator.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Navigator.icc,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Navigator.icc,v 1.2 1999/12/15 14:50:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Navigator Inline implementation
diff --git a/source/geometry/volumes/include/G4NormalNavigation.hh b/source/geometry/volumes/include/G4NormalNavigation.hh
index d602df61b1..a9c1a24633 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.hh
+++ b/source/geometry/volumes/include/G4NormalNavigation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NormalNavigation.hh,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NormalNavigation.hh,v 1.2 1999/12/15 14:50:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4NormalNavigation: Utility for navigation in volumes
diff --git a/source/geometry/volumes/include/G4NormalNavigation.icc b/source/geometry/volumes/include/G4NormalNavigation.icc
index 22b23f5126..de3b10be72 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.icc
+++ b/source/geometry/volumes/include/G4NormalNavigation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NormalNavigation.icc,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NormalNavigation.icc,v 1.2 1999/12/15 14:50:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4NormalNavigation Inline Implementation
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.hh b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
index 34931bcbc5..5e46faf341 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.hh
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParameterisedNavigation.hh,v 1.1.10.1 1999/12/07 20:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParameterisedNavigation.hh,v 1.2 1999/12/15 14:50:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4ParameterisedNavigation: Utility for navigation in volumes
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.icc b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
index 915ede57db..20d6d2a396 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.icc
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParameterisedNavigation.icc,v 1.1.10.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParameterisedNavigation.icc,v 1.2 1999/12/15 14:50:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4ParameterisedNavigation Inline implementation
@@ -70,7 +70,7 @@ inline G4double G4ParameterisedNavigation::ComputeVoxelSafety(const G4ThreeVecto
 	plusVoxelSafety= minCurNodeNoDelta*fVoxelSliceWidth+minCurCommonDelta;
 	minusVoxelSafety=maxCurNodeNoDelta*fVoxelSliceWidth+maxCurCommonDelta;
 
-	voxelSafety= min(plusVoxelSafety,minusVoxelSafety);
+	voxelSafety= G4std::min(plusVoxelSafety,minusVoxelSafety);
 
 	if (voxelSafety<0)
 		{
diff --git a/source/geometry/volumes/include/G4PropagatorInField.hh b/source/geometry/volumes/include/G4PropagatorInField.hh
index 96f64d8ee4..9cc4d02b09 100644
--- a/source/geometry/volumes/include/G4PropagatorInField.hh
+++ b/source/geometry/volumes/include/G4PropagatorInField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PropagatorInField.hh,v 1.5.6.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PropagatorInField.hh,v 1.6 1999/12/15 14:50:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4PropagatorInField.icc b/source/geometry/volumes/include/G4PropagatorInField.icc
index 1e7e10dc11..70450eb069 100644
--- a/source/geometry/volumes/include/G4PropagatorInField.icc
+++ b/source/geometry/volumes/include/G4PropagatorInField.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PropagatorInField.icc,v 1.5.2.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PropagatorInField.icc,v 1.6 1999/12/15 14:50:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.hh b/source/geometry/volumes/include/G4ReplicaNavigation.hh
index 6234a1b81c..5187e7c90e 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.hh
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ReplicaNavigation.hh,v 1.1.10.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ReplicaNavigation.hh,v 1.2 1999/12/15 14:50:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4ReplicaNavigation: Utility for navigation in volumes
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.icc b/source/geometry/volumes/include/G4ReplicaNavigation.icc
index eed58724cd..8202edd322 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.icc
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ReplicaNavigation.icc,v 1.1.10.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ReplicaNavigation.icc,v 1.2 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4ReplicaNavigation Inline implementation
@@ -68,10 +68,10 @@ inline G4int G4ReplicaNavigation::VoxelLocate(const G4SmartVoxelHeader *pHead,
         {
 #ifdef G4_REPORT_REPLICA_NAV
           G4cerr << " ERROR: assert in G4ReplicaNavigation::VoxelLocate " 
-               << " has failed : " << endl <<
+               << " has failed : " << G4endl <<
                << " (targetNodeNo>=0&&targetNodeNo<targetHeaderNoSlices) " 
     	       << " targetNodeNo= " << targetNodeNo 
-               << " Number of Slices =  " << targetHeaderNoSlices << endl;
+               << " Number of Slices =  " << targetHeaderNoSlices << G4endl;
 #endif
 	  if (targetNodeNo<0)
 	    {
diff --git a/source/geometry/volumes/include/G4TouchableHistory.hh b/source/geometry/volumes/include/G4TouchableHistory.hh
index 543b27b3ff..ab5b23d745 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.hh
+++ b/source/geometry/volumes/include/G4TouchableHistory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TouchableHistory.hh,v 1.1.10.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TouchableHistory.hh,v 1.2 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4TouchableHistory     Paul Kent August 1996
diff --git a/source/geometry/volumes/include/G4TouchableHistory.icc b/source/geometry/volumes/include/G4TouchableHistory.icc
index 9fce088469..dcd6b8e375 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.icc
+++ b/source/geometry/volumes/include/G4TouchableHistory.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TouchableHistory.icc,v 1.2.2.1 1999/12/07 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TouchableHistory.icc,v 1.3 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4TouchableHistory inline implementation
diff --git a/source/geometry/volumes/include/G4Transform.hh b/source/geometry/volumes/include/G4Transform.hh
index 8f74e1af75..d199a601e4 100644
--- a/source/geometry/volumes/include/G4Transform.hh
+++ b/source/geometry/volumes/include/G4Transform.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Transform.hh,v 1.1.10.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Transform.hh,v 1.2 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Transform
 //
diff --git a/source/geometry/volumes/include/G4TransportationManager.hh b/source/geometry/volumes/include/G4TransportationManager.hh
index a02cecbadb..18122beb4d 100644
--- a/source/geometry/volumes/include/G4TransportationManager.hh
+++ b/source/geometry/volumes/include/G4TransportationManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransportationManager.hh,v 1.2.2.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TransportationManager.hh,v 1.3 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 // ------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4TransportationManager.icc b/source/geometry/volumes/include/G4TransportationManager.icc
index 9826910978..a865d08743 100644
--- a/source/geometry/volumes/include/G4TransportationManager.icc
+++ b/source/geometry/volumes/include/G4TransportationManager.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransportationManager.icc,v 1.2.2.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TransportationManager.icc,v 1.3 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 // ------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.hh b/source/geometry/volumes/include/G4VoxelNavigation.hh
index 32b32c7c4a..299c1aaf61 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.hh
+++ b/source/geometry/volumes/include/G4VoxelNavigation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VoxelNavigation.hh,v 1.4.2.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VoxelNavigation.hh,v 1.5 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4VoxelNavigation: Utility for navigation in volumes
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.icc b/source/geometry/volumes/include/G4VoxelNavigation.icc
index 17116525c6..790e493b04 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.icc
+++ b/source/geometry/volumes/include/G4VoxelNavigation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VoxelNavigation.icc,v 1.1.10.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VoxelNavigation.icc,v 1.2 1999/12/15 14:50:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4VoxelNavigation Inline implementation
diff --git a/source/geometry/volumes/src/G4BlockingList.cc b/source/geometry/volumes/src/G4BlockingList.cc
index 8fc2fcd3de..702ad34634 100644
--- a/source/geometry/volumes/src/G4BlockingList.cc
+++ b/source/geometry/volumes/src/G4BlockingList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BlockingList.cc,v 1.1.10.1 1999/12/07 20:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BlockingList.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4BlockingList Implementation
diff --git a/source/geometry/volumes/src/G4GRSSolid.cc b/source/geometry/volumes/src/G4GRSSolid.cc
index 839e3b3dc0..8a09e96d80 100644
--- a/source/geometry/volumes/src/G4GRSSolid.cc
+++ b/source/geometry/volumes/src/G4GRSSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSSolid.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSSolid.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSSolid Implementation
diff --git a/source/geometry/volumes/src/G4GRSVolume.cc b/source/geometry/volumes/src/G4GRSVolume.cc
index ba557db5bf..243d13b8d5 100644
--- a/source/geometry/volumes/src/G4GRSVolume.cc
+++ b/source/geometry/volumes/src/G4GRSVolume.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GRSVolume.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GRSVolume.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4GRSVolume Implementation
diff --git a/source/geometry/volumes/src/G4LogicalBorderSurface.cc b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
index 774041e055..8d8b425d04 100644
--- a/source/geometry/volumes/src/G4LogicalBorderSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalBorderSurface.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalBorderSurface.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalBorderSurface Implementation
@@ -97,16 +97,16 @@ void G4LogicalBorderSurface::DumpInfo() // Class method (it is really const)
     // Dump info for known surfaces
 
     G4cout << "***** Surface Table : Nb of Surfaces = " << 
-            GetNumberOfBorderSurfaces() << " *****" << endl;
+            GetNumberOfBorderSurfaces() << " *****" << G4endl;
 
     for (int i=0; i<theBorderSurfaceTable.length(); i++) {
-      G4cout << theBorderSurfaceTable[i]->GetName() << " : " << endl <<
-          "  Surface type   = " << theBorderSurfaceTable[i]->GetName() << endl;
+      G4cout << theBorderSurfaceTable[i]->GetName() << " : " << G4endl <<
+          "  Surface type   = " << theBorderSurfaceTable[i]->GetName() << G4endl;
 #ifdef PRINT_INFO
-          "  Surface type   = " << theBorderSurfaceTable[i]->GetOpticalSurface()->GetType()   << endl;
-          "  Surface finish = " << theBorderSurfaceTable[i]->GetFinish() << endl <<
-	  "  Surface model  = " << theBorderSurfaceTable[i]->GetModel()  << endl;
+          "  Surface type   = " << theBorderSurfaceTable[i]->GetOpticalSurface()->GetType()   << G4endl;
+          "  Surface finish = " << theBorderSurfaceTable[i]->GetFinish() << G4endl <<
+	  "  Surface model  = " << theBorderSurfaceTable[i]->GetModel()  << G4endl;
 #endif 
     }
-    G4cout << endl;
+    G4cout << G4endl;
 }
diff --git a/source/geometry/volumes/src/G4LogicalSkinSurface.cc b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
index 06fe8113f6..8750751774 100644
--- a/source/geometry/volumes/src/G4LogicalSkinSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalSkinSurface.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalSkinSurface.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalSkinSurface Implementation
@@ -95,35 +95,35 @@ void G4LogicalSkinSurface::DumpInfo()
 
     G4cout << "***** Surface Table : Nb of Surfaces = " << 
 // G4LogicalSkinSurface::
-      GetNumberOfSkinSurfaces() << " *****" << endl;
+      GetNumberOfSkinSurfaces() << " *****" << G4endl;
 
     for (int i=0; i<theSurfaceTable.length(); i++) {
       G4LogicalSkinSurface *pSkinSurface= theSurfaceTable[i];
-      G4cout << theSurfaceTable[i]->GetName() << " : " << endl <<
+      G4cout << theSurfaceTable[i]->GetName() << " : " << G4endl <<
 	" Skin of logical volume " << pSkinSurface->GetLogicalVolume()->GetName  ()
-	<< endl <<
+	<< G4endl <<
 	" Optical Surface Ptr  = " << (long) (pSkinSurface->GetOpticalSurface() )
-	<< endl;
+	<< G4endl;
 
 #ifdef PRINT_INFO
       //  DOES NOT COMPILE without including "G4OpticalSurface.hh"
     
-      //  G4cout << pSkinSurface->GetOpticalSurface() << endl ;
+      //  G4cout << pSkinSurface->GetOpticalSurface() << G4endl ;
       G4pticalSurface opticalSurface= pSkinSurface->GetOpticalSurface(); 
       G4cout << 
-          "  Surface type   = " << opticalSurface->GetType()   << endl <<
-          "  Surface finish = " << opticalSurface->GetFinish() << endl <<
-	  "  Surface model  = " << opticalSurface->GetModel()  << endl;
+          "  Surface type   = " << opticalSurface->GetType()   << G4endl <<
+          "  Surface finish = " << opticalSurface->GetFinish() << G4endl <<
+	  "  Surface model  = " << opticalSurface->GetModel()  << G4endl;
 
 /* 
         operator << ( G4OpticalSurface opticalSurface ) should exist 
 	   and do something like:
-          "  Surface type   = " << opticalSurface->GetType()   << endl <<
-          "  Surface finish = " << opticalSurface->GetFinish() << endl <<
-	  "  Surface model  = " << opticalSurface->GetModel()  << endl;
+          "  Surface type   = " << opticalSurface->GetType()   << G4endl <<
+          "  Surface finish = " << opticalSurface->GetFinish() << G4endl <<
+	  "  Surface model  = " << opticalSurface->GetModel()  << G4endl;
  */
 #endif 
 
     }
-    G4cout << endl;
+    G4cout << G4endl;
 }
diff --git a/source/geometry/volumes/src/G4NavigationHistory.cc b/source/geometry/volumes/src/G4NavigationHistory.cc
index 57951561b6..88dbb5e04c 100644
--- a/source/geometry/volumes/src/G4NavigationHistory.cc
+++ b/source/geometry/volumes/src/G4NavigationHistory.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NavigationHistory.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NavigationHistory.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4NavigationHistory Implementation P.Kent August 96
@@ -14,9 +14,9 @@
 #include "G4NavigationHistory.hh"
 #include "G4ios.hh"
 
-ostream& operator << (ostream& os, const G4NavigationHistory& nav)
+G4std::ostream& operator << (G4std::ostream& os, const G4NavigationHistory& nav)
 {
-  G4cout << "History depth="<<nav.GetDepth()<< endl;
+  G4cout << "History depth="<<nav.GetDepth()<< G4endl;
   for (G4int i=0;i<=nav.GetDepth();i++)
   {
       os << "Level=["<<i<<"]: " ;
@@ -39,7 +39,7 @@ ostream& operator << (ostream& os, const G4NavigationHistory& nav)
       }else{
 	 os << "Phys = <Null>";
       }
-      os << endl;
+      os << G4endl;
   }
   return os;
 }
diff --git a/source/geometry/volumes/src/G4Navigator.cc b/source/geometry/volumes/src/G4Navigator.cc
index cde54e31b2..3f0cdff8d1 100644
--- a/source/geometry/volumes/src/G4Navigator.cc
+++ b/source/geometry/volumes/src/G4Navigator.cc
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Navigator.cc,v 1.7.6.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Navigator.cc,v 1.7.6.1.2.4 1999/12/14 07:07:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4Navigator Implementation  Paul Kent July 95/96
 
 #include "G4Navigator.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 G4Navigator::G4Navigator() :
   fWasLimitedByGeometry(false),
@@ -65,19 +65,19 @@ G4Navigator::LocateGlobalPointAndSetup(const G4ThreeVector& globalPoint,
   EInside insideCode;
 
 #ifdef DEBUG_HIST
-  G4cerr << "Upon entering LocateGlobalPointAndSetup " << endl;
-  G4cerr << "  History = " << endl << fHistory << endl << endl;
+  G4cerr << "Upon entering LocateGlobalPointAndSetup " << G4endl;
+  G4cerr << "  History = " << G4endl << fHistory << G4endl << G4endl;
 #endif
 #ifdef G4VERBOSE
   if( fVerbose > 0 ) 
     {
-      G4cout << "*** G4Navigator::LocateGlobalPointAndSetup: ***" << endl; 
+      G4cout << "*** G4Navigator::LocateGlobalPointAndSetup: ***" << G4endl; 
       G4cout.precision(8);
-      G4cout << " I was called with the following arguments: " << endl
-	     << " Globalpoint = " << globalPoint << endl
-	     << " relativeSearch   = " <<  relativeSearch  << endl;
-       //       << " = " << << endl
-      G4cout << " Upon entering my state is: " << endl;
+      G4cout << " I was called with the following arguments: " << G4endl
+	     << " Globalpoint = " << globalPoint << G4endl
+	     << " relativeSearch   = " <<  relativeSearch  << G4endl;
+       //       << " = " << << G4endl
+      G4cout << " Upon entering my state is: " << G4endl;
       PrintState();
     }
 #endif
@@ -330,13 +330,13 @@ G4Navigator::LocateGlobalPointAndSetup(const G4ThreeVector& globalPoint,
       if (targetPhysical!=0)
 	 curPhysVol_Name= targetPhysical->GetName();
       G4cout << " Return value = new volume = "
-	     << curPhysVol_Name  << endl;
+	     << curPhysVol_Name  << G4endl;
     }
 #endif
 
 #ifdef DEBUG_HIST
-  G4cerr << "Upon exiting LocateGlobalPointAndSetup " << endl;
-  G4cerr << "  History = " << endl << fHistory << endl << endl;
+  G4cerr << "Upon exiting LocateGlobalPointAndSetup " << G4endl;
+  G4cerr << "  History = " << G4endl << fHistory << G4endl << G4endl;
 #endif
   return targetPhysical;	
 }
@@ -378,22 +378,22 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
   G4LogicalVolume *motherLogical=motherPhysical->GetLogicalVolume();
 
 #ifdef G4VERBOSE
-  cout.precision(8);
+  G4std::cout.precision(8);
   if( fVerbose > 1 ) 
     {
-      cout << "*** G4Navigator::ComputeStep: ***" << endl; 
-      cout.precision(8);
-      cout << " I was called with the following arguments: " << endl
-	   << " Globalpoint = " << setw(25) << pGlobalpoint  << endl
-	   << " Direction   = " << setw(25) << pDirection    << endl
-	   << " ProposedStepLength= " << pCurrentProposedStepLength << endl;
-       //       << " = " << << endl
+      G4cout << "*** G4Navigator::ComputeStep: ***" << G4endl; 
+      G4std::cout.precision(8);
+      G4cout << " I was called with the following arguments: " << G4endl
+	   << " Globalpoint = " << G4std::setw(25) << pGlobalpoint  << G4endl
+	   << " Direction   = " << G4std::setw(25) << pDirection    << G4endl
+	   << " ProposedStepLength= " << pCurrentProposedStepLength << G4endl;
+       //       << " = " << << G4endl
     }
 
   if( fVerbose > 2 )
     {
-      // cout.precision(3);
-      cout << " Upon entering my state is: " << endl;
+      // G4std::cout.precision(3);
+      G4cout << " Upon entering my state is: " << G4endl;
       PrintState();
     }
 #endif
@@ -437,53 +437,53 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
               isError = ( diffShiftSaf >= fAccuracyForException );
 	      G4cerr.precision(10);
               if ( isError )
-		G4cerr << "Accuracy ERROR found in G4Navigator::ComputeStep: " << endl;
+		G4cerr << "Accuracy ERROR found in G4Navigator::ComputeStep: " << G4endl;
               else
-		G4cerr << "Warning G4Navigator::ComputeStep found slightly inaccurate position:" << endl;
+		G4cerr << "Warning G4Navigator::ComputeStep found slightly inaccurate position:" << G4endl;
 
 	      G4cerr << "     The Step's starting point has moved " 
-		     << sqrt(moveLenSq)/mm << " mm " << endl
-		     << "     since the last call to a Locate method." << endl;
+		     << sqrt(moveLenSq)/mm << " mm " << G4endl
+		     << "     since the last call to a Locate method." << G4endl;
 	      G4cerr << "     This has resulted in moving " 
 		     << shiftOrigin/mm << " mm " 
 		     << " from the last point at which the safety " 
-		     << "     was calculated " << endl;
+		     << "     was calculated " << G4endl;
 	      G4cerr << "     which is more than the computed safety= " 
-		     << fPreviousSafety/mm << " mm  at that point." << endl;
+		     << fPreviousSafety/mm << " mm  at that point." << G4endl;
 	      G4cerr << "     This difference is " 
-		     << diffShiftSaf /mm << " mm." << endl;
+		     << diffShiftSaf /mm << " mm." << G4endl;
 
 #ifdef G4VERBOSE
               static G4int warnNow= 0;
 	      if( ((++warnNow % 100) == 1) ) {   //  || (warnNow < 4) ){ 
-	          G4cerr << "  This problem can be due to either " << endl;
+	          G4cerr << "  This problem can be due to either " << G4endl;
 		  G4cerr << "    - a process that has proposed a displacement"
-			 <<     " larger than the current safety , or" << endl;
-		  G4cerr << "    - inaccuracy in the computation of the safety" << endl;
+			 <<     " larger than the current safety , or" << G4endl;
+		  G4cerr << "    - inaccuracy in the computation of the safety" << G4endl;
 		  G4cerr << "    - if you are using a magnetic field, a known conflict about the safety exists in this case."
-			 << endl;
-		  G4cerr << "  We suggest that you " << endl
+			 << G4endl;
+		  G4cerr << "  We suggest that you " << G4endl
                      <<  "   - find i) what particle is being tracked, and "
-			 << " ii) through what part of your geometry " << endl
-		     <<  "      for example by reruning this event with " << endl
-		     <<  "         /tracking/verbose 1 "  << endl
+			 << " ii) through what part of your geometry " << G4endl
+		     <<  "      for example by reruning this event with " << G4endl
+		     <<  "         /tracking/verbose 1 "  << G4endl
                      << "    - check which processes you declare for this particle"
-			 << " (and look at non-standard ones) "  << endl
+			 << " (and look at non-standard ones) "  << G4endl
                      <<  "   - if possible create a detailed logfile "
-		         << " of this event using:" << endl
+		         << " of this event using:" << G4endl
                      <<  "         /tracking/verbose 6 "
-                     << endl;
+                     << G4endl;
 	      }
-              // G4cerr << "    -  ." << endl;
+              // G4cerr << "    -  ." << G4endl;
 #endif 
 	   }
 #ifdef DEBUG
 	   else
 	   {
- 	      G4cerr << " Warning in G4Navigator::ComputeStep: " << endl
+ 	      G4cerr << " Warning in G4Navigator::ComputeStep: " << G4endl
 		   << "The Step's starting point has moved " << sqrt(moveLenSq)
 		   << " which has taken it to the limit of the current safety. "
-		   << endl;
+		   << G4endl;
 	   }
 #endif
 	}
@@ -600,7 +600,7 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
 #ifdef G4VERBOSE
   if( fVerbose > 1 ) 
     {
-      cout << " Upon exiting my state is: " << endl;
+      G4cout << " Upon exiting my state is: " << G4endl;
       PrintState();
     }
 #endif
@@ -696,10 +696,10 @@ void G4Navigator::SetupHierarchy()
   }
 }
 
-ostream& operator << (ostream &os,const G4Navigator &n)
+G4std::ostream& operator << (G4std::ostream &os,const G4Navigator &n)
 {
 
-  os << "Current History: " << endl << n.fHistory;
+  os << "Current History: " << G4endl << n.fHistory;
   return os;
 }
 
@@ -748,13 +748,13 @@ G4double G4Navigator::ComputeSafety(const G4ThreeVector &pGlobalpoint,
 #ifdef G4VERBOSE
   if( fVerbose > 0 ) 
     {
-      G4cout << "*** G4Navigator::ComputeSafety: ***" << endl; 
+      G4cout << "*** G4Navigator::ComputeSafety: ***" << G4endl; 
       G4cout.precision(8);
-      G4cout << " I was called with the following arguments: " << endl
-	   << " Globalpoint = " << pGlobalpoint << endl;
-      //       cout << "  pMaxLength  = " << pMaxLength  << endl;
+      G4cout << " I was called with the following arguments: " << G4endl
+	   << " Globalpoint = " << pGlobalpoint << G4endl;
+      //       cout << "  pMaxLength  = " << pMaxLength  << G4endl;
 
-      G4cout << " Upon entering my state is: " << endl;
+      G4cout << " Upon entering my state is: " << G4endl;
       PrintState();
     }
 #endif
@@ -815,10 +815,10 @@ G4double G4Navigator::ComputeSafety(const G4ThreeVector &pGlobalpoint,
 #ifdef G4VERBOSE
   if( fVerbose > 1 ) 
     {
-      cout.precision(8);
-      cout << " Upon exiting my state is: " << endl;
+      G4std::cout.precision(8);
+      G4cout << " Upon exiting my state is: " << G4endl;
       PrintState();
-      cout << "  and I return a value of Safety = " << newSafety << endl;
+      G4cout << "  and I return a value of Safety = " << newSafety << G4endl;
     }
 #endif
 
@@ -842,50 +842,50 @@ void  G4Navigator::PrintState()
   if( fVerbose >= 4 )
     {
       G4cout.precision(3);
-      G4cout << " Upon exiting my state is: " << endl;
-      G4cout << "  ValidExitNormal= " << fValidExitNormal << endl
-	   << "  ExitNormal     = " << fExitNormal      << endl
-	   << "  Exiting        = " << fExiting         << endl
-	   << "  Entering       = " << fEntering        << endl
+      G4cout << " Upon exiting my state is: " << G4endl;
+      G4cout << "  ValidExitNormal= " << fValidExitNormal << G4endl
+	   << "  ExitNormal     = " << fExitNormal      << G4endl
+	   << "  Exiting        = " << fExiting         << G4endl
+	   << "  Entering       = " << fEntering        << G4endl
 	   << "  BlockedPhysicalVolume= " ;
       if (fBlockedPhysicalVolume==0 )
 	 G4cout << "None";
       else
  	 G4cout << fBlockedPhysicalVolume->GetName();
-      G4cout << endl
-	   << "  BlockedReplicaNo     = " <<  fBlockedReplicaNo       << endl
-	   << "  LastStepWasZero      = " <<   fLastStepWasZero       << endl
-	   << endl;   
+      G4cout << G4endl
+	   << "  BlockedReplicaNo     = " <<  fBlockedReplicaNo       << G4endl
+	   << "  LastStepWasZero      = " <<   fLastStepWasZero       << G4endl
+	   << G4endl;   
     }
   if( ( 1 < fVerbose) && (fVerbose < 4) )
     {
       G4cout.precision(3);
-      G4cout << setw(18) << " ExitNormal "  << " "     
-	   << setw( 5) << " Valid "       << " "     
-	   << setw( 9) << " Exiting "     << " "      
-	   << setw( 9) << " Entering"     << " " 
-	   << setw(15) << " Blocked:Volume "  << " "   
-	   << setw( 9) << " ReplicaNo"        << " "  
-	   << setw( 8) << " LastStepZero  "   << " "   
-	   << endl;   
-      G4cout << setw(18)  << fExitNormal       << " "
-	   << setw( 5)  << fValidExitNormal  << " "   
-	   << setw( 9)  << fExiting          << " "
-	   << setw( 9)  << fEntering         << " ";
+      G4cout << G4std::setw(18) << " ExitNormal "  << " "     
+	   << G4std::setw( 5) << " Valid "       << " "     
+	   << G4std::setw( 9) << " Exiting "     << " "      
+	   << G4std::setw( 9) << " Entering"     << " " 
+	   << G4std::setw(15) << " Blocked:Volume "  << " "   
+	   << G4std::setw( 9) << " ReplicaNo"        << " "  
+	   << G4std::setw( 8) << " LastStepZero  "   << " "   
+	   << G4endl;   
+      G4cout << G4std::setw(18)  << fExitNormal       << " "
+	   << G4std::setw( 5)  << fValidExitNormal  << " "   
+	   << G4std::setw( 9)  << fExiting          << " "
+	   << G4std::setw( 9)  << fEntering         << " ";
       if (fBlockedPhysicalVolume==0 )
-	 G4cout << setw(15) << "None";
+	 G4cout << G4std::setw(15) << "None";
       else
- 	 G4cout << setw(15)<< fBlockedPhysicalVolume->GetName();
-      G4cout << setw( 9)  << fBlockedReplicaNo  << " "
-	   << setw( 8)  << fLastStepWasZero   << " "
-	   << endl;   
+ 	 G4cout << G4std::setw(15)<< fBlockedPhysicalVolume->GetName();
+      G4cout << G4std::setw( 9)  << fBlockedReplicaNo  << " "
+	   << G4std::setw( 8)  << fLastStepWasZero   << " "
+	   << G4endl;   
     }
   if( fVerbose > 2 ) 
     {
       G4cout.precision(8);
-      G4cout << " Current Localpoint = " << fLastLocatedPointLocal << endl;
-      G4cout << " PreviousSftOrigin  = " << fPreviousSftOrigin << endl;
-      G4cout << " PreviousSafety     = " <<  fPreviousSafety << endl; 
+      G4cout << " Current Localpoint = " << fLastLocatedPointLocal << G4endl;
+      G4cout << " PreviousSftOrigin  = " << fPreviousSftOrigin << G4endl;
+      G4cout << " PreviousSafety     = " <<  fPreviousSafety << G4endl; 
     }
 }
 
@@ -959,15 +959,15 @@ void G4Navigator::LocateGlobalPointWithinVolume(const  G4ThreeVector& pGlobalpoi
 
    if( pOldVol != pNewVol ){
       // This is abnormal behaviour.
-      cerr << " ERROR in G4Navigator::LocateGlobalPointWithinVolume " << endl;
-      cerr << "       A volume change has occured - this is not expected & illegal" << endl; 
-      cerr << "         Old volume name = " << pOldVol->GetName() << endl;
-      cerr << "         New volume name = " << pNewVol->GetName() << endl;
+      G4cerr << " ERROR in G4Navigator::LocateGlobalPointWithinVolume " << G4endl;
+      G4cerr << "       A volume change has occured - this is not expected & illegal" << G4endl; 
+      G4cerr << "         Old volume name = " << pOldVol->GetName() << G4endl;
+      G4cerr << "         New volume name = " << pNewVol->GetName() << G4endl;
 
       G4VPhysicalVolume  *pNewVol2;
       pNewVol2= LocateGlobalPointAndSetup(pGlobalpoint, 0); 
                                                    //, G4ThreeVector(1.,0.,0.));
-      cerr << "         Tried again & found volume= " << pNewVol2->GetName() << endl;
+      G4cerr << "         Tried again & found volume= " << pNewVol2->GetName() << G4endl;
 
    }
 
diff --git a/source/geometry/volumes/src/G4NormalNavigation.cc b/source/geometry/volumes/src/G4NormalNavigation.cc
index 5d18a1ec79..f48ba45350 100644
--- a/source/geometry/volumes/src/G4NormalNavigation.cc
+++ b/source/geometry/volumes/src/G4NormalNavigation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NormalNavigation.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NormalNavigation.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4NormalNavigation Implementation
diff --git a/source/geometry/volumes/src/G4ParameterisedNavigation.cc b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
index fa595c9d17..31a28e203f 100644
--- a/source/geometry/volumes/src/G4ParameterisedNavigation.cc
+++ b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParameterisedNavigation.cc,v 1.1.10.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParameterisedNavigation.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4ParameterisedNavigation Implementation
@@ -17,7 +17,7 @@ G4ParameterisedNavigation::~G4ParameterisedNavigation()
 {
 #ifdef G4DEBUG_NAVIGATION
     cout << "G4ParameterisedNavigation::~G4ParameterisedNavigation() called."
-	 << endl;
+	 << G4endl;
 #endif
 }
 
diff --git a/source/geometry/volumes/src/G4PropagatorInField.cc b/source/geometry/volumes/src/G4PropagatorInField.cc
index 62990f091b..fe10a1f1b2 100644
--- a/source/geometry/volumes/src/G4PropagatorInField.cc
+++ b/source/geometry/volumes/src/G4PropagatorInField.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PropagatorInField.cc,v 1.8.6.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PropagatorInField.cc,v 1.9 1999/12/15 14:50:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // 
@@ -25,7 +25,7 @@
 
 #include "G4PropagatorInField.hh"
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
  
 // Initialisation moved to G4TransportationManager.cc, to ensure
 //   correct order initialisation of static (class) data members
@@ -115,9 +115,9 @@ G4PropagatorInField::
 	if(   (stepTrial == 0.0) 
 	   || ( fNoZeroStep > 5*fThresholdNo_ZeroSteps ) ) { 
  	   G4cerr << " G4PropagatorInField::ComputeStep "
-		  << "  ERROR : attempting a zero step= " << stepTrial << endl
+		  << "  ERROR : attempting a zero step= " << stepTrial << G4endl
 		  << " and/or no progress after "  << fNoZeroStep 
-		  << " trial steps.  ABORTING." << endl;
+		  << " trial steps.  ABORTING." << G4endl;
 	   G4Exception("G4PropagatorInField::ComputeStep No progress - Looping with zero steps"); 
 	} 
      }
@@ -181,7 +181,7 @@ G4PropagatorInField::
      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 = min( LinearStepLength, ChordAB_Length);
+     LinearStepLength = G4std::min( LinearStepLength, ChordAB_Length);
 
      if( intersects )
      {
@@ -209,7 +209,7 @@ G4PropagatorInField::
 #ifdef G4VERBOSE
 	   if( Verbose() > 0 )
 	      G4cout << " Found intersection after Step of length " << 
-	           StepTaken << endl;
+	           StepTaken << G4endl;
 #endif
 	}
 	else
@@ -243,11 +243,11 @@ G4PropagatorInField::
   if( do_loop_count >= GetMaxLoopCount() ){
 
      G4cerr << "G4PropagateInField: Warning: Particle is looping - " 
-	    << " tracking in field will be stopped. " << endl;
+	    << " tracking in field will be stopped. " << G4endl;
      G4cerr << " It has performed " << do_loop_count << " steps in Field " 
 	    << " while a maximum of " << GetMaxLoopCount() << " are allowed. "
-	    << endl;
-     //G4cerr << " In future this will be treated better/quicker. " << endl;
+	    << G4endl;
+     //G4cerr << " In future this will be treated better/quicker. " << G4endl;
      fParticleIsLooping= true;
   }
 #endif
@@ -281,7 +281,7 @@ G4PropagatorInField::
            << " and is " <<  End_PointAndTangent.CurveS() 
            << " a difference of " 
 	   << OriginalState.CurveS() + TruePathLength 
-              - End_PointAndTangent.CurveS() << endl;
+              - End_PointAndTangent.CurveS() << G4endl;
   }
 #endif
 
@@ -423,7 +423,7 @@ G4PropagatorInField::LocateIntersectionPoint(
 				    ChordAF_Length, NewSafety);
 
        G4bool Intersects_AF = (stepLength <= ChordAF_Length);
-       stepLength = min(stepLength, ChordAF_Length);
+       stepLength = G4std::min(stepLength, ChordAF_Length);
        if( Intersects_AF ){
 	   //  There is an intersection of AF with a volume boundary
 	   
@@ -458,7 +458,7 @@ G4PropagatorInField::LocateIntersectionPoint(
 				       ChordFB_Length, NewSafety);
 
 	   G4bool Intersects_FB = stepLength <= ChordFB_Length;
-	   stepLength = min(stepLength, ChordFB_Length);
+	   stepLength = G4std::min(stepLength, ChordFB_Length);
 	   if( Intersects_FB ) { 
 	       //  There is an intersection of FB with a volume boundary
 	       // H <- First Intersection of Chord FB 
@@ -510,12 +510,12 @@ G4PropagatorInField::LocateIntersectionPoint(
 	  if(   (noInaccuracyWarnings < maxNoWarnings ) 
              || (Verbose() > 1) ){
 	     G4cerr << "G4PropagatorInField::LocateIntersectionPoint: " 
-		    << "  Warning: Integration inaccuracy requires " << endl
-		    << " an adjustment in the step's endpoint "      << endl
+		    << "  Warning: Integration inaccuracy requires " << G4endl
+		    << " an adjustment in the step's endpoint "      << G4endl
 		    << "   Two mid-points are further apart than their "
-		    <<         "curve length difference"             << endl 
+		    <<         "curve length difference"             << G4endl 
 		    << "   Dist = "       << sqrt(linDistSq)
-		    << " curve length = " << curveDist               << endl; 
+		    << " curve length = " << curveDist               << G4endl; 
 	  }
 #endif
        }
@@ -565,21 +565,21 @@ void G4PropagatorInField::printStatus(
        static G4int noPrecision= 4;
        G4cout.precision(noPrecision);
        // G4cout.setf(ios_base::fixed,ios_base::floatfield);
-       G4cout << setw( 6)  << " " 
-	      << setw( 25) << " Current Position  and  Direction" << " "
-	      << endl; 
-       G4cout << setw( 5) << "Step#" << " "
-            << setw( 9) << "X(mm)" << " "
-            << setw( 9) << "Y(mm)" << " "  
-            << setw( 9) << "Z(mm)" << " "
-            << setw( 7) << " N_x " << " "
-            << setw( 7) << " N_y " << " "
-            << setw( 7) << " N_z " << " "
-            << setw( 9) << "StepLen" << " "  
-            << setw( 9) << "PhsStep" << " "  
-            << setw(12) << "StartSafety" << " "  
-            << setw(18) << "NextVolume" << " "
-            << endl;
+       G4cout << G4std::setw( 6)  << " " 
+	      << G4std::setw( 25) << " Current Position  and  Direction" << " "
+	      << G4endl; 
+       G4cout << G4std::setw( 5) << "Step#" << " "
+            << G4std::setw( 9) << "X(mm)" << " "
+            << G4std::setw( 9) << "Y(mm)" << " "  
+            << G4std::setw( 9) << "Z(mm)" << " "
+            << G4std::setw( 7) << " N_x " << " "
+            << G4std::setw( 7) << " N_y " << " "
+            << G4std::setw( 7) << " N_z " << " "
+            << G4std::setw( 9) << "StepLen" << " "  
+            << G4std::setw( 9) << "PhsStep" << " "  
+            << G4std::setw(12) << "StartSafety" << " "  
+            << G4std::setw(18) << "NextVolume" << " "
+            << G4endl;
         // Recurse to print the start values 
         printStatus( StartFT,   StartFT,   // 
                  -1.0, safety,  -1, 0);     //  startVolume);
@@ -589,45 +589,45 @@ void G4PropagatorInField::printStatus(
     {
        G4cout.precision(3);
        if( stepNo >= 0)
- 	  G4cout << setw( 5) << stepNo << " ";
+ 	  G4cout << G4std::setw( 5) << stepNo << " ";
        else
-	  G4cout << setw( 5) << "Start" << " ";
-       G4cout << setw( 9) << CurrentPosition.x() << " "
-	      << setw( 9) << CurrentPosition.y() << " "
-	      << setw( 9) << CurrentPosition.z() << " "
-	      << setw( 7) << CurrentUnitVelocity.x() << " "
-	      << setw( 7) << CurrentUnitVelocity.y() << " "
-	      << setw( 7) << CurrentUnitVelocity.z() << " ";
-       G4cout << setw( 9) << step_len << " "; 
+	  G4cout << G4std::setw( 5) << "Start" << " ";
+       G4cout << G4std::setw( 9) << CurrentPosition.x() << " "
+	      << G4std::setw( 9) << CurrentPosition.y() << " "
+	      << G4std::setw( 9) << CurrentPosition.z() << " "
+	      << G4std::setw( 7) << CurrentUnitVelocity.x() << " "
+	      << G4std::setw( 7) << CurrentUnitVelocity.y() << " "
+	      << G4std::setw( 7) << CurrentUnitVelocity.z() << " ";
+       G4cout << G4std::setw( 9) << step_len << " "; 
        if( requestStep != -1.0 ) 
-	  G4cout << setw( 9) << requestStep << " ";
+	  G4cout << G4std::setw( 9) << requestStep << " ";
        else
-  	  G4cout << setw( 9) << " InitialStep " << " "; 
-       G4cout << setw(12) << safety << " ";
+  	  G4cout << G4std::setw( 9) << " InitialStep " << " "; 
+       G4cout << G4std::setw(12) << safety << " ";
 
        if( startVolume != 0) {
-	  G4cout << setw(12) << startVolume->GetName() << " ";
+	  G4cout << G4std::setw(12) << startVolume->GetName() << " ";
        } else {
 	  if( step_len != -1 )
-	     G4cout << setw(12) << "OutOfWorld" << " ";
+	     G4cout << G4std::setw(12) << "OutOfWorld" << " ";
 	  else
-	     G4cout << setw(12) << "NotGiven" << " ";
+	     G4cout << G4std::setw(12) << "NotGiven" << " ";
        }
 
-       G4cout << endl;
+       G4cout << G4endl;
     }
 
     else // if( verboseLevel > 3 )
     {
        //  Multi-line output
        
-      // G4cout << "Current  Position is " << CurrentPosition << endl 
-      //    << " and UnitVelocity is " << CurrentUnitVelocity << endl;
+      // G4cout << "Current  Position is " << CurrentPosition << G4endl 
+      //    << " and UnitVelocity is " << CurrentUnitVelocity << G4endl;
        G4cout << "Step taken was " << step_len  
-	    << " out of PhysicalStep= " <<  requestStep << endl;
-       G4cout << "Final safety is: " << safety << endl;
+	    << " out of PhysicalStep= " <<  requestStep << G4endl;
+       G4cout << "Final safety is: " << safety << G4endl;
 
-       G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag() << endl;
-       G4cout << endl; 
+       G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag() << G4endl;
+       G4cout << G4endl; 
     }
 }
diff --git a/source/geometry/volumes/src/G4ReplicaNavigation.cc b/source/geometry/volumes/src/G4ReplicaNavigation.cc
index e01a886a71..c0a8506f12 100644
--- a/source/geometry/volumes/src/G4ReplicaNavigation.cc
+++ b/source/geometry/volumes/src/G4ReplicaNavigation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ReplicaNavigation.cc,v 1.1.10.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ReplicaNavigation.cc,v 1.2 1999/12/15 14:50:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4REplicaNavigation Implementation
diff --git a/source/geometry/volumes/src/G4TouchableHistory.cc b/source/geometry/volumes/src/G4TouchableHistory.cc
index 8317b66db2..ad70daa0ff 100644
--- a/source/geometry/volumes/src/G4TouchableHistory.cc
+++ b/source/geometry/volumes/src/G4TouchableHistory.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TouchableHistory.cc,v 1.2.2.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TouchableHistory.cc,v 1.3 1999/12/15 14:50:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4TouchableHistory Implementation
diff --git a/source/geometry/volumes/src/G4TransportationManager.cc b/source/geometry/volumes/src/G4TransportationManager.cc
index f5931cc7ce..5913c633b9 100644
--- a/source/geometry/volumes/src/G4TransportationManager.cc
+++ b/source/geometry/volumes/src/G4TransportationManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransportationManager.cc,v 1.4.2.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TransportationManager.cc,v 1.5 1999/12/15 14:50:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //  G4TransportationManager 
diff --git a/source/geometry/volumes/src/G4VoxelNavigation.cc b/source/geometry/volumes/src/G4VoxelNavigation.cc
index da3f83fc1c..8902cb9024 100644
--- a/source/geometry/volumes/src/G4VoxelNavigation.cc
+++ b/source/geometry/volumes/src/G4VoxelNavigation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VoxelNavigation.cc,v 1.3.8.1 1999/12/07 20:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VoxelNavigation.cc,v 1.4 1999/12/15 14:50:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // class G4VoxelNavigation Implementation
@@ -245,7 +245,7 @@ G4double G4VoxelNavigation::ComputeVoxelSafety(const G4ThreeVector&localPoint) c
 	else // (maxCurNodeNoDelta == minCurNodeNoDelta)
 	    	{
 		voxelSafety=minCurNodeNoDelta*curNodeWidth;
-		voxelSafety+=min(minCurCommonDelta,maxCurCommonDelta);
+		voxelSafety+=G4std::min(minCurCommonDelta,maxCurCommonDelta);
 	    	}
 
 // Compute isotropic safety to boundaries of previous levels
@@ -327,7 +327,7 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
 			maxVal=minVal+workNodeWidth;
 			if (maxVal<=workCoord-kCarTolerance*0.5)
 				{
-			        // G4cout << "Must consider next voxel" << endl;
+			        // G4cout << "Must consider next voxel" << G4endl;
 				newNodeNo=workNodeNo+1;
 				newHeader=workHeader;
 				newDistance=(maxVal-localPoint(workHeaderAxis))/localDirection(workHeaderAxis);
@@ -522,6 +522,6 @@ G4double G4VoxelNavigation::ComputeSafety(const G4ThreeVector &localPoint,
 G4VoxelNavigation::~G4VoxelNavigation()
 {
 #ifdef G4DEBUG_NAVIGATION
-  cout << "G4VoxelNavigation::~G4VoxelNavigation() called." << endl;
+  cout << "G4VoxelNavigation::~G4VoxelNavigation() called." << G4endl;
 #endif
 }
diff --git a/source/global/HEPGeometry/include/G4LorentzRotation.hh b/source/global/HEPGeometry/include/G4LorentzRotation.hh
index 93094e3d2c..4b9b65eb46 100644
--- a/source/global/HEPGeometry/include/G4LorentzRotation.hh
+++ b/source/global/HEPGeometry/include/G4LorentzRotation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LorentzRotation.hh,v 1.2 1999/11/16 17:29:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4LorentzRotation_hh
 #define G4LorentzRotation_hh
diff --git a/source/global/HEPGeometry/include/G4LorentzVector.hh b/source/global/HEPGeometry/include/G4LorentzVector.hh
index 4cc0af1391..c046058c4b 100644
--- a/source/global/HEPGeometry/include/G4LorentzVector.hh
+++ b/source/global/HEPGeometry/include/G4LorentzVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LorentzVector.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4LorentzVector_hh
 #define G4LorentzVector_hh
diff --git a/source/global/HEPGeometry/include/G4Normal3D.hh b/source/global/HEPGeometry/include/G4Normal3D.hh
index 16ce5c02b1..eedd283972 100644
--- a/source/global/HEPGeometry/include/G4Normal3D.hh
+++ b/source/global/HEPGeometry/include/G4Normal3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Normal3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NORMAL3D_HH
 #define G4NORMAL3D_HH
diff --git a/source/global/HEPGeometry/include/G4Plane3D.hh b/source/global/HEPGeometry/include/G4Plane3D.hh
index a54988e7df..8e3a10e7b3 100644
--- a/source/global/HEPGeometry/include/G4Plane3D.hh
+++ b/source/global/HEPGeometry/include/G4Plane3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Plane3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4PLANE3D_HH
 #define G4PLANE3D_HH
diff --git a/source/global/HEPGeometry/include/G4Point3D.hh b/source/global/HEPGeometry/include/G4Point3D.hh
index f43cf14b39..51d37ae486 100644
--- a/source/global/HEPGeometry/include/G4Point3D.hh
+++ b/source/global/HEPGeometry/include/G4Point3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Point3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4POINT3D_HH
 #define G4POINT3D_HH
diff --git a/source/global/HEPGeometry/include/G4Transform3D.hh b/source/global/HEPGeometry/include/G4Transform3D.hh
index c7a521ae3f..5f1b1e44a1 100644
--- a/source/global/HEPGeometry/include/G4Transform3D.hh
+++ b/source/global/HEPGeometry/include/G4Transform3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Transform3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4TRANSFORM3D_HH
 #define G4TRANSFORM3D_HH
diff --git a/source/global/HEPGeometry/include/G4Vector3D.hh b/source/global/HEPGeometry/include/G4Vector3D.hh
index b5d693c48b..99a273abed 100644
--- a/source/global/HEPGeometry/include/G4Vector3D.hh
+++ b/source/global/HEPGeometry/include/G4Vector3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Vector3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VECTOR3D_HH
 #define G4VECTOR3D_HH
diff --git a/source/global/HEPGeometry/include/geomdefs.hh b/source/global/HEPGeometry/include/geomdefs.hh
index 6420bcd7ef..644df406b8 100644
--- a/source/global/HEPGeometry/include/geomdefs.hh
+++ b/source/global/HEPGeometry/include/geomdefs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: geomdefs.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
index 8f20677c05..ac2d1e5656 100644
--- a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
+++ b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChebyshevApproximation.hh,v 1.2 1999/11/16 17:30:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4DataInterpolation.hh b/source/global/HEPNumerics/include/G4DataInterpolation.hh
index a282865d40..2c53e2bafd 100644
--- a/source/global/HEPNumerics/include/G4DataInterpolation.hh
+++ b/source/global/HEPNumerics/include/G4DataInterpolation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataInterpolation.hh,v 1.2 1999/11/16 17:30:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
index 5ba10dc0c2..4197fc9429 100644
--- a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussChebyshevQ.hh,v 1.2 1999/11/16 17:30:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
index 908599cc8d..764756687d 100644
--- a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussHermiteQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
index 61cca7660f..5cfe18cd21 100644
--- a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussJacobiQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
index 9257df2c00..ccf0665e89 100644
--- a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLaguerreQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
index 4b0ff2874a..dbb4fccbb5 100644
--- a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLegendreQ.hh,v 1.2 1999/11/16 17:30:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.hh b/source/global/HEPNumerics/include/G4Integrator.hh
index 1465a57369..f22e919bff 100644
--- a/source/global/HEPNumerics/include/G4Integrator.hh
+++ b/source/global/HEPNumerics/include/G4Integrator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Integrator.hh,v 1.3 1999/11/16 17:30:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.icc b/source/global/HEPNumerics/include/G4Integrator.icc
index 09abcf9ee0..09763556fd 100644
--- a/source/global/HEPNumerics/include/G4Integrator.icc
+++ b/source/global/HEPNumerics/include/G4Integrator.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Integrator.icc,v 1.4 1999/11/23 14:59:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation of G4Integrator methods. 
 //
diff --git a/source/global/HEPNumerics/include/G4SimpleIntegration.hh b/source/global/HEPNumerics/include/G4SimpleIntegration.hh
index 562fb2889d..aaf31923ed 100644
--- a/source/global/HEPNumerics/include/G4SimpleIntegration.hh
+++ b/source/global/HEPNumerics/include/G4SimpleIntegration.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleIntegration.hh,v 1.2 1999/11/16 17:30:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
index ced5cc5cef..48a3369b34 100644
--- a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
+++ b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGaussianQuadrature.hh,v 1.2 1999/11/16 17:30:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
index 70197fc0ae..113777ec25 100644
--- a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
+++ b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChebyshevApproximation.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4ChebyshevApproximation.hh"
diff --git a/source/global/HEPNumerics/src/G4DataInterpolation.cc b/source/global/HEPNumerics/src/G4DataInterpolation.cc
index d1790fe529..482a7314f0 100644
--- a/source/global/HEPNumerics/src/G4DataInterpolation.cc
+++ b/source/global/HEPNumerics/src/G4DataInterpolation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataInterpolation.cc,v 1.3 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4DataInterpolation.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
index 08e16d46a6..f5195cdd29 100644
--- a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussChebyshevQ.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussChebyshevQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
index 32a140b8f9..66d2940931 100644
--- a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussHermiteQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussHermiteQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
index ad3ea5958b..1ef1a654d3 100644
--- a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussJacobiQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussJacobiQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
index 022fe8e5b1..fae263cc7f 100644
--- a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLaguerreQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussLaguerreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
index 7732771b5f..8e4df297d5 100644
--- a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLegendreQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussLegendreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4SimpleIntegration.cc b/source/global/HEPNumerics/src/G4SimpleIntegration.cc
index a9075b37d3..8a7c19bb21 100644
--- a/source/global/HEPNumerics/src/G4SimpleIntegration.cc
+++ b/source/global/HEPNumerics/src/G4SimpleIntegration.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleIntegration.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation file for simple integration methods
 //
diff --git a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
index ba653eb1e8..ddc75c1374 100644
--- a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
+++ b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGaussianQuadrature.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation file for G4VGaussianQuadrature virtual base class
 //
diff --git a/source/global/HEPRandom/include/G4Poisson.hh b/source/global/HEPRandom/include/G4Poisson.hh
index ce3423ff75..ed1ff55fe5 100644
--- a/source/global/HEPRandom/include/G4Poisson.hh
+++ b/source/global/HEPRandom/include/G4Poisson.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Poisson.hh,v 1.4 1999/11/16 17:31:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Poisson.hh,v 1.5 2000/01/06 14:13:08 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -50,7 +50,7 @@ inline G4long G4Poisson(G4double mean)
   t = sqrt(-2*log(RandFlat::shoot()));
   y = twopi*RandFlat::shoot();
   t *= cos(y);
-  value = mean + t*sqrt(mean);
+  value = mean + t*sqrt(mean) + 0.5;
   if(value <= 0) {return 0;}
   if(value >= limit) { return G4long(limit);}
   return G4long(value);
diff --git a/source/global/HEPRandom/include/Randomize.hh b/source/global/HEPRandom/include/Randomize.hh
index fb0a52dd32..b5f93a52a4 100644
--- a/source/global/HEPRandom/include/Randomize.hh
+++ b/source/global/HEPRandom/include/Randomize.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Randomize.hh,v 1.2 1999/11/16 17:31:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef randomize_h
 #define randomize_h 1
diff --git a/source/global/HEPRandom/test/G4RandDistributionTest.cc b/source/global/HEPRandom/test/G4RandDistributionTest.cc
index 91d91f9982..b8ba0a786d 100644
--- a/source/global/HEPRandom/test/G4RandDistributionTest.cc
+++ b/source/global/HEPRandom/test/G4RandDistributionTest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RandDistributionTest.cc,v 1.3 1999/11/23 15:00:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/HEPRandom/test/G4RandGlobalTest.cc b/source/global/HEPRandom/test/G4RandGlobalTest.cc
index abb5d12de2..8f135c2a3a 100644
--- a/source/global/HEPRandom/test/G4RandGlobalTest.cc
+++ b/source/global/HEPRandom/test/G4RandGlobalTest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RandGlobalTest.cc,v 1.3 1999/11/23 15:00:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/HEPRandom/test/G4ShootBitTest.cc b/source/global/HEPRandom/test/G4ShootBitTest.cc
index 6850bfb17a..488c9da814 100644
--- a/source/global/HEPRandom/test/G4ShootBitTest.cc
+++ b/source/global/HEPRandom/test/G4ShootBitTest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ShootBitTest.cc,v 1.3 1999/11/23 15:00:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ShootBitTest.cc,v 1.4 1999/12/15 14:50:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -14,7 +14,7 @@
 // Peter Urban, 5th Sep 1996
 
 #include "G4ios.hh"
-#include "g4std/iomanip.h"
+#include "g4std/iomanip"
 #include "Randomize.hh"
 #include "G4Timer.hh"
 
diff --git a/source/global/History b/source/global/History
index 7370ae5f6c..41de3b2d57 100644
--- a/source/global/History
+++ b/source/global/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.35 1999/11/29 10:17:34 gcosmo Exp $
+$Id: History,v 1.41 2000/02/11 14:07:19 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,39 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+February 08, 2000 G.Cosmo (global-V01-00-03)
+- STLInterface/cstring.icc: fixed yet another bug in G4String::toUpper()
+  and G4String::toLower(). Loop over the string characters was causing
+  bounds overflow.
+- tpvector[.h.icc]: added resize(size_t) method which was missing!
+
+January 31, 2000 G.Cosmo (global-V01-00-02)
+- STLInterface: several fixes.
+  o Fixed bug in G4String::toUpper().
+    (bug was introduced inadvertently on 20-Oct-1999).
+  o Added checks for bound-overflows in G4RWTPtrSortedVector::find().
+  o Fixed bound-check for operators () and [] in most collections:
+    () access operators DO NOT perform bound-checking (except if G4DEBUG set);
+    [] access operators DO perform bound-checking.
+  o tpvector[.h.icc]: changed 'unsigned int' to 'size_t' in constructors.
+    Added 'rwsize' and bound-checking for operator[].
+  o tvvector.icc: added call to std_vector() in default constructor.
+  o tpordvec.icc: added std_pvector:: scope for calls to [] operator,
+    where missing.
+  o tvordvec.icc: added std_vector:: scope for calls to [] operator,
+    where missing.
+
+January 19, 2000 G.Cosmo (global-V01-00-01)
+- G4UnitsTable[.hh.cc]: added constructor to G4BestUnit for 3vectors (M.Maire).
+- globals.hh: added check on definition of CLHEP_MAX_MIN_DEFINED.
+
+January 3, 2000 G.Cosmo (global-V01-00-00)
+- Syncronized changes with HEAD (mainly CVS headers).
+- Fixed truncation problem in G4Poisson.hh.
+- Removed tphdict_test.cc and tvhdict_test.cc in STLInterface/test.
+- Added wrapper for HP-aCC for missing <fstream> standard header.
+- Removed G4USE_STL from globals.hh and G4Timer[.hh.cc].
+
 November 29, 99 G.Cosmo (global-V00-01-14)
 - Removed g4std/string wrapper since not anymore needed.
   It was previously made available only for Win/NT-VC++.
diff --git a/source/global/STLInterface/History b/source/global/STLInterface/History
index 64c6aa5e9e..a9c3b381b9 100644
--- a/source/global/STLInterface/History
+++ b/source/global/STLInterface/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 1999/11/29 10:17:36 gcosmo Exp $
+$Id: History,v 1.19 2000/02/11 14:08:38 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,26 @@ committal in the CVS repository !
 
                          STL Interface
                          -------------
+February 8, 00 G.Cosmo
+- cstring.icc: fixed yet another bug in G4String::toUpper() and
+  G4String::toLower(). Loop over the string characters was causing
+  bounds overflow.
+- tpvector[.h.icc]: added resize(size_t) method which was missing!
+
+January 28, 00 G.Cosmo (STLInterface-V01-00-00)
+- Fixed bug in G4String::toUpper().
+  (bug was introduced inadvertently on 20-Oct-1999).
+- Added checks for bound-overflows in G4RWTPtrSortedVector::find().
+- Fixed bound-check for operators () and [] in most collections:
+  () access operators DO NOT perform bound-checking (except if G4DEBUG set);
+  [] access operators DO perform bound-checking.
+- tpvector[.h.icc]: changed 'unsigned int' to 'size_t' in constructors.
+  Added 'rwsize' and bound-checking for operator[].
+- tvvector.icc: added call to std_vector() in default constructor.
+- tpordvec.icc: added std_pvector:: scope for calls to [] operator,
+  where missing.
+- tvordvec.icc: added std_vector:: scope for calls to [] operator,
+  where missing.
 
 November 29, 99 G.Cosmo
 - Removed references to g4std/string, now removed since not anymore
diff --git a/source/global/STLInterface/g4rw/cstring.h b/source/global/STLInterface/g4rw/cstring.h
index 79660afcc1..271b40c243 100644
--- a/source/global/STLInterface/g4rw/cstring.h
+++ b/source/global/STLInterface/g4rw/cstring.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: cstring.h,v 1.6 1999/11/29 10:17:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: cstring.h,v 1.7 1999/12/15 18:12:53 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -29,10 +29,7 @@
 #include <string>
 #include "G4Types.hh"
 #include "g4rw/defs.h"
-
-#ifdef __KCC
-  #include <istream>
-#endif
+#include "g4std/iostream"
 
 #ifdef WIN32
   #define strcasecmp _stricmp
diff --git a/source/global/STLInterface/g4rw/cstring.icc b/source/global/STLInterface/g4rw/cstring.icc
index c2b9bf4435..3c97f484d7 100644
--- a/source/global/STLInterface/g4rw/cstring.icc
+++ b/source/global/STLInterface/g4rw/cstring.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: cstring.icc,v 1.2 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: cstring.icc,v 1.4 2000/02/08 14:15:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -363,7 +363,7 @@ G4String G4String::strip (int stripType, char c)
 
 void G4String::toLower ( void )
 {
-  for (int i=0; i<=size();i++)
+  for (int i=0; i<size();i++)
   {
     //GB:HP-UX-aCC,Linux-KCC 
     std_string::operator[](i) = tolower(std_string::operator[](i));
@@ -373,10 +373,10 @@ void G4String::toLower ( void )
 
 void G4String::toUpper ( void )
 {
-  for (int i=0; i<=size();i++)
+  for (int i=0; i<size();i++)
   {
     //GB:HP-UX-aCC,Linux-KCC 
-    std_string::operator[](i) = tolower(std_string::operator[](i));
+    std_string::operator[](i) = toupper(std_string::operator[](i));
     //at(i) = toupper(at(i)); 
   }
 }
diff --git a/source/global/STLInterface/g4rw/ctoken.h b/source/global/STLInterface/g4rw/ctoken.h
index 99d608a603..885631c112 100644
--- a/source/global/STLInterface/g4rw/ctoken.h
+++ b/source/global/STLInterface/g4rw/ctoken.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ctoken.h,v 1.5 1999/11/29 10:17:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/defs.h b/source/global/STLInterface/g4rw/defs.h
index b7614d4422..554c1e1024 100644
--- a/source/global/STLInterface/g4rw/defs.h
+++ b/source/global/STLInterface/g4rw/defs.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: defs.h,v 1.7 1999/11/29 16:52:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rstream.h b/source/global/STLInterface/g4rw/rstream.h
index f4c4decdff..c1e016919d 100644
--- a/source/global/STLInterface/g4rw/rstream.h
+++ b/source/global/STLInterface/g4rw/rstream.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: rstream.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rw2stl_algo.h b/source/global/STLInterface/g4rw/rw2stl_algo.h
index 5a14d7f915..0ebb840b3e 100644
--- a/source/global/STLInterface/g4rw/rw2stl_algo.h
+++ b/source/global/STLInterface/g4rw/rw2stl_algo.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: rw2stl_algo.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.h b/source/global/STLInterface/g4rw/tpordvec.h
index c261a14c21..8a2159c8bc 100644
--- a/source/global/STLInterface/g4rw/tpordvec.h
+++ b/source/global/STLInterface/g4rw/tpordvec.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpordvec.h,v 1.7 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.icc b/source/global/STLInterface/g4rw/tpordvec.icc
index bc8378dc09..c425329ab7 100644
--- a/source/global/STLInterface/g4rw/tpordvec.icc
+++ b/source/global/STLInterface/g4rw/tpordvec.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpordvec.icc,v 1.1 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpordvec.icc,v 1.2 2000/02/01 16:55:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -38,17 +38,23 @@ G4RWTPtrOrderedVector<T>::operator=(const G4RWTPtrOrderedVector<T>& v)
 template<class T >
 T*& G4RWTPtrOrderedVector<T>::operator()(size_t i) 
 {
-  //if(i>=rwsize)
-  //	G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector ()",rwsize,i));
-  if(i<std_pvector::size() && rwsize<=i) rwsize=i+1;
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_pvector::size())
+    rwsize=i+1;
   return std_pvector::operator[](i); 
 }
 
 template<class T >
 T* const& G4RWTPtrOrderedVector<T>::operator()(size_t i) const
 { 
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const ()",rwsize,i));
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
+  #endif
   return std_pvector::operator[](i); 
 }
 
@@ -57,7 +63,6 @@ T*& G4RWTPtrOrderedVector<T>::operator[](size_t i)
 {
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
-  //if(i<std_pvector::size() && rwsize<=i) rwsize=i+1;
   return std_pvector::operator[](i); 
 }
 
@@ -66,7 +71,7 @@ T* const& G4RWTPtrOrderedVector<T>::operator[](size_t i) const
 {      
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const []",rwsize,i));
-   return std_pvector::operator[](i); 
+  return std_pvector::operator[](i); 
 }
 
 template<class T >
@@ -199,7 +204,7 @@ T* G4RWTPtrOrderedVector<T>::removeAt( size_t i )
   for(j=0;j<rwsize && j<i;j++) it++;
   if(it!=std_pvector::end())
     {
-      T* tmp = operator[](i);
+      T* tmp = std_pvector::operator[](i);
       std_pvector::erase(it);
       rwsize--;
       return tmp;
@@ -313,7 +318,7 @@ T*& G4RWTPtrOrderedVector<T>::at ( size_t i )
 { 
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector at",rwsize,i));
-  return operator()(i); 
+  return std_pvector::operator[](i); 
 }
 
 template<class T>
@@ -321,7 +326,7 @@ T*const& G4RWTPtrOrderedVector<T>::at ( size_t i ) const
 {       
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const at",rwsize,i));
-  return operator()(i); 
+  return std_pvector::operator[](i); 
 }
 
 template<class T>
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.h b/source/global/STLInterface/g4rw/tpsrtvec.h
index f9d88977cd..2dac54e962 100644
--- a/source/global/STLInterface/g4rw/tpsrtvec.h
+++ b/source/global/STLInterface/g4rw/tpsrtvec.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpsrtvec.h,v 1.8 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.icc b/source/global/STLInterface/g4rw/tpsrtvec.icc
index e21532354d..d385337e98 100644
--- a/source/global/STLInterface/g4rw/tpsrtvec.icc
+++ b/source/global/STLInterface/g4rw/tpsrtvec.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpsrtvec.icc,v 1.2 1999/11/25 13:41:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpsrtvec.icc,v 1.3 2000/02/01 16:55:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -50,6 +50,10 @@ T* const& G4RWTPtrSortedVector<T>::operator [] (size_t n) const
 template<class T>
 T* const& G4RWTPtrSortedVector<T>::operator () (size_t n) const
 {
+  #ifdef G4DEBUG
+    if(n>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrSortedVector",rwsize,n));
+  #endif
   return std_pvector::operator[](n);
 }
 
@@ -58,8 +62,6 @@ T*& G4RWTPtrSortedVector<T>::at(size_t n )
 {
   if(n>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTPtrSortedVector",rwsize,n));
-  if(n<std_pvector::size() && rwsize<=n)
-    rwsize=n+1;
   return std_pvector::operator[](n);
 }
 
@@ -91,7 +93,7 @@ void G4RWTPtrSortedVector<T>::clearAndDestroy ()
 template<class T>
 T* G4RWTPtrSortedVector<T>::find (const T* a) const
 {
-  if(!a || std_pvector::empty()) return 0;
+  if(!a || std_pvector::empty() || (rwsize==0)) return 0;
   //We are sorted, so try a n log n search
   int t,d;
   int u=rwsize,l=0;
@@ -107,7 +109,7 @@ T* G4RWTPtrSortedVector<T>::find (const T* a) const
     }
   while(d>0);
     
-  if(*(*this)[u]==*a)
+  if ((u<rwsize) && (*(*this)[u]==*a))
     return (*this)[u];
   else
     return 0;
diff --git a/source/global/STLInterface/g4rw/tpvector.h b/source/global/STLInterface/g4rw/tpvector.h
index 765b23a140..fd1eaec377 100644
--- a/source/global/STLInterface/g4rw/tpvector.h
+++ b/source/global/STLInterface/g4rw/tpvector.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpvector.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpvector.h,v 1.9 2000/02/11 14:09:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -39,8 +39,8 @@ class G4RWTPtrVector : public G4std::vector<T*>
 public:
 
   G4RWTPtrVector ();
-  G4RWTPtrVector (unsigned int);
-  G4RWTPtrVector (unsigned int, T* const &);
+  G4RWTPtrVector (size_t);
+  G4RWTPtrVector (size_t, T* const &);
   G4RWTPtrVector (const G4RWTPtrVector<T>&);
   virtual ~G4RWTPtrVector();
 
@@ -54,6 +54,11 @@ public:
   inline T* const * data() const;
   inline size_t length();
   inline void reshape(size_t);
+  void resize(size_t);
+
+private:
+
+  size_t rwsize;
 
 };
 
diff --git a/source/global/STLInterface/g4rw/tpvector.icc b/source/global/STLInterface/g4rw/tpvector.icc
index 105fa38def..9ab57941cc 100644
--- a/source/global/STLInterface/g4rw/tpvector.icc
+++ b/source/global/STLInterface/g4rw/tpvector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpvector.icc,v 1.4 1999/11/25 10:14:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpvector.icc,v 1.6 2000/02/11 14:09:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -17,19 +17,19 @@
 
 template<class T>
 G4RWTPtrVector<T>::G4RWTPtrVector ()
-  : std_pvector(){}
+  : std_pvector(), rwsize(0){}
 
 template<class T>
-G4RWTPtrVector<T>::G4RWTPtrVector (unsigned int n)
-  : std_pvector(n){}
+G4RWTPtrVector<T>::G4RWTPtrVector (size_t n)
+  : std_pvector(n), rwsize(n){}
 
 template<class T>
-G4RWTPtrVector<T>::G4RWTPtrVector (unsigned int n, T* const & iPtr)
-  : std_pvector(n, iPtr){}
+G4RWTPtrVector<T>::G4RWTPtrVector (size_t n, T* const & iPtr)
+  : std_pvector(n, iPtr), rwsize(n){}
 
 template<class T>
 G4RWTPtrVector<T>::G4RWTPtrVector (const G4RWTPtrVector<T>& iPtr)
-  : std_pvector(iPtr){}
+  : std_pvector(iPtr), rwsize(iPtr.rwsize){}
 
 template<class T>
 G4RWTPtrVector<T>::~G4RWTPtrVector(){}
@@ -37,9 +37,10 @@ G4RWTPtrVector<T>::~G4RWTPtrVector(){}
 template<class T>
 G4RWTPtrVector<T>& G4RWTPtrVector<T>::operator = (T* p)
 {
+  rwsize=0;
   for(iterator i = std_pvector::begin(); i != std_pvector::end(); ++i)
     {
-      *i = p;
+      *i = p; rwsize++;
     }
   return *this;
 }
@@ -47,12 +48,23 @@ G4RWTPtrVector<T>& G4RWTPtrVector<T>::operator = (T* p)
 template<class T>
 T* G4RWTPtrVector<T>::operator () ( size_t n ) const
 {
+  #ifdef G4DEBUG
+    if(n>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector operator()",rwsize,n));
+  #endif
   return std_pvector::operator[](n);
 }
 
 template<class T>
 T*& G4RWTPtrVector<T>::operator () ( size_t n )
 {
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(n>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector operator()",rwsize,n));
+  // #endif
+  if(rwsize<=n && n<std_pvector::size())
+    rwsize=n+1;
   return std_pvector::operator[](n);
 }
 
@@ -61,12 +73,16 @@ T*& G4RWTPtrVector<T>::operator () ( size_t n )
 template<class T>
 T* G4RWTPtrVector<T>::operator [] ( size_t n ) const
 {
+  if(n>=rwsize)
+    G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector",rwsize,n));
   return std_pvector::operator[](n);
 }
 
 template<class T>
 T*& G4RWTPtrVector<T>::operator [] ( size_t n )
 {
+  if(n>=rwsize)
+    G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector",rwsize,n));
   return std_pvector::operator[](n);
 }
 
@@ -82,8 +98,25 @@ size_t G4RWTPtrVector<T>::length()
   return std_pvector::size();
 }
 
+template<class T>
+void G4RWTPtrVector<T>::resize ( size_t n )
+{
+  if(n>std_pvector::size())
+    {
+      int e=n-std_pvector::size();
+      for(int i=0;i<e;i++)
+        std_pvector::push_back(0);
+    }
+  else
+    {
+      std_pvector::resize(n);
+    }
+  rwsize=n;
+}
+
 template<class T>
 void G4RWTPtrVector<T>::reshape( size_t n )
 {
   std_pvector::resize(n);
+  rwsize=n;
 }
diff --git a/source/global/STLInterface/g4rw/tvordvec.h b/source/global/STLInterface/g4rw/tvordvec.h
index 395b60af0e..a9ee1eb87f 100644
--- a/source/global/STLInterface/g4rw/tvordvec.h
+++ b/source/global/STLInterface/g4rw/tvordvec.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvordvec.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvordvec.icc b/source/global/STLInterface/g4rw/tvordvec.icc
index c3e06ced60..7ccfa52ca5 100644
--- a/source/global/STLInterface/g4rw/tvordvec.icc
+++ b/source/global/STLInterface/g4rw/tvordvec.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tvordvec.icc,v 1.1 1999/11/25 10:14:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tvordvec.icc,v 1.2 2000/02/01 16:55:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -38,9 +38,12 @@ G4RWTValOrderedVector<T>::operator=(const G4RWTValOrderedVector<T>& v)
 template<class T>
 T& G4RWTValOrderedVector<T>::operator()(size_t i)
 {
-  //if(i>=rwsize)
-  //  G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector ()",rwsize,i));
-  if(i<std_vector::size() && rwsize<=i)
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector ()",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_vector::size())
     rwsize=i+1;
   return std_vector::operator[](i); 
 }
@@ -48,8 +51,10 @@ T& G4RWTValOrderedVector<T>::operator()(size_t i)
 template<class T>
 const T& G4RWTValOrderedVector<T>::operator()(size_t i) const
 { 
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const()",rwsize,i));
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const()",rwsize,i));
+  #endif
   return std_vector::operator[](i);
 }
 
@@ -58,8 +63,6 @@ T& G4RWTValOrderedVector<T>::operator[](size_t i)
 {
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector []",rwsize,i));
-  //if(i<std_vector::size() && rwsize<=i)
-  //  rwsize=i+1;
   return std_vector::operator[](i); 
 }
 
@@ -76,7 +79,7 @@ T& G4RWTValOrderedVector<T>::at(size_t n)
 {
   if(n>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector at",rwsize,n));
-  return operator()(n);
+  return std_vector::operator[](n);
 }
 
 template<class T>
@@ -84,7 +87,7 @@ T  G4RWTValOrderedVector<T>::at(size_t n ) const
 {
   if(n>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const at",rwsize,n));
-  return operator()(n);
+  return std_vector::operator[](n);
 }
 
 template<class T>
@@ -199,7 +202,7 @@ T G4RWTValOrderedVector<T>::removeAt( size_t i )
 {
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector removeAt",rwsize,i));
-  T tmp = operator[](i);
+  T tmp = std_vector::operator[](i);
   iterator it=std_vector::begin();
   int j;
   for(j=0;j<rwsize && j<i;j++) it++;
diff --git a/source/global/STLInterface/g4rw/tvvector.h b/source/global/STLInterface/g4rw/tvvector.h
index b4452c3b78..eedc637658 100644
--- a/source/global/STLInterface/g4rw/tvvector.h
+++ b/source/global/STLInterface/g4rw/tvvector.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvvector.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvvector.icc b/source/global/STLInterface/g4rw/tvvector.icc
index 28b8104884..69010b3edb 100644
--- a/source/global/STLInterface/g4rw/tvvector.icc
+++ b/source/global/STLInterface/g4rw/tvvector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tvvector.icc,v 1.1 1999/11/25 10:14:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tvvector.icc,v 1.2 2000/02/01 16:55:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -17,7 +17,7 @@
 
 template<class T>
 G4RWTValVector<T>::G4RWTValVector ()
-  : rwsize(0){}
+  : std_vector(), rwsize(0){}
 
 template<class T>
 G4RWTValVector<T>::G4RWTValVector (size_t n)
@@ -52,9 +52,12 @@ size_t G4RWTValVector<T>::length() const
 template<class T>
 T& G4RWTValVector<T>::operator()(size_t i) 
 {
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
-  if(i<std_vector::size() && rwsize<i)
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_vector::size())
     rwsize=i+1;
   return std_vector::operator[](i); 
 }
@@ -62,6 +65,10 @@ T& G4RWTValVector<T>::operator()(size_t i)
 template<class T>
 const T& G4RWTValVector<T>::operator()(size_t i) const
 {
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
+  #endif
   return std_vector::operator[](i);
 }
 
@@ -70,8 +77,6 @@ T& G4RWTValVector<T>::operator[](size_t i)
 {
   if(i>=rwsize)
     G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator[]",rwsize,i));
-  if(i<std_vector::size() && rwsize<i)
-    rwsize=i+1;
   return std_vector::operator[](i); 
 }
 
diff --git a/source/global/STLInterface/wrappers/HP-aCC/fstream b/source/global/STLInterface/wrappers/HP-aCC/fstream
new file mode 100644
index 0000000000..0efc56168a
--- /dev/null
+++ b/source/global/STLInterface/wrappers/HP-aCC/fstream
@@ -0,0 +1 @@
+#include <fstream.h>
diff --git a/source/global/management/include/G4Allocator.hh b/source/global/management/include/G4Allocator.hh
index fa15d76205..863d118ccd 100644
--- a/source/global/management/include/G4Allocator.hh
+++ b/source/global/management/include/G4Allocator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Allocator.hh,v 1.3 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4AllocatorPage.hh b/source/global/management/include/G4AllocatorPage.hh
index 383f7bba4f..95edc4bf57 100644
--- a/source/global/management/include/G4AllocatorPage.hh
+++ b/source/global/management/include/G4AllocatorPage.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AllocatorPage.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4AllocatorUnit.hh b/source/global/management/include/G4AllocatorUnit.hh
index d775c92a87..5ee038c2e5 100644
--- a/source/global/management/include/G4AllocatorUnit.hh
+++ b/source/global/management/include/G4AllocatorUnit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AllocatorUnit.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4DataVector.hh b/source/global/management/include/G4DataVector.hh
index b5043ba018..18d40dc3b4 100644
--- a/source/global/management/include/G4DataVector.hh
+++ b/source/global/management/include/G4DataVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataVector.hh,v 1.4 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4FastVector.hh b/source/global/management/include/G4FastVector.hh
index c2dbb791da..2537a0e52f 100644
--- a/source/global/management/include/G4FastVector.hh
+++ b/source/global/management/include/G4FastVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastVector.hh,v 1.3 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4LPhysicsFreeVector.hh b/source/global/management/include/G4LPhysicsFreeVector.hh
index 033e6f6d22..022b9cb3fd 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.hh
+++ b/source/global/management/include/G4LPhysicsFreeVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.hh,v 1.2 1999/11/16 17:40:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------
diff --git a/source/global/management/include/G4LPhysicsFreeVector.icc b/source/global/management/include/G4LPhysicsFreeVector.icc
index bcd78ce391..b1ef03d774 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.icc
+++ b/source/global/management/include/G4LPhysicsFreeVector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.icc,v 1.2 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------
diff --git a/source/global/management/include/G4OrderedTable.hh b/source/global/management/include/G4OrderedTable.hh
index 568270b8bb..15b2092584 100644
--- a/source/global/management/include/G4OrderedTable.hh
+++ b/source/global/management/include/G4OrderedTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OrderedTable.hh,v 1.4 1999/11/16 17:40:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsFreeVector.hh b/source/global/management/include/G4PhysicsFreeVector.hh
index 281063a1d8..5eb8ee22b8 100644
--- a/source/global/management/include/G4PhysicsFreeVector.hh
+++ b/source/global/management/include/G4PhysicsFreeVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsFreeVector.hh,v 1.2 1999/11/16 17:40:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsLinearVector.hh b/source/global/management/include/G4PhysicsLinearVector.hh
index 154f7d46cf..61ec2153cb 100644
--- a/source/global/management/include/G4PhysicsLinearVector.hh
+++ b/source/global/management/include/G4PhysicsLinearVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLinearVector.hh,v 1.2 1999/11/16 17:40:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsLogVector.hh b/source/global/management/include/G4PhysicsLogVector.hh
index 4797d4be33..8d52de6b1f 100644
--- a/source/global/management/include/G4PhysicsLogVector.hh
+++ b/source/global/management/include/G4PhysicsLogVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLogVector.hh,v 1.2 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.hh b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
index 9483a59c3f..c0dd18fcb7 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.hh
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.hh,v 1.3 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Definition
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.icc b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
index c7fc4f557a..9fd8baa542 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.icc
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.icc,v 1.2 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Inline Functions Definitions
diff --git a/source/global/management/include/G4PhysicsTable.hh b/source/global/management/include/G4PhysicsTable.hh
index e2ea23b7ce..bc4f8e640c 100644
--- a/source/global/management/include/G4PhysicsTable.hh
+++ b/source/global/management/include/G4PhysicsTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsTable.hh,v 1.3 1999/11/16 17:40:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsVector.hh b/source/global/management/include/G4PhysicsVector.hh
index 9698b128c2..1d5a0acc08 100644
--- a/source/global/management/include/G4PhysicsVector.hh
+++ b/source/global/management/include/G4PhysicsVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.hh,v 1.3 1999/11/16 17:40:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsVector.icc b/source/global/management/include/G4PhysicsVector.icc
index 76eedc600c..7b879df3f1 100644
--- a/source/global/management/include/G4PhysicsVector.icc
+++ b/source/global/management/include/G4PhysicsVector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.icc,v 1.1 1999/11/16 17:40:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/include/G4RotationMatrix.hh b/source/global/management/include/G4RotationMatrix.hh
index 57778ce98e..bdb5a3fbcb 100644
--- a/source/global/management/include/G4RotationMatrix.hh
+++ b/source/global/management/include/G4RotationMatrix.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RotationMatrix.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4ThreeVector.hh b/source/global/management/include/G4ThreeVector.hh
index 6b835917c1..7061db92cb 100644
--- a/source/global/management/include/G4ThreeVector.hh
+++ b/source/global/management/include/G4ThreeVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ThreeVector.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4Timer.hh b/source/global/management/include/G4Timer.hh
index ee9b6935f4..5393c9f3a5 100644
--- a/source/global/management/include/G4Timer.hh
+++ b/source/global/management/include/G4Timer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Timer.hh,v 1.8 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Timer.hh,v 1.10 2000/01/06 14:27:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -17,6 +17,8 @@
 // Class for timer objects, able to measure elasped user/system process time.
 //
 // Note: Uses <sys/times.h> & <unistd.h> - POSIX.1 defined
+//       If used, this header must be included in the source (.cc) file and it
+//       must be the first header file to be included!
 //
 // Member functions:
 //
@@ -37,7 +39,7 @@
 //
 // Operators:
 //
-// ostream& operator << (ostream& os, const G4Timer& t);
+// G4std::ostream& operator << (G4std::ostream& os, const G4Timer& t);
 //   Print the elapsed real,system and usertimes on os. Prints **s for times
 //   if !IsValid
 //
@@ -125,9 +127,7 @@ inline G4bool G4Timer::IsValid() const
     return fValidTimes;
 }
 
-#ifdef G4USE_STL
-  #define times ostimes
-#endif
+#define times ostimes
 
 #endif
 
diff --git a/source/global/management/include/G4Types.hh b/source/global/management/include/G4Types.hh
index 744c654e59..56c29b81d8 100644
--- a/source/global/management/include/G4Types.hh
+++ b/source/global/management/include/G4Types.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Types.hh,v 1.3 1999/11/16 17:40:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Types.hh,v 1.4 1999/12/15 18:05:19 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 native types
@@ -16,6 +16,12 @@
 #ifndef G4TYPES_HH
 #define G4TYPES_HH
 
+
+#ifdef WIN32
+// Disable warning C4786: identifier was truncated to '255' characters in the debug information
+  #pragma warning ( disable : 4786 )
+#endif
+
 #include <CLHEP/config/CLHEP.h>
 
 // Define G4std namespace for standard std.
diff --git a/source/global/management/include/G4UnitsTable.hh b/source/global/management/include/G4UnitsTable.hh
index 47b1a73a1b..a568ebdc0f 100644
--- a/source/global/management/include/G4UnitsTable.hh
+++ b/source/global/management/include/G4UnitsTable.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTable.hh,v 1.7 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UnitsTable.hh,v 1.9 2000/01/19 11:16:46 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -----------------------------------------------------------------
@@ -16,6 +16,7 @@
 //
 // 17-05-98: first version, M.Maire
 // 13-10-98: Units and symbols printed in fixed length
+// 18-01-00: BestUnit for three vector
 
 // Class description:
 //
@@ -35,6 +36,7 @@
 
 #include "globals.hh"
 #include "g4rw/tpordvec.h"
+#include "G4ThreeVector.hh"
 
 class G4UnitsCategory;
 typedef G4RWTPtrOrderedVector<G4UnitsCategory> G4UnitsTable;
@@ -132,8 +134,9 @@ class G4BestUnit
 {
 public:  // with description
 
-    G4BestUnit(G4double internalValue, G4String category);
-    // This constructor converts a physical quantity from its internalValue
+    G4BestUnit(G4double      internalValue, G4String category);
+    G4BestUnit(const G4ThreeVector& internalValue, G4String category);    
+    // These constructors convert a physical quantity from its internalValue
     // into the most appropriate unit of the same category.
     // In practice it builds an object VU = (newValue, newUnit)
     
@@ -141,9 +144,9 @@ public:  // with description
    
 public:  // without description
 
-    G4double  GetValue()           {return Value;};
-    G4String  GetCategory()        {return Category;};
-    size_t    GetIndexOfCategory() {return IndexOfCategory;};
+    G4double*  GetValue()           {return Value;};
+    G4String   GetCategory()        {return Category;};
+    size_t     GetIndexOfCategory() {return IndexOfCategory;};
     
 public:  // with description 
    
@@ -153,9 +156,10 @@ public:  // with description
 
 private:
 
-    G4double   Value;        // value in the internal system of units
-    G4String   Category;     // dimensional family: Length,Volume,Energy ...
-    size_t IndexOfCategory;  // position of Category in UnitsTable
+    G4double   Value[3];        // value in the internal system of units
+    G4int      nbOfVals;        // G4double=1; G4ThreeVector=3
+    G4String   Category;        // dimensional family: Length,Volume,Energy ...
+    size_t IndexOfCategory;     // position of Category in UnitsTable
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/source/global/management/include/G4UnitsTest.hh b/source/global/management/include/G4UnitsTest.hh
index ad3ead1444..301de23352 100644
--- a/source/global/management/include/G4UnitsTest.hh
+++ b/source/global/management/include/G4UnitsTest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UnitsTest.hh,v 1.4 1999/11/19 09:19:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/G4UserLimits.hh b/source/global/management/include/G4UserLimits.hh
index 0b668ceb60..1bd181e118 100644
--- a/source/global/management/include/G4UserLimits.hh
+++ b/source/global/management/include/G4UserLimits.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserLimits.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 //
 // class G4UserLimits
diff --git a/source/global/management/include/G4UserLimits.icc b/source/global/management/include/G4UserLimits.icc
index 947d34b76a..8f8e837d9f 100644
--- a/source/global/management/include/G4UserLimits.icc
+++ b/source/global/management/include/G4UserLimits.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserLimits.icc,v 1.3 1999/11/22 15:12:45 maire Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/global/management/include/G4coutDestination.hh b/source/global/management/include/G4coutDestination.hh
index 65e6936d78..e8a06d27cf 100644
--- a/source/global/management/include/G4coutDestination.hh
+++ b/source/global/management/include/G4coutDestination.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4coutDestination.hh,v 1.2 1999/11/16 17:40:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4ios.hh b/source/global/management/include/G4ios.hh
index 39d8c08a26..0a12a4e2a6 100644
--- a/source/global/management/include/G4ios.hh
+++ b/source/global/management/include/G4ios.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ios.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ios.hh,v 1.5 1999/12/15 18:05:18 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -18,6 +18,8 @@
 #ifndef included_G4ios
 #define included_G4ios
 
+#include "G4Types.hh"
+
 #if defined(OO_DDL_TRANSLATION)
 /*
  * stdlib needs to be included before iostream.h
@@ -29,7 +31,6 @@
 #endif
 
 #include "g4std/iostream"
-#include "G4Types.hh"
 
 extern G4std::ostream G4cout;
 extern G4std::ostream G4cerr;
diff --git a/source/global/management/include/G4strstreambuf.hh b/source/global/management/include/G4strstreambuf.hh
index 351993e2ea..7498bdf272 100644
--- a/source/global/management/include/G4strstreambuf.hh
+++ b/source/global/management/include/G4strstreambuf.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4strstreambuf.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4strstreambuf.hh,v 1.6 1999/12/16 08:15:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/PhysicalConstants.h b/source/global/management/include/PhysicalConstants.h
index e8650bc0d4..74b4749ab9 100644
--- a/source/global/management/include/PhysicalConstants.h
+++ b/source/global/management/include/PhysicalConstants.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PhysicalConstants.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/SystemOfUnits.h b/source/global/management/include/SystemOfUnits.h
index ef5331ab34..efc30d3b36 100644
--- a/source/global/management/include/SystemOfUnits.h
+++ b/source/global/management/include/SystemOfUnits.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: SystemOfUnits.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/g4std/algorithm b/source/global/management/include/g4std/algorithm
index ab13efae58..15bd216fde 100644
--- a/source/global/management/include/g4std/algorithm
+++ b/source/global/management/include/g4std/algorithm
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: algorithm,v 1.3 1999/11/16 17:42:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- algorithm ----------------
 //
diff --git a/source/global/management/include/g4std/fstream b/source/global/management/include/g4std/fstream
index 09758ffd02..035b33c5bb 100644
--- a/source/global/management/include/g4std/fstream
+++ b/source/global/management/include/g4std/fstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: fstream,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- fstream ----------------
 //
diff --git a/source/global/management/include/g4std/functional b/source/global/management/include/g4std/functional
index 7f5c38118f..eaf93fca0f 100644
--- a/source/global/management/include/g4std/functional
+++ b/source/global/management/include/g4std/functional
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: functional,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- functional ----------------
 //
diff --git a/source/global/management/include/g4std/iomanip b/source/global/management/include/g4std/iomanip
index e7af3c71fa..e2cccbe569 100644
--- a/source/global/management/include/g4std/iomanip
+++ b/source/global/management/include/g4std/iomanip
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iomanip,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- iomanip ----------------
 //
diff --git a/source/global/management/include/g4std/iostream b/source/global/management/include/g4std/iostream
index 8b1c7fef01..7a5b12617a 100644
--- a/source/global/management/include/g4std/iostream
+++ b/source/global/management/include/g4std/iostream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iostream,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- iostream ----------------
 //
diff --git a/source/global/management/include/g4std/map b/source/global/management/include/g4std/map
index a1c9d07b8a..403b7365a6 100644
--- a/source/global/management/include/g4std/map
+++ b/source/global/management/include/g4std/map
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: map,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- map ----------------
 //
diff --git a/source/global/management/include/g4std/set b/source/global/management/include/g4std/set
index 11be92b7ae..72f282c2ea 100644
--- a/source/global/management/include/g4std/set
+++ b/source/global/management/include/g4std/set
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: set,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- set ----------------
 //
diff --git a/source/global/management/include/g4std/streambuf b/source/global/management/include/g4std/streambuf
index 8fd6c903f3..e28a821d22 100644
--- a/source/global/management/include/g4std/streambuf
+++ b/source/global/management/include/g4std/streambuf
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: streambuf,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- streambuf ----------------
 //
diff --git a/source/global/management/include/g4std/strstream b/source/global/management/include/g4std/strstream
index dd8fb24a05..7f77dadacb 100644
--- a/source/global/management/include/g4std/strstream
+++ b/source/global/management/include/g4std/strstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: strstream,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- strstream ----------------
 //
diff --git a/source/global/management/include/g4std/vector b/source/global/management/include/g4std/vector
index 831df9851e..9a53fd18e5 100644
--- a/source/global/management/include/g4std/vector
+++ b/source/global/management/include/g4std/vector
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: vector,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- vector ----------------
 //
diff --git a/source/global/management/include/globals.hh b/source/global/management/include/globals.hh
index 53479becf6..5301d3dab3 100644
--- a/source/global/management/include/globals.hh
+++ b/source/global/management/include/globals.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: globals.hh,v 1.11 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: globals.hh,v 1.15 2000/01/19 11:12:44 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Global Constants and typedefs
@@ -19,10 +19,10 @@
 // 29.11.96 G.Cosmo - Added typedef of HepBoolean to G4bool
 // 22.10.97 M.Maire - Moved PhysicalConstants at the end of the file
 // 04.12.97 G.Cosmo,E.Tcherniaev - Migrated to CLHEP
-// 05.06.98 M.Maire - temporary (for alpha07) restore G4 system of units 
-// 26.08.98 J.Allison,E.Tcherniaev - introduced min/max/sqr/abs functions
-// 22.09.98 G.Cosmo - removed min/max/sqr/abs functions and replaced with
+// 26.08.98 J.Allison,E.Tcherniaev - Introduced min/max/sqr/abs functions
+// 22.09.98 G.Cosmo - Removed min/max/sqr/abs functions and replaced with
 //                    inclusion of CLHEP/config/TemplateFunctions.h for CLHEP-1.3
+// 15.12.99 G.Gracia - Included min, max definitions for NT with ISO standard
 
 #ifndef GLOBALS_HH
 #define GLOBALS_HH
@@ -32,22 +32,30 @@
 // Undefine possible existing min/max/sqr/abs macros first
 // (temporary solution)
 #ifdef min
-#undef min
+  #undef min
 #endif
 #ifdef max
-#undef max
+  #undef max
 #endif
 #ifdef sqr
-#undef sqr
+  #undef sqr
 #endif
 #ifdef abs
-#undef abs
+  #undef abs
 #endif
 
-#ifdef G4USE_STL
-  #include "g4std/algorithm"
+#include "g4std/algorithm"
+#ifndef CLHEP_MAX_MIN_DEFINED
   #define CLHEP_MAX_MIN_DEFINED
 #endif
+
+#if defined(WIN32) && defined(G4USE_STD_NAMESPACE)
+// For NT with Native STL (used in ISO standard mode)
+// templated functions min and max should be _MIN _MAX
+  #define min _MIN
+  #define max _MAX
+#endif
+
 // min, max, abs and sqr are in TemplateFunctions.h.
 // Includes also CLHEP.h with typedef for numeric types and
 // implicit inclusions of <stdlib.h>, <limits.h>, <math.h>.
@@ -73,10 +81,8 @@
 
 // Global error function
 void G4Exception(const char* s=0);
-#ifdef G4USE_STL
-  void G4Exception(G4std::string s);
-  void G4Exception(G4String s);
-#endif
+void G4Exception(G4std::string s);
+void G4Exception(G4String s);
 
 #endif /* GLOBALS_HH */
 
diff --git a/source/global/management/include/templates.hh b/source/global/management/include/templates.hh
index a2b0a7718c..a73fd63c9a 100644
--- a/source/global/management/include/templates.hh
+++ b/source/global/management/include/templates.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: templates.hh,v 1.3 1999/11/16 17:40:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: templates.hh,v 1.5 2000/01/03 11:39:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -*- C++ -*-
diff --git a/source/global/management/src/G4Exception.cc b/source/global/management/src/G4Exception.cc
index 40cf0177eb..58bf645a8a 100644
--- a/source/global/management/src/G4Exception.cc
+++ b/source/global/management/src/G4Exception.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Exception.cc,v 1.8 1999/11/29 10:17:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/src/G4LPhysicsFreeVector.cc b/source/global/management/src/G4LPhysicsFreeVector.cc
index 0b2b7fe46a..3f1217d1a8 100644
--- a/source/global/management/src/G4LPhysicsFreeVector.cc
+++ b/source/global/management/src/G4LPhysicsFreeVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.cc,v 1.2 1999/11/16 17:46:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsFreeVector.cc b/source/global/management/src/G4PhysicsFreeVector.cc
index abc31f0e2b..32cc16d65d 100644
--- a/source/global/management/src/G4PhysicsFreeVector.cc
+++ b/source/global/management/src/G4PhysicsFreeVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsFreeVector.cc,v 1.2 1999/11/16 17:46:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsLinearVector.cc b/source/global/management/src/G4PhysicsLinearVector.cc
index 9878689850..02c489e0f0 100644
--- a/source/global/management/src/G4PhysicsLinearVector.cc
+++ b/source/global/management/src/G4PhysicsLinearVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLinearVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsLogVector.cc b/source/global/management/src/G4PhysicsLogVector.cc
index 968fc34a18..9de7baf05e 100644
--- a/source/global/management/src/G4PhysicsLogVector.cc
+++ b/source/global/management/src/G4PhysicsLogVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLogVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsOrderedFreeVector.cc b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
index 8afa145cff..59aaaa0622 100644
--- a/source/global/management/src/G4PhysicsOrderedFreeVector.cc
+++ b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Implementation
diff --git a/source/global/management/src/G4PhysicsVector.cc b/source/global/management/src/G4PhysicsVector.cc
index 8e221faca8..6b0791cd94 100644
--- a/source/global/management/src/G4PhysicsVector.cc
+++ b/source/global/management/src/G4PhysicsVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.cc,v 1.4 1999/11/23 15:00:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/global/management/src/G4Timer.cc b/source/global/management/src/G4Timer.cc
index 3d3fb1d444..5edd14c8ca 100644
--- a/source/global/management/src/G4Timer.cc
+++ b/source/global/management/src/G4Timer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Timer.cc,v 1.5 1999/11/23 15:00:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Timer.cc,v 1.7 2000/01/06 14:27:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,15 +18,12 @@
 #include "G4Timer.hh"
 #include "G4ios.hh"
 
-#ifdef G4USE_STL
-  #undef times
-#endif
+#undef times
 
 // Global error function
 void G4Exception(const char* s=0);
 
 
-
 #ifdef WIN32
 #  include <sys/types.h>
 #  include <windows.h>
@@ -59,7 +56,7 @@ void G4Exception(const char* s=0);
    }
 #endif /* WIN32 */
 
-// Print timer status n ostream
+// Print timer status n G4std::ostream
 G4std::ostream& operator << (G4std::ostream& os, const G4Timer& t)
 {
     if (t.IsValid())
diff --git a/source/global/management/src/G4UnitsTable.cc b/source/global/management/src/G4UnitsTable.cc
index 3bb2d908a3..4a6e152150 100644
--- a/source/global/management/src/G4UnitsTable.cc
+++ b/source/global/management/src/G4UnitsTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTable.cc,v 1.7 1999/11/23 15:00:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UnitsTable.cc,v 1.9 2000/01/19 11:17:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -340,10 +340,33 @@ G4BestUnit::G4BestUnit(G4double value,G4String category)
        }  
   //
     IndexOfCategory = i;
-    Value = value;        
+    nbOfVals = 1;
+    Value[0] = value; Value[1] = 0.; Value[2] = 0.;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+       
+G4BestUnit::G4BestUnit(const G4ThreeVector& value,G4String category)
+{
+ // find the category
+    G4UnitsTable& theUnitsTable = G4UnitDefinition::GetUnitsTable();
+    size_t nbCat = theUnitsTable.entries();
+    size_t i = 0;
+    while
+     ((i<nbCat)&&(theUnitsTable[i]->GetName()!=category)) i++;
+    if (i == nbCat) 
+       { G4cerr << " G4BestUnit: the category " << category 
+                << " does not exist." << G4endl;
+         G4Exception("Unit category not existing !");
+       }  
+  //
+    IndexOfCategory = i;
+    nbOfVals = 3;
+    Value[0] = value.x();
+    Value[1] = value.y();
+    Value[2] = value.z();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
  
 G4BestUnit::~G4BestUnit()
 {}
@@ -360,8 +383,10 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4BestUnit a)
   G4int    ksup(-1), kinf(-1);
   G4double umax(0.), umin(DBL_MAX);
   G4double rsup(DBL_MAX), rinf(0.);
-   
-  G4double value =fabs(a.Value);
+
+  //for a ThreeVector, choose the best unit for the biggest value 
+  G4double value = G4std::max(G4std::max(fabs(a.Value[0]),fabs(a.Value[1])),
+                              fabs(a.Value[2]));
 
   for (G4int k=0; k<List.entries(); k++)
      {
@@ -376,10 +401,11 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4BestUnit a)
      }
 	 
   G4int index=ksup; if(index==-1) index=kinf; if(index==-1) index=0;
-   
-  flux << a.Value/(List[index]->GetValue());
+  
+  for (G4int j=0; j<a.nbOfVals; j++) 
+     {flux << a.Value[j]/(List[index]->GetValue()) << " ";}
   G4long oldform = G4cout.setf(G4std::ios::left,G4std::ios::adjustfield);
-  flux << " " << G4std::setw(len) << List[index]->GetSymbol();       
+  flux << G4std::setw(len) << List[index]->GetSymbol();       
   G4cout.setf(oldform,G4std::ios::adjustfield);     
   
   return flux;
diff --git a/source/global/management/src/G4ios.cc b/source/global/management/src/G4ios.cc
index ad3705a698..188ee60424 100644
--- a/source/global/management/src/G4ios.cc
+++ b/source/global/management/src/G4ios.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ios.cc,v 1.4 1999/11/23 15:00:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/graphics_reps/History b/source/graphics_reps/History
index 30de8bcaf9..e3b663d219 100644
--- a/source/graphics_reps/History
+++ b/source/graphics_reps/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.12 1999/11/17 07:45:14 stanaka Exp $
+$Id: History,v 1.14 2000/01/11 17:35:07 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,13 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+11th January 2000  John Allison  (greps-V01-00-01)
+- Fix for spheres with small dtheta.
+
+16th December 1999  John Allison (greps-V01-00-00)
+- Added G4Polyhedron::Transform and G4Polyhedron::InvertFacets (Evgeni
+  Chernaev).
+
 17th November 1999 Satoshi Tanaka (greps-V00-01-01)
 - Header comments for software reference manual
 
diff --git a/source/graphics_reps/include/G4Circle.hh b/source/graphics_reps/include/G4Circle.hh
index e2db59e0b6..eced761636 100644
--- a/source/graphics_reps/include/G4Circle.hh
+++ b/source/graphics_reps/include/G4Circle.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Circle.hh,v 1.3.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Circle.hh,v 1.4 1999/12/15 14:50:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Circle.icc b/source/graphics_reps/include/G4Circle.icc
index 2aaef4d77c..3c2fca6ae1 100644
--- a/source/graphics_reps/include/G4Circle.icc
+++ b/source/graphics_reps/include/G4Circle.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Circle.icc,v 1.2.8.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Circle.icc,v 1.3 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Color.hh b/source/graphics_reps/include/G4Color.hh
index d0ec91bb96..b40938a7a4 100644
--- a/source/graphics_reps/include/G4Color.hh
+++ b/source/graphics_reps/include/G4Color.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Color.hh,v 1.2.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Color.hh,v 1.3 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/include/G4Colour.hh b/source/graphics_reps/include/G4Colour.hh
index ad38acde50..de29be7a6b 100644
--- a/source/graphics_reps/include/G4Colour.hh
+++ b/source/graphics_reps/include/G4Colour.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Colour.hh,v 1.3.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Colour.hh,v 1.5 1999/12/15 16:46:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 20th October 1996
@@ -57,10 +57,10 @@
 #define G4COLOUR_HH
 
 #include "globals.hh"
-class ostream;
+#include "g4std/iostream"
 
 class G4Colour {
-  friend ostream& operator << (ostream& os, const G4Colour& c);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4Colour& c);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4NURBS.hh b/source/graphics_reps/include/G4NURBS.hh
index ad2a78f4f5..822d5bfd36 100644
--- a/source/graphics_reps/include/G4NURBS.hh
+++ b/source/graphics_reps/include/G4NURBS.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBS.hh,v 1.4.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBS.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // Olivier Crumeyrolle  12 September 1996
 
@@ -324,7 +324,7 @@ protected:
   // external representation for t_KnotVectorGenFlag
   // as a << overload.
   // (used in errors report)
-  friend ostream & operator << (ostream & inout_OutStream,
+  friend G4std::ostream & operator << (G4std::ostream & inout_OutStream,
 				t_KnotVectorGenFlag in_KVGFlag);
 
   G4NURBS (t_order in_Uorder, t_order in_Vorder,
@@ -396,14 +396,14 @@ private:
 };
 
 // external representation for t_KnotVectorGenFlag
-ostream & operator << (ostream & inout_OutStream, G4NURBS::t_KnotVectorGenFlag in_KVGFlag);
+G4std::ostream & operator << (G4std::ostream & inout_OutStream, G4NURBS::t_KnotVectorGenFlag in_KVGFlag);
 
 
 // << overload to dump a nurbs
 // writted with public access functions
 // do not depends on protected part
 
-ostream & operator << (ostream & inout_outStream, const G4NURBS & in_kNurb);
+G4std::ostream & operator << (G4std::ostream & inout_outStream, const G4NURBS & in_kNurb);
 
 /***********************************************************************
  *                                                                     *
diff --git a/source/graphics_reps/include/G4NURBSbox.hh b/source/graphics_reps/include/G4NURBSbox.hh
index be7469cc21..4ed2ec40f5 100644
--- a/source/graphics_reps/include/G4NURBSbox.hh
+++ b/source/graphics_reps/include/G4NURBSbox.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBSbox.hh,v 1.4.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBSbox.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBScylinder.hh b/source/graphics_reps/include/G4NURBScylinder.hh
index 0cf83597a3..6d81586020 100644
--- a/source/graphics_reps/include/G4NURBScylinder.hh
+++ b/source/graphics_reps/include/G4NURBScylinder.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBScylinder.hh,v 1.4.2.1 1999/12/07 20:48:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBScylinder.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBShexahedron.hh b/source/graphics_reps/include/G4NURBShexahedron.hh
index d2a9717618..fea3bd33c8 100644
--- a/source/graphics_reps/include/G4NURBShexahedron.hh
+++ b/source/graphics_reps/include/G4NURBShexahedron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBShexahedron.hh,v 1.4.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBShexahedron.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hexa hedron builder prototype
 // OC 17 9 96
diff --git a/source/graphics_reps/include/G4NURBStube.hh b/source/graphics_reps/include/G4NURBStube.hh
index 7044ec0e10..e91ba386ca 100644
--- a/source/graphics_reps/include/G4NURBStube.hh
+++ b/source/graphics_reps/include/G4NURBStube.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBStube.hh,v 1.4.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBStube.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBStubesector.hh b/source/graphics_reps/include/G4NURBStubesector.hh
index ef9743f83d..5024550293 100644
--- a/source/graphics_reps/include/G4NURBStubesector.hh
+++ b/source/graphics_reps/include/G4NURBStubesector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBStubesector.hh,v 1.3.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBStubesector.hh,v 1.4 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4PlacedPolyhedron.hh b/source/graphics_reps/include/G4PlacedPolyhedron.hh
index 6e750ff2d6..8f8c1080f0 100644
--- a/source/graphics_reps/include/G4PlacedPolyhedron.hh
+++ b/source/graphics_reps/include/G4PlacedPolyhedron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PlacedPolyhedron.hh,v 1.6.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PlacedPolyhedron.hh,v 1.7 1999/12/15 14:50:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 
 // Class Description:
diff --git a/source/graphics_reps/include/G4Point3DList.hh b/source/graphics_reps/include/G4Point3DList.hh
index 5aae0a50da..0b7a7750b4 100644
--- a/source/graphics_reps/include/G4Point3DList.hh
+++ b/source/graphics_reps/include/G4Point3DList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Point3DList.hh,v 1.4.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Point3DList.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  July 1995
@@ -20,12 +20,11 @@
 
 #include "g4rw/tvordvec.h"
 #include "G4Point3D.hh"
-
-class ostream;
+#include "g4std/iostream"
 
 class G4Point3DList: public G4RWTValOrderedVector<G4Point3D> {
 
-friend ostream& operator << (ostream& os, const G4Point3DList& points);
+friend G4std::ostream& operator << (G4std::ostream& os, const G4Point3DList& points);
 
 public:
 
diff --git a/source/graphics_reps/include/G4Polyhedron.hh b/source/graphics_reps/include/G4Polyhedron.hh
index c934f99c6f..85ee96a90c 100644
--- a/source/graphics_reps/include/G4Polyhedron.hh
+++ b/source/graphics_reps/include/G4Polyhedron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyhedron.hh,v 1.3.2.1 1999/12/07 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polyhedron.hh,v 1.5 1999/12/16 15:26:03 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
@@ -119,10 +119,12 @@
 #include "G4VVisPrim.hh"
 #include "G4Point3D.hh"
 #include "G4Normal3D.hh"
+#include "G4Vector3D.hh"
+#include "G4Transform3D.hh"
 
 class G4Facet {
   friend class G4Polyhedron;
-  friend ostream& operator<<(ostream&, const G4Facet &facet);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4Facet &facet);
 
  private:
   struct G4Edge { G4int v,f; };
@@ -137,7 +139,7 @@ class G4Facet {
 };
 
 class G4Polyhedron: public G4VVisPrim {
-  friend ostream& operator<<(ostream&, const G4Polyhedron &ph);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4Polyhedron &ph);
 
  private:
   static G4int fNumberOfRotationSteps;
@@ -175,6 +177,9 @@ class G4Polyhedron: public G4VVisPrim {
   // For each edge set reference to neighbouring facet
   void SetReferences();
 
+  // Invert the order on nodes in facets
+  void InvertFacets();
+
  public:
   // Constructor
   G4Polyhedron(G4int Nvert=0, G4int Nface=0)
@@ -199,6 +204,9 @@ class G4Polyhedron: public G4VVisPrim {
   // Get number of facets
   G4int GetNoFacets() const { return nface; }
 
+  // Transform the polyhedron
+  G4Polyhedron & Transform(const G4Transform3D &t);
+
   // Get next vertex index of the quadrilateral
   G4bool GetNextVertexIndex(G4int &index, G4int &edgeFlag) const;
 
diff --git a/source/graphics_reps/include/G4Polyline.hh b/source/graphics_reps/include/G4Polyline.hh
index 7dfb27ec66..ff9f0ab981 100644
--- a/source/graphics_reps/include/G4Polyline.hh
+++ b/source/graphics_reps/include/G4Polyline.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyline.hh,v 1.4.2.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polyline.hh,v 1.5 1999/12/15 14:50:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  July 1995
@@ -25,7 +25,7 @@
 #include "G4Point3DList.hh"
 
 class G4Polyline: public G4VVisPrim, public G4Point3DList {
-  friend ostream& operator << (ostream& os, const G4Polyline& line);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4Polyline& line);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4Polymarker.hh b/source/graphics_reps/include/G4Polymarker.hh
index 1e55637f95..d5eb9a50db 100644
--- a/source/graphics_reps/include/G4Polymarker.hh
+++ b/source/graphics_reps/include/G4Polymarker.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polymarker.hh,v 1.4.2.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polymarker.hh,v 1.5 1999/12/15 14:50:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  November 1996
@@ -26,7 +26,7 @@ class G4Polymarker: public G4VMarker, public G4Point3DList {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4Polymarker& marker);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4Polymarker& marker);
   enum MarkerType {line, dots, circles, squares};
   G4Polymarker ();
   virtual G4Visible&    operator = (const G4Visible& right);
diff --git a/source/graphics_reps/include/G4Polymarker.icc b/source/graphics_reps/include/G4Polymarker.icc
index 222e793b3d..5c006e670c 100644
--- a/source/graphics_reps/include/G4Polymarker.icc
+++ b/source/graphics_reps/include/G4Polymarker.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polymarker.icc,v 1.1.10.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polymarker.icc,v 1.2 1999/12/15 14:50:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  November 1996
diff --git a/source/graphics_reps/include/G4Square.hh b/source/graphics_reps/include/G4Square.hh
index ff9837aea2..7ac3a6872c 100644
--- a/source/graphics_reps/include/G4Square.hh
+++ b/source/graphics_reps/include/G4Square.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Square.hh,v 1.3.2.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Square.hh,v 1.4 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Square.icc b/source/graphics_reps/include/G4Square.icc
index f334e82607..a81a440f16 100644
--- a/source/graphics_reps/include/G4Square.icc
+++ b/source/graphics_reps/include/G4Square.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Square.icc,v 1.1.10.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Square.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Text.hh b/source/graphics_reps/include/G4Text.hh
index 49fee8f0d8..35c0fbf344 100644
--- a/source/graphics_reps/include/G4Text.hh
+++ b/source/graphics_reps/include/G4Text.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Text.hh,v 1.4.2.1 1999/12/07 20:48:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Text.hh,v 1.5 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Text.icc b/source/graphics_reps/include/G4Text.icc
index 5b5fe01e16..094117f440 100644
--- a/source/graphics_reps/include/G4Text.icc
+++ b/source/graphics_reps/include/G4Text.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Text.icc,v 1.1.10.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Text.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4VMarker.hh b/source/graphics_reps/include/G4VMarker.hh
index 81e27792ef..c34851ba9e 100644
--- a/source/graphics_reps/include/G4VMarker.hh
+++ b/source/graphics_reps/include/G4VMarker.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMarker.hh,v 1.5.2.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VMarker.hh,v 1.6 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4VMarker - base class for markers - circles, squares, etc.
@@ -71,7 +71,7 @@
 
 class G4VMarker: public G4VVisPrim {
 
-  friend ostream& operator << (ostream& os, const G4VMarker& marker);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VMarker& marker);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4VMarker.icc b/source/graphics_reps/include/G4VMarker.icc
index e2c0bef0d0..b655c4f42a 100644
--- a/source/graphics_reps/include/G4VMarker.icc
+++ b/source/graphics_reps/include/G4VMarker.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMarker.icc,v 1.2.8.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VMarker.icc,v 1.4 1999/12/16 15:22:05 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/graphics_reps/include/G4VVisPrim.hh b/source/graphics_reps/include/G4VVisPrim.hh
index 09ace709f0..967adf14b4 100644
--- a/source/graphics_reps/include/G4VVisPrim.hh
+++ b/source/graphics_reps/include/G4VVisPrim.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisPrim.hh,v 1.4.2.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisPrim.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  August 1995
@@ -20,13 +20,13 @@
 #define G4VVISPRIM_HH
 
 #include "G4Visible.hh"
+#include "g4std/iostream"
 
-class ostream;
 class G4VisAttributes;
 
 class G4VVisPrim: public G4Visible {
 
-  friend ostream& operator << (ostream& os, const G4VVisPrim& prim);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VVisPrim& prim);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4VVisPrim.icc b/source/graphics_reps/include/G4VVisPrim.icc
index f94a5ebaa4..c0ab98cc4a 100644
--- a/source/graphics_reps/include/G4VVisPrim.icc
+++ b/source/graphics_reps/include/G4VVisPrim.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisPrim.icc,v 1.2.8.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisPrim.icc,v 1.3 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  August 1995
diff --git a/source/graphics_reps/include/G4VisAttributes.hh b/source/graphics_reps/include/G4VisAttributes.hh
index 3543af201b..323ee44817 100644
--- a/source/graphics_reps/include/G4VisAttributes.hh
+++ b/source/graphics_reps/include/G4VisAttributes.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisAttributes.hh,v 1.4.2.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisAttributes.hh,v 1.5 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  23rd October 1996
@@ -39,7 +39,7 @@
 
 class G4VisAttributes {
 
-  friend ostream& operator << (ostream& os, const G4VisAttributes& a);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VisAttributes& a);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4VisAttributes.icc b/source/graphics_reps/include/G4VisAttributes.icc
index 8b594db147..3be5e232e6 100644
--- a/source/graphics_reps/include/G4VisAttributes.icc
+++ b/source/graphics_reps/include/G4VisAttributes.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisAttributes.icc,v 1.2.8.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisAttributes.icc,v 1.3 1999/12/15 14:50:34 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  18th November 1996
diff --git a/source/graphics_reps/include/G4VisExtent.hh b/source/graphics_reps/include/G4VisExtent.hh
index 641a86bd6a..f4a3b2f57a 100644
--- a/source/graphics_reps/include/G4VisExtent.hh
+++ b/source/graphics_reps/include/G4VisExtent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisExtent.hh,v 1.3.2.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisExtent.hh,v 1.4 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // A.Walkden 28/11/95
@@ -48,7 +48,7 @@ public: // With description
   void SetYmax (G4double ymax);
   void SetZmin (G4double zmin);
   void SetZmax (G4double zmax);
-  friend ostream& operator << (ostream& os, const G4VisExtent& e);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VisExtent& e);
 
 private:
   G4double fXmin, fXmax, fYmin, fYmax, fZmin, fZmax;
diff --git a/source/graphics_reps/include/G4Visible.hh b/source/graphics_reps/include/G4Visible.hh
index ec738a9b1a..07c0ba0dc7 100644
--- a/source/graphics_reps/include/G4Visible.hh
+++ b/source/graphics_reps/include/G4Visible.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Visible.hh,v 1.4.2.1 1999/12/07 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Visible.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  30th October 1996
@@ -23,13 +23,13 @@
 #define G4VISIBLE_HH
 
 #include "globals.hh"
+#include "g4std/iostream"
 
 class G4VisAttributes;
-class ostream;
 
 class G4Visible {
 
-  friend ostream& operator << (ostream& os, const G4Visible& v);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4Visible& v);
 
 public: // With description
 
diff --git a/source/graphics_reps/include/G4Visible.icc b/source/graphics_reps/include/G4Visible.icc
index 431db707d8..0c7501372d 100644
--- a/source/graphics_reps/include/G4Visible.icc
+++ b/source/graphics_reps/include/G4Visible.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Visible.icc,v 1.2.8.1 1999/12/07 20:48:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Visible.icc,v 1.3 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/src/G4Circle.cc b/source/graphics_reps/src/G4Circle.cc
index 038329d59e..d2b1299b7f 100644
--- a/source/graphics_reps/src/G4Circle.cc
+++ b/source/graphics_reps/src/G4Circle.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Circle.cc,v 1.1.8.1 1999/12/07 20:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Circle.cc,v 1.2 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4Colour.cc b/source/graphics_reps/src/G4Colour.cc
index 0611990fd1..f81f7b6230 100644
--- a/source/graphics_reps/src/G4Colour.cc
+++ b/source/graphics_reps/src/G4Colour.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Colour.cc,v 1.2.8.1 1999/12/07 20:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Colour.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 20th October 1996
@@ -14,7 +14,7 @@
 #include "G4Colour.hh"
 #include "G4ios.hh"
 
-ostream& operator << (ostream& os, const G4Colour& c) {
+G4std::ostream& operator << (G4std::ostream& os, const G4Colour& c) {
   return os << '(' << c.red << ',' << c.green << ',' << c.blue
 	    << ',' << c.alpha << ')';
 }
diff --git a/source/graphics_reps/src/G4NURBS.cc b/source/graphics_reps/src/G4NURBS.cc
index 2c798d931e..3ea6de0aae 100644
--- a/source/graphics_reps/src/G4NURBS.cc
+++ b/source/graphics_reps/src/G4NURBS.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBS.cc,v 1.2.8.1 1999/12/07 20:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBS.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
@@ -40,7 +40,7 @@ G4VVisPrim & G4NURBS::operator = (const G4VVisPrim &right) {
   return G4VVisPrim::operator = (right);
 }
 
-ostream & operator << (ostream & inout_outStream, const G4NURBS & in_kNurb)
+G4std::ostream & operator << (G4std::ostream & inout_outStream, const G4NURBS & in_kNurb)
 		{
 		inout_outStream
 			// the magic could be changed for good reasons only
@@ -90,7 +90,7 @@ ostream & operator << (ostream & inout_outStream, const G4NURBS & in_kNurb)
 		    }
 		  while (otherCPs);
 		  } // end of control point iteration
-		inout_outStream << "\n# That's all!" << endl;	// endl do an \n and a flush
+		inout_outStream << "\n# That's all!" << G4endl;	// endl do an \n and a flush
 		return inout_outStream;
 		}
 
@@ -106,7 +106,7 @@ G4float	G4NURBS::GetfloatKnot(t_direction in_dir, t_indKnot in_index) const
 	 {
 	 G4cerr << "\nERROR: G4NURBS::GetfloatKnot: index out of range\n"
 	      << "\n\t in_dir : " << in_dir << ", in_index : " << in_index
-              << "m[in_dir].nbrKnots : " << m[in_dir].nbrKnots << endl;
+              << "m[in_dir].nbrKnots : " << m[in_dir].nbrKnots << G4endl;
 	 return ((G4float)m[in_dir].pKnots[m[in_dir].nbrKnots-1]); 
 	 };
 	}
@@ -120,7 +120,7 @@ G4double	G4NURBS::GetdoubleKnot(t_direction in_dir, t_indKnot in_index) const
 		 {
 		 G4cerr << "\nERROR: G4NURBS::GetdoubleKnot: index out of range"
 		      << "\n\t in_dir : " << in_dir << ", in_index : " << in_index
-	              << "m[in_dir].nbrKnots : " << m[in_dir].nbrKnots << endl;
+	              << "m[in_dir].nbrKnots : " << m[in_dir].nbrKnots << G4endl;
 		 return (G4double)(m[in_dir].pKnots[m[in_dir].nbrKnots-1]); 
 		 };
 		}
@@ -133,7 +133,7 @@ G4NURBS::t_floatCtrlPt*	G4NURBS::GetfloatCtrlPt(t_indCtrlPt in_onedimindex) cons
 		 {
 		 G4cerr 	<< "\nERROR: G4NURBS::GetfloatCtrlPt: index out of range"
 			<< "\n\t in_onedimindex : " << in_onedimindex
-			<< " , mtotnbrCtrlPts : " << mtotnbrCtrlPts << endl;
+			<< " , mtotnbrCtrlPts : " << mtotnbrCtrlPts << G4endl;
 		 return TofloatCtrlPt(mpCtrlPts[mtotnbrCtrlPts-1]);  
 		 };		
 		}
@@ -151,7 +151,7 @@ G4NURBS::t_floatCtrlPt*	G4NURBS::GetfloatCtrlPt(t_inddCtrlPt in_Uindex, t_inddCt
 			<< "\n\t in_Uindex : " << in_Uindex
 			<< " , in_Vindex : " << in_Vindex
 			<< " , UnbrCtrlPts : " << m[U].nbrCtrlPts
-			<< " , VnbrCtrlPts : " << m[V].nbrCtrlPts << endl;
+			<< " , VnbrCtrlPts : " << m[V].nbrCtrlPts << G4endl;
 		 return TofloatCtrlPt(mpCtrlPts[mtotnbrCtrlPts-1]);  
 		 };		
 		}
@@ -164,7 +164,7 @@ G4NURBS::t_doubleCtrlPt*	G4NURBS::GetdoubleCtrlPt(t_indCtrlPt in_onedimindex) co
 		 {
 		 G4cerr 	<< "\nERROR: G4NURBS::getdoubleCtrlPts: index out of range"
 			<< "\n\t in_onedimindex : " << in_onedimindex
-			<< " , mtotnbrCtrlPts : " << mtotnbrCtrlPts << endl;
+			<< " , mtotnbrCtrlPts : " << mtotnbrCtrlPts << G4endl;
 		 return TodoubleCtrlPt(mpCtrlPts[mtotnbrCtrlPts-1]);  
 		 };		
 		}
@@ -182,7 +182,7 @@ G4NURBS::t_doubleCtrlPt*	G4NURBS::GetdoubleCtrlPt(t_inddCtrlPt in_Uindex, t_indd
 			<< "\n\t in_Uindex : " << in_Uindex
 			<< " , in_Vindex : " << in_Vindex
 			<< " , UnbrCtrlPts : " << m[U].nbrCtrlPts
-			<< " , VnbrCtrlPts : " << m[V].nbrCtrlPts << endl;
+			<< " , VnbrCtrlPts : " << m[V].nbrCtrlPts << G4endl;
 		 return TodoubleCtrlPt(mpCtrlPts[mtotnbrCtrlPts-1]);  
 		 };		
 		}
@@ -241,7 +241,7 @@ G4double *	G4NURBS::GetdoubleAllCtrlPts() const
 			<< "\n\tin_startIndex : " << in_startIndex
 			<< ", nbr of knots : " << in_rNurb.m[kmdir].nbrKnots
 			<< "\n\t mp set to NULL, calls to picking functions will fail"
-			<< endl;
+			<< G4endl;
 		  mp = NULL;
 		  };
 		}
@@ -271,7 +271,7 @@ G4bool	G4NURBS::KnotsIterator::pick(G4float * inout_pFlt)
 			<< "\n\tin_startCtrlPtIndex : " << in_startCtrlPtIndex
 			<< ", nbr of CtrlPts : " << in_rNurb.mtotnbrCtrlPts 
 			<< "\n\t mp set to NULL, calls to picking functions will fail"
-			<< endl;
+			<< G4endl;
 		  mp = NULL;
 		  };
 		}
@@ -299,7 +299,7 @@ G4bool G4NURBS::CtrlPtsCoordsIterator::pick(G4float * inout_pFlt)
 			<< "\n\tin_startIndex : " << in_startIndex
 			<< ", nbr of CtrlPts : " << in_rNurb.mtotnbrCtrlPts 
 			<< "\n\t mp set to NULL, calls to picking functions will fail"
-			<< endl;
+			<< G4endl;
 		  mp = NULL;
 		  };
 		}
@@ -361,7 +361,7 @@ G4bool	G4NURBS::MakeKnotVector(t_Dir & io_d, t_KnotVectorGenFlag in_KVGFlag)
 	}
 
 
-ostream &	operator << (ostream & io_ostr, G4NURBS::t_KnotVectorGenFlag in_f)
+G4std::ostream &	operator << (G4std::ostream & io_ostr, G4NURBS::t_KnotVectorGenFlag in_f)
 		{
 		switch (in_f) 
 			{
@@ -388,14 +388,14 @@ void	G4NURBS::Conscheck() const
 				{ 
 				G4cerr 	<< "\nFATAL ERROR: G4NURBS::G4NURBS: The order in the "
 					<< G4NURBS::Tochar(dir) 
-					<< " direction must be >= 1" << endl;
+					<< " direction must be >= 1" << G4endl;
 				exit(-1);
 				};
 			if (m[dir].nbrCtrlPts<=0)
 				{
 				G4cerr 	<< "\nFATAL ERROR: G4NURBS::G4NURBS: The number of control points "
 					<< G4NURBS::Tochar(dir) 
-					<< " direction must be >= 1" << endl;
+					<< " direction must be >= 1" << G4endl;
 				exit(-1);
 				};
 			};	// end of dummy
@@ -425,7 +425,7 @@ void	G4NURBS::Conscheck() const
 		if (! (mpCtrlPts = in_pCtrlPts) )
 			{
 			G4cerr 	<< "\nFATAL ERROR: G4NURBS::G4NURBS: A NURBS MUST HAVE CONTROL POINTS!\n\teven if they are defined later, the array must be allocated."
-				<< "\n\tgood bye. Have a nice debuging." << endl;
+				<< "\n\tgood bye. Have a nice debuging." << G4endl;
 			exit(-1);
 			};
 		//mnbralias = 0;
@@ -443,7 +443,7 @@ void	G4NURBS::Conscheck() const
 					<< G4NURBS::Tochar(dir)
 					<< " direction."
 					<< "\n\tgood bye. Have a nice debuging."
-					<< endl;
+					<< G4endl;
 				exit(-1);
 
 				};
@@ -495,7 +495,7 @@ void	G4NURBS::Conscheck() const
 				<< flag 
 				<< " knots vector)"
 				<< "\n\tgood bye. Have a nice debuging."
-				<< endl;
+				<< G4endl;
 			exit(-1);
 			};
 		    //m[dir].nbralias = 0;
@@ -541,7 +541,7 @@ void	G4NURBS::Conscheck() const
 
 		// and as it's very strange to copy a nurbs in G4
 		// we issue a warning :
-		G4cerr << "\nWARNING: G4NURBS::G4NURBS(const G4NURBS &) used" << endl;
+		G4cerr << "\nWARNING: G4NURBS::G4NURBS(const G4NURBS &) used" << G4endl;
 		}	// end of G4NURBS::G4NURBS(const G4NURBS &)
 
 
diff --git a/source/graphics_reps/src/G4NURBSbox.cc b/source/graphics_reps/src/G4NURBSbox.cc
index bbe6cc4fd3..e4f4d22ce2 100644
--- a/source/graphics_reps/src/G4NURBSbox.cc
+++ b/source/graphics_reps/src/G4NURBSbox.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBSbox.cc,v 1.2.8.1 1999/12/07 20:48:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBSbox.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBScylinder.cc b/source/graphics_reps/src/G4NURBScylinder.cc
index 5806c36236..5a170800bb 100644
--- a/source/graphics_reps/src/G4NURBScylinder.cc
+++ b/source/graphics_reps/src/G4NURBScylinder.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBScylinder.cc,v 1.2.8.1 1999/12/07 20:48:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBScylinder.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBShexahedron.cc b/source/graphics_reps/src/G4NURBShexahedron.cc
index b59e4fdc26..89162774d0 100644
--- a/source/graphics_reps/src/G4NURBShexahedron.cc
+++ b/source/graphics_reps/src/G4NURBShexahedron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBShexahedron.cc,v 1.2.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBShexahedron.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // hexahedron implementation
 //  OC 17 9 96
diff --git a/source/graphics_reps/src/G4NURBStube.cc b/source/graphics_reps/src/G4NURBStube.cc
index edf744e1d0..6a9fc8478b 100644
--- a/source/graphics_reps/src/G4NURBStube.cc
+++ b/source/graphics_reps/src/G4NURBStube.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBStube.cc,v 1.2.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBStube.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBStubesector.cc b/source/graphics_reps/src/G4NURBStubesector.cc
index 87035aeb04..0261fe0977 100644
--- a/source/graphics_reps/src/G4NURBStubesector.cc
+++ b/source/graphics_reps/src/G4NURBStubesector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NURBStubesector.cc,v 1.3.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NURBStubesector.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
@@ -20,12 +20,8 @@
 //#include <math.h>
 // cf cylinder
 
-// for ostrstream
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+// for G4std::ostrstream
+#include "g4std/strstream"
 
 
 	G4NURBStubesector::G4NURBStubesector(G4double r, G4double R, G4double DZ, G4double PHI1, G4double PHI2)
@@ -162,7 +158,7 @@
 			<< "\nERROR: G4NURBStubesector::G4NURBStubesector: wrong index,"
 			<< i << " instead of " << (mtotnbrCtrlPts - 10)
 			<< "\n\tIt sounds very strange. The tubesector won't be correct. Have a nice debuging!" 
-			<< endl;
+			<< G4endl;
 			};
 
 		CP(mpCtrlPts[i++] ,  cp2*mr, sp2*mr, 0, 1);
@@ -182,7 +178,7 @@
 
 		// creating the nurbs identity
 		mpwhoami = new char [200];
-		ostrstream	tmpstr(mpwhoami, 200);
+		G4std::ostrstream	tmpstr(mpwhoami, 200);
 		tmpstr << "Tubs" << " \tPHI1=" << PHI1 << " ; PHI2=" << PHI2 << '\0';
 		// could be more sophisticated, reallocating
 		// mpwhoami to the exact length
@@ -216,10 +212,10 @@ G4NURBStubesector::t_inddCtrlPt	G4NURBStubesector::DecideNbrCtrlPts(G4double PHI
 		while (deltaPHI <= 0) { PHI2 += 2*M_PI; deltaPHI += 2*M_PI; };
 		G4double k = deltaPHI / (M_PI_2);
 
-//		G4cerr << " k " << k << endl;
-//		G4cerr << " fk " << floor(k) << endl;
-//		G4cerr <<  " ifk " << ((int)(floor(k))) << endl;
-//		G4cerr << " n " << (2*((int)(floor(k))) + 7) << endl;
+//		G4cerr << " k " << k << G4endl;
+//		G4cerr << " fk " << floor(k) << G4endl;
+//		G4cerr <<  " ifk " << ((int)(floor(k))) << G4endl;
+//		G4cerr << " n " << (2*((int)(floor(k))) + 7) << G4endl;
 
 		return ( 2*((int)(floor(k))) + 7 ); 		
 		}
diff --git a/source/graphics_reps/src/G4PlacedPolyhedron.cc b/source/graphics_reps/src/G4PlacedPolyhedron.cc
index 95f206a711..84364356e4 100644
--- a/source/graphics_reps/src/G4PlacedPolyhedron.cc
+++ b/source/graphics_reps/src/G4PlacedPolyhedron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PlacedPolyhedron.cc,v 1.1.6.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PlacedPolyhedron.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G4PlacedPolyhedron.hh"
 
diff --git a/source/graphics_reps/src/G4Point3DList.cc b/source/graphics_reps/src/G4Point3DList.cc
index 3005fa98d0..f98be40371 100644
--- a/source/graphics_reps/src/G4Point3DList.cc
+++ b/source/graphics_reps/src/G4Point3DList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Point3DList.cc,v 1.2.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Point3DList.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  July 1995
@@ -17,7 +17,7 @@
 
 G4Point3DList::~G4Point3DList () {}
 
-ostream& operator << (ostream& os, const G4Point3DList& points)
+G4std::ostream& operator << (G4std::ostream& os, const G4Point3DList& points)
 {
   os << "G4Point3DList[" << points.entries() << "]: ";
   for (int i = 0; i < points.entries(); i++) os << points(i);
diff --git a/source/graphics_reps/src/G4Polyhedron.cc b/source/graphics_reps/src/G4Polyhedron.cc
index d510a4ced9..23d08741a8 100644
--- a/source/graphics_reps/src/G4Polyhedron.cc
+++ b/source/graphics_reps/src/G4Polyhedron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyhedron.cc,v 1.4.6.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polyhedron.cc,v 1.7 2000/01/11 17:35:09 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
@@ -37,24 +37,24 @@
  * Function: Print contents of G4 polyhedron                           *
  *                                                                     *
  ***********************************************************************/
-ostream& operator<<(ostream &ostr, const G4Facet &facet) {
+G4std::ostream& operator<<(G4std::ostream &ostr, const G4Facet &facet) {
   for (G4int k=0; k<4; k++) {
     ostr << " " << facet.edge[k].v << "/" << facet.edge[k].f;
   }
   return ostr;
 }
 
-ostream& operator<<(ostream &ostr, const G4Polyhedron &ph) {
+G4std::ostream& operator<<(G4std::ostream &ostr, const G4Polyhedron &ph) {
   G4int i;
 
-  ostr << endl;
-  ostr << "Nverteces=" << ph.nvert << ", Nfacets=" << ph.nface << endl;
+  ostr << G4endl;
+  ostr << "Nverteces=" << ph.nvert << ", Nfacets=" << ph.nface << G4endl;
   for (i=1; i<=ph.nvert; i++) {
      ostr << "xyz(" << i << ")=" <<
-       ph.pV[i].x() << ' ' << ph.pV[i].y() << ' ' << ph.pV[i].z() << endl;
+       ph.pV[i].x() << ' ' << ph.pV[i].y() << ' ' << ph.pV[i].z() << G4endl;
   }
   for (i=1; i<=ph.nface; i++) {
-    ostr << "face(" << i << ")=" << ph.pF[i] << endl;
+    ostr << "face(" << i << ")=" << ph.pF[i] << G4endl;
   }
   return ostr;
 }
@@ -235,7 +235,7 @@ void G4Polyhedron::SetNumberOfRotationSteps(G4int n)
   if (n < nMin) {
     n = nMin;
     G4cout << "G4Polyhedron::SetNumberOfRotationSteps: attempt to set the"
-      "\nnumber of steps per circle < " << nMin << "; forced to " << n << endl;
+      "\nnumber of steps per circle < " << nMin << "; forced to " << n << G4endl;
   }
   fNumberOfRotationSteps = n;
 }
@@ -649,7 +649,7 @@ void G4Polyhedron::RotateAroundZ(G4int nstep, G4double phi, G4double dphi,
   if (k-1 != nface) {
     G4cerr << "Polyhedron::RotateAroundZ: number of generated faces ("
          << k-1 << ") is not equal to the number of allocated faces ("
-         << nface << ")" << endl;
+         << nface << ")" << G4endl;
   }
 }
 
@@ -700,8 +700,8 @@ void G4Polyhedron::SetReferences()
       i2 = (iedge < nedge-1) ? iedge+1 : 0;
       i1 = abs(pF[iface].edge[i1].v);
       i2 = abs(pF[iface].edge[i2].v);
-      k1 = min(i1,i2);
-      k2 = max(i1,i2);
+      k1 = G4std::min(i1,i2);
+      k2 = G4std::max(i1,i2);
       
       // check head of the List corresponding to k1
       cur = headList[k1];
@@ -729,7 +729,7 @@ void G4Polyhedron::SetReferences()
 	       << iface << "/" << iedge << "/"
 	       << pF[iface].edge[iedge].v << " and "
 	       << cur->iface << "/" << cur->iedge << "/"
-	       << pF[cur->iface].edge[cur->iedge].v << endl;
+	       << pF[cur->iface].edge[cur->iedge].v << G4endl;
 	}
 	continue;
       }
@@ -762,7 +762,7 @@ void G4Polyhedron::SetReferences()
 		   << iface << "/" << iedge << "/"
 		   << pF[iface].edge[iedge].v << " and "
 		   << cur->iface << "/" << cur->iedge << "/"
-		   << pF[cur->iface].edge[cur->iedge].v << endl;
+		   << pF[cur->iface].edge[cur->iedge].v << G4endl;
 	    }
 	  break;
 	}
@@ -775,7 +775,7 @@ void G4Polyhedron::SetReferences()
   for (i=0; i<nvert; i++) {
     if (headList[i] != 0) {
       G4cerr << "Polyhedron::SetReferences: List " << i << " is not empty"
-	   << endl;
+	   << G4endl;
     }
   }
 
@@ -785,6 +785,57 @@ void G4Polyhedron::SetReferences()
   delete [] headList;
 }
 
+void G4Polyhedron::InvertFacets()
+/***********************************************************************
+ *                                                                     *
+ * Name: G4Polyhedron::InvertFacets                 Date:    01.12.99  *
+ * Author: E.Chernyaev                              Revised:           *
+ *                                                                     *
+ * Function: Invert the order of the nodes in the facets               *
+ *                                                                     *
+ ***********************************************************************/
+{
+  if (nface <= 0) return;
+  G4int i, k, nnode, v[4],f[4];
+  for (i=1; i<=nface; i++) {
+    nnode =  (pF[i].edge[3].v == 0) ? 3 : 4;
+    for (k=0; k<nnode; k++) {
+      v[k] = (k+1 == nnode) ? pF[i].edge[0].v : pF[i].edge[k+1].v;
+      if (v[k] * pF[i].edge[k].v < 0) v[k] = -v[k];
+      f[k] = pF[i].edge[k].f;
+    }
+    for (k=0; k<nnode; k++) {
+      pF[i].edge[nnode-1-k].v = v[k];
+      pF[i].edge[nnode-1-k].f = f[k];
+    }
+  }
+}
+
+G4Polyhedron & G4Polyhedron::Transform(const G4Transform3D &t)
+/***********************************************************************
+ *                                                                     *
+ * Name: G4Polyhedron::Transform                    Date:    01.12.99  *
+ * Author: E.Chernyaev                              Revised:           *
+ *                                                                     *
+ * Function: Make transformation of the polyhedron                     *
+ *                                                                     *
+ ***********************************************************************/
+{
+  if (nvert > 0) {
+    for (G4int i=1; i<=nvert; i++) { pV[i] = t * pV[i]; }
+
+    //  C H E C K   D E T E R M I N A N T   A N D
+    //  I N V E R T   F A C E T S   I F   I T   I S   N E G A T I V E
+
+    G4Vector3D d = t * G4Vector3D(0,0,0);
+    G4Vector3D x = t * G4Vector3D(1,0,0) - d;
+    G4Vector3D y = t * G4Vector3D(0,1,0) - d;
+    G4Vector3D z = t * G4Vector3D(0,0,1) - d;
+    if ((x.cross(y))*z < 0) InvertFacets();
+  }
+  return *this;
+}
+
 G4bool G4Polyhedron::GetNextVertexIndex(G4int &index, G4int &edgeFlag) const
 /***********************************************************************
  *                                                                     *
@@ -824,7 +875,7 @@ G4Point3D G4Polyhedron::GetVertex(G4int index) const
  ***********************************************************************/
 {
   if (index <= 0 || index > nvert){
-    G4cerr << "Error: irrelevant vertex label " << index << endl;
+    G4cerr << "Error: irrelevant vertex label " << index << G4endl;
       return G4Point3D();
   }
   return pV[index];
@@ -1088,10 +1139,10 @@ G4PolyhedronCons::G4PolyhedronCons(G4double Rmn1, G4double Rmx1,
     if ((k & 1) != 0) G4cerr << " (radiuses)";
     if ((k & 2) != 0) G4cerr << " (half-length)";
     if ((k & 4) != 0) G4cerr << " (angles)";
-    G4cerr << endl;
+    G4cerr << G4endl;
     G4cerr << " Rmn1=" << Rmn1 << " Rmx1=" << Rmx1;
     G4cerr << " Rmn2=" << Rmn2 << " Rmx2=" << Rmx2;
-    G4cerr << " Dz=" << Dz << " Phi1=" << Phi1 << " Dphi=" << Dphi << endl;
+    G4cerr << " Dz=" << Dz << " Phi1=" << Phi1 << " Dphi=" << Dphi << G4endl;
     return;
   }
   
@@ -1140,19 +1191,19 @@ G4PolyhedronPgon::G4PolyhedronPgon(G4double phi,
   //   C H E C K   I N P U T   P A R A M E T E R S
 
   if (dphi <= 0. || dphi > 2*M_PI) {
-    G4cerr << "G4PolyhedronPgon/Pcon: wrong delta phi = " << dphi << endl;
+    G4cerr << "G4PolyhedronPgon/Pcon: wrong delta phi = " << dphi << G4endl;
     return;
   }    
     
   if (nz < 2) {
     G4cerr << "G4PolyhedronPgon/Pcon: number of z-planes less than two = " << nz
-         << endl;
+         << G4endl;
     return;
   }
 
   if (npdv < 0) {
     G4cerr << "G4PolyhedronPgon/Pcon: error in number of phi-steps =" << npdv
-         << endl;
+         << G4endl;
     return;
   }
 
@@ -1160,7 +1211,7 @@ G4PolyhedronPgon::G4PolyhedronPgon(G4double phi,
   for (i=0; i<nz; i++) {
     if (rmin[i] < 0. || rmax[i] < 0. || rmin[i] > rmax[i]) {
       G4cerr << "G4PolyhedronPgon: error in radiuses rmin[" << i << "]="
-	   << rmin[i] << " rmax[" << i << "]=" << rmax[i] << endl;
+	   << rmin[i] << " rmax[" << i << "]=" << rmax[i] << G4endl;
       return;
     }
   }
@@ -1218,29 +1269,29 @@ G4PolyhedronSphere::G4PolyhedronSphere(G4double rmin, G4double rmax,
   //   C H E C K   I N P U T   P A R A M E T E R S
 
   if (dphi <= 0. || dphi > 2*M_PI) {
-    G4cerr << "G4PolyhedronSphere: wrong delta phi = " << dphi << endl;
+    G4cerr << "G4PolyhedronSphere: wrong delta phi = " << dphi << G4endl;
     return;
   }    
 
   if (the < 0. || the > M_PI) {
-    G4cerr << "G4PolyhedronSphere: wrong theta = " << the << endl;
+    G4cerr << "G4PolyhedronSphere: wrong theta = " << the << G4endl;
     return;
   }    
   
   if (dthe <= 0. || dthe > M_PI) {
-    G4cerr << "G4PolyhedronSphere: wrong delta theta = " << dthe << endl;
+    G4cerr << "G4PolyhedronSphere: wrong delta theta = " << dthe << G4endl;
     return;
   }    
 
   if (the+dthe > M_PI) {
     G4cerr << "G4PolyhedronSphere: wrong theta + delta theta = "
-         << the << " " << dthe << endl;
+         << the << " " << dthe << G4endl;
     return;
   }    
   
   if (rmin < 0. || rmin >= rmax) {
     G4cerr << "G4PolyhedronSphere: error in radiuses"
-         << " rmin=" << rmin << " rmax=" << rmax << endl;
+         << " rmin=" << rmin << " rmax=" << rmax << G4endl;
     return;
   }
 
@@ -1248,6 +1299,7 @@ G4PolyhedronSphere::G4PolyhedronSphere(G4double rmin, G4double rmax,
 
   G4int ns = (GetNumberOfRotationSteps() + 1) / 2;
   G4int np1 = G4int(dthe*ns/M_PI+.5) + 1;
+  if (np1 <= 1) np1 = 2;
   G4int np2 = rmin < perMillion ? 1 : np1;
 
   G4double *zz, *rr;
@@ -1301,14 +1353,14 @@ G4PolyhedronTorus::G4PolyhedronTorus(G4double rmin, G4double rmax,
   //   C H E C K   I N P U T   P A R A M E T E R S
 
   if (dphi <= 0. || dphi > 2*M_PI) {
-    G4cerr << "G4PolyhedronTorus: wrong delta phi = " << dphi << endl;
+    G4cerr << "G4PolyhedronTorus: wrong delta phi = " << dphi << G4endl;
     return;
   }
 
   if (rmin < 0. || rmin >= rmax || rmax >= rtor) {
     G4cerr << "G4PolyhedronTorus: error in radiuses"
          << " rmin=" << rmin << " rmax=" << rmax
-         << " rtorus=" << rtor << endl;
+         << " rtorus=" << rtor << G4endl;
     return;
   }
 
diff --git a/source/graphics_reps/src/G4Polyline.cc b/source/graphics_reps/src/G4Polyline.cc
index 9ab543992c..0fc97b9dbe 100644
--- a/source/graphics_reps/src/G4Polyline.cc
+++ b/source/graphics_reps/src/G4Polyline.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyline.cc,v 1.3.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polyline.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  July 1995
@@ -31,7 +31,7 @@ G4Polyline & G4Polyline::operator = (const G4Polyline &right) {
   return *this;
 }
 
-ostream& operator << (ostream& os, const G4Polyline& line) {
+G4std::ostream& operator << (G4std::ostream& os, const G4Polyline& line) {
   os << "G4Polyline: ";
   os << '\n' << (G4VVisPrim) line;
   os << '\n' << (G4Point3DList) line;
diff --git a/source/graphics_reps/src/G4Polymarker.cc b/source/graphics_reps/src/G4Polymarker.cc
index 1fe57ccd8f..7cc210f404 100644
--- a/source/graphics_reps/src/G4Polymarker.cc
+++ b/source/graphics_reps/src/G4Polymarker.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polymarker.cc,v 1.4.8.1 1999/12/07 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Polymarker.cc,v 1.5 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  November 1996
@@ -36,7 +36,7 @@ G4Polymarker & G4Polymarker::operator = (const G4Polymarker &right) {
   return *this;
 }
 
-ostream& operator << (ostream& os, const G4Polymarker& marker) {
+G4std::ostream& operator << (G4std::ostream& os, const G4Polymarker& marker) {
   os << "G4Polymarker: type: ";
   switch (marker.fMarkerType) {
   case G4Polymarker::line:
diff --git a/source/graphics_reps/src/G4Square.cc b/source/graphics_reps/src/G4Square.cc
index 3af544b456..1af84666dd 100644
--- a/source/graphics_reps/src/G4Square.cc
+++ b/source/graphics_reps/src/G4Square.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Square.cc,v 1.1.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Square.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4Text.cc b/source/graphics_reps/src/G4Text.cc
index aa4a9129fc..39d743d01f 100644
--- a/source/graphics_reps/src/G4Text.cc
+++ b/source/graphics_reps/src/G4Text.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Text.cc,v 1.3.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Text.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/src/G4VMarker.cc b/source/graphics_reps/src/G4VMarker.cc
index 8b50ee6782..7d26d0baae 100644
--- a/source/graphics_reps/src/G4VMarker.cc
+++ b/source/graphics_reps/src/G4VMarker.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMarker.cc,v 1.4.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VMarker.cc,v 1.5 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -35,7 +35,7 @@ G4VMarker& G4VMarker::operator = (const G4VMarker& right) {
   return *this;
 }
 
-ostream& operator << (ostream& os, const G4VMarker& marker) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VMarker& marker) {
   os << "G4VMarker: position: " << marker.fPosition
      << ", world size: " << marker.fWorldSize
      << ", screen size: " << marker.fScreenSize << '\n'
diff --git a/source/graphics_reps/src/G4VVisPrim.cc b/source/graphics_reps/src/G4VVisPrim.cc
index 8c5b2c0e4d..fb0131be78 100644
--- a/source/graphics_reps/src/G4VVisPrim.cc
+++ b/source/graphics_reps/src/G4VVisPrim.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisPrim.cc,v 1.4.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisPrim.cc,v 1.5 1999/12/15 14:50:36 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  August 1995
@@ -35,6 +35,6 @@ G4bool G4VVisPrim::operator == (const G4VVisPrim& right) const{
   return G4Visible::operator == (right);
 }
 
-ostream& operator << (ostream& os, const G4VVisPrim& prim) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VVisPrim& prim) {
   return os << (G4Visible) prim;
 }
diff --git a/source/graphics_reps/src/G4VisAttributes.cc b/source/graphics_reps/src/G4VisAttributes.cc
index d26c8c66d9..225fe9e5ab 100644
--- a/source/graphics_reps/src/G4VisAttributes.cc
+++ b/source/graphics_reps/src/G4VisAttributes.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisAttributes.cc,v 1.4.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisAttributes.cc,v 1.5 1999/12/15 14:50:37 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  23rd October 1996
@@ -52,7 +52,7 @@ fForceDrawingStyle  (false)
 
 const G4VisAttributes  G4VisAttributes::Invisible = G4VisAttributes (false);
 
-ostream& operator << (ostream& os, const G4VisAttributes& a) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VisAttributes& a) {
   
   os << "G4VisAttributes: ";
   if (&a){
diff --git a/source/graphics_reps/src/G4VisExtent.cc b/source/graphics_reps/src/G4VisExtent.cc
index 7fd9ff1239..2c25ca2530 100644
--- a/source/graphics_reps/src/G4VisExtent.cc
+++ b/source/graphics_reps/src/G4VisExtent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisExtent.cc,v 1.3.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisExtent.cc,v 1.4 1999/12/15 14:50:37 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // A.Walkden 28/11/95
@@ -50,7 +50,7 @@ G4double G4VisExtent::GetExtentRadius () const {
 	       ((fZmax - fZmin) * (fZmax - fZmin))) / 2.;
 }
  
-ostream& operator << (ostream& os, const G4VisExtent& e) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VisExtent& e) {
   os << "G4VisExtent (bounding box):";
   os << "\n  X limits: " << e.fXmin << ' ' << e.fXmax;
   os << "\n  Y limits: " << e.fYmin << ' ' << e.fYmax;
diff --git a/source/graphics_reps/src/G4Visible.cc b/source/graphics_reps/src/G4Visible.cc
index d4a095a27b..8f8b5491e8 100644
--- a/source/graphics_reps/src/G4Visible.cc
+++ b/source/graphics_reps/src/G4Visible.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Visible.cc,v 1.2.8.1 1999/12/07 20:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Visible.cc,v 1.3 1999/12/15 14:50:37 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  30th October 1996
@@ -28,7 +28,7 @@ G4bool G4Visible::operator == (const G4Visible& right) const{
   return fpVisAttributes == right.fpVisAttributes;
 }
 
-ostream& operator << (ostream& os, const G4Visible& v) {
+G4std::ostream& operator << (G4std::ostream& os, const G4Visible& v) {
   if (v.fpVisAttributes) return os << *(v.fpVisAttributes);
   else return os << "No Visualization Attributes";
 }
diff --git a/source/intercoms/History b/source/intercoms/History
index 13396b0c6a..5eeba72831 100644
--- a/source/intercoms/History
+++ b/source/intercoms/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.11 1999/11/23 17:09:26 johna Exp $
+$Id: History,v 1.12 2000/02/14 08:41:21 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Feb 14, 00, M.Asai (tag intercoms-V01-00-00)
+- Put "const" to "char *" arguments in G4UImanager
+
 Nov 23, 99, J.Allison (tag intercoms-V00-01-02)
 - Tagged changes for Software Reference Manual on behalf of Makoto Asai.
 
diff --git a/source/intercoms/include/G4ApplicationState.hh b/source/intercoms/include/G4ApplicationState.hh
index a310f83bce..1f9e25d0e4 100644
--- a/source/intercoms/include/G4ApplicationState.hh
+++ b/source/intercoms/include/G4ApplicationState.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ApplicationState.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ApplicationState.hh,v 1.3 1999/12/15 14:50:37 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4APPLICATIONSTATE_H
diff --git a/source/intercoms/include/G4StateManager.hh b/source/intercoms/include/G4StateManager.hh
index feceaefe42..73062cf3f2 100644
--- a/source/intercoms/include/G4StateManager.hh
+++ b/source/intercoms/include/G4StateManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StateManager.hh,v 1.3.2.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StateManager.hh,v 1.5 2000/02/14 12:24:41 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -73,7 +73,7 @@ public: // with description
   G4String GetStateString(G4ApplicationState aState);
   //  A utility method which returns a string of the state name.
   void Pause();
-  void Pause(char* msg);
+  void Pause(const char* msg);
   void Pause(G4String msg);
   //  G4UIsession::pauseSession() will be invoked. The argument string "msg"
   // will be used as a prompt characters if the session is non-graphical.
diff --git a/source/intercoms/include/G4UIbatch.hh b/source/intercoms/include/G4UIbatch.hh
index 63a59e7db2..f00ddb91d6 100644
--- a/source/intercoms/include/G4UIbatch.hh
+++ b/source/intercoms/include/G4UIbatch.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIbatch.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIbatch.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $id$
 
@@ -15,7 +15,7 @@
 
 #include "globals.hh"
 #include "G4UIsession.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4UImanager;
 
@@ -45,7 +45,7 @@ class G4UIbatch : public G4UIsession
   private:
       G4UImanager * UImanager;
       G4UIsession * previousSession;
-      ifstream macroFile;
+      G4std::ifstream macroFile;
       G4String macroFileName;
       G4bool openFailed;
 };
diff --git a/source/intercoms/include/G4UIcmdWith3Vector.hh b/source/intercoms/include/G4UIcmdWith3Vector.hh
index 2b826a4bf8..8bd2d26473 100644
--- a/source/intercoms/include/G4UIcmdWith3Vector.hh
+++ b/source/intercoms/include/G4UIcmdWith3Vector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWith3Vector.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWith3Vector.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
index f17c8de7a7..59190c2b92 100644
--- a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithABool.hh b/source/intercoms/include/G4UIcmdWithABool.hh
index fb33474914..a9721906d4 100644
--- a/source/intercoms/include/G4UIcmdWithABool.hh
+++ b/source/intercoms/include/G4UIcmdWithABool.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithABool.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithABool.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADouble.hh b/source/intercoms/include/G4UIcmdWithADouble.hh
index 42d8746be7..20a8a8663e 100644
--- a/source/intercoms/include/G4UIcmdWithADouble.hh
+++ b/source/intercoms/include/G4UIcmdWithADouble.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithADouble.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithADouble.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
index 06d5d32862..8a5c4ad7b5 100644
--- a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAString.hh b/source/intercoms/include/G4UIcmdWithAString.hh
index 2563ef7bae..2593ea44e8 100644
--- a/source/intercoms/include/G4UIcmdWithAString.hh
+++ b/source/intercoms/include/G4UIcmdWithAString.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithAString.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithAString.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAnInteger.hh b/source/intercoms/include/G4UIcmdWithAnInteger.hh
index 33fd0437cd..b7a9de70e8 100644
--- a/source/intercoms/include/G4UIcmdWithAnInteger.hh
+++ b/source/intercoms/include/G4UIcmdWithAnInteger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithAnInteger.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithAnInteger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithoutParameter.hh b/source/intercoms/include/G4UIcmdWithoutParameter.hh
index d436220220..a9a34fd77c 100644
--- a/source/intercoms/include/G4UIcmdWithoutParameter.hh
+++ b/source/intercoms/include/G4UIcmdWithoutParameter.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithoutParameter.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithoutParameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcommand.hh b/source/intercoms/include/G4UIcommand.hh
index 54b001baf2..88aef87ed1 100644
--- a/source/intercoms/include/G4UIcommand.hh
+++ b/source/intercoms/include/G4UIcommand.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcommand.hh,v 1.4.2.1 1999/12/07 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcommand.hh,v 1.5 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/intercoms/include/G4UIcommandStatus.hh b/source/intercoms/include/G4UIcommandStatus.hh
index ab7a7029a4..428396c152 100644
--- a/source/intercoms/include/G4UIcommandStatus.hh
+++ b/source/intercoms/include/G4UIcommandStatus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcommandStatus.hh,v 1.1.10.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcommandStatus.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UIcommandStatus_h
diff --git a/source/intercoms/include/G4UIcommandTree.hh b/source/intercoms/include/G4UIcommandTree.hh
index 756a16c617..7b6b386f29 100644
--- a/source/intercoms/include/G4UIcommandTree.hh
+++ b/source/intercoms/include/G4UIcommandTree.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcommandTree.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcommandTree.hh,v 1.5 2000/02/14 12:24:41 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UIcommandTree_h
@@ -28,7 +28,7 @@ class G4UIcommandTree
   public:
       G4UIcommandTree();
       G4UIcommandTree(G4String thePathName);
-      G4UIcommandTree(char * thePathName);
+      G4UIcommandTree(const char * thePathName);
       ~G4UIcommandTree();
       int operator==(const G4UIcommandTree &right) const;
       int operator!=(const G4UIcommandTree &right) const;
diff --git a/source/intercoms/include/G4UIcontrolMessenger.hh b/source/intercoms/include/G4UIcontrolMessenger.hh
index 58b3600635..3d1e2002ee 100644
--- a/source/intercoms/include/G4UIcontrolMessenger.hh
+++ b/source/intercoms/include/G4UIcontrolMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcontrolMessenger.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcontrolMessenger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UIcontrolMessenger_h
diff --git a/source/intercoms/include/G4UIdirectory.hh b/source/intercoms/include/G4UIdirectory.hh
index aa3f4bb5e5..5790e839f0 100644
--- a/source/intercoms/include/G4UIdirectory.hh
+++ b/source/intercoms/include/G4UIdirectory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIdirectory.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIdirectory.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UImanager.hh b/source/intercoms/include/G4UImanager.hh
index 338115e22d..39d9fae224 100644
--- a/source/intercoms/include/G4UImanager.hh
+++ b/source/intercoms/include/G4UImanager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UImanager.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UImanager.hh,v 1.5 2000/02/14 08:41:24 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UImanager_h
@@ -15,7 +15,7 @@
 #include "globals.hh"
 #include "g4rw/ctoken.h"
 #include "g4rw/tvordvec.h"
-#include <fstream.h>
+#include "g4std/fstream"
 class G4UIcommandTree;
 class G4UIcommand;
 class G4UIsession;
@@ -59,7 +59,7 @@ class G4UImanager
       // command, that particular command cannot be applied.
       void ExecuteMacroFile(G4String fileName);
       //  A macro file defined by the argument will be read by G4UIbatch object.
-      G4int ApplyCommand(char * aCommand);
+      G4int ApplyCommand(const char * aCommand);
       G4int ApplyCommand(G4String aCommand);
       //  These two methods are identical. A command (and parameter(s)) given
       // by the method's argument will be applied. Zero will be returned in 
@@ -88,7 +88,7 @@ class G4UImanager
   public:
   // following three methods will be removed quite soon.
       void Interact();
-      void Interact(char * promptCharacters);
+      void Interact(const char * promptCharacters);
       void Interact(G4String promptCharacters);
 
   private:
@@ -101,7 +101,7 @@ class G4UImanager
       G4String savedParameters;
       G4UIcommand * savedCommand;
       G4int verboseLevel;
-      ofstream historyFile;
+      G4std::ofstream historyFile;
       G4bool saveHistory;
       G4RWTValOrderedVector<G4String> histVec;
 
diff --git a/source/intercoms/include/G4UImessenger.hh b/source/intercoms/include/G4UImessenger.hh
index 2ac514d68b..b4f0f8be9e 100644
--- a/source/intercoms/include/G4UImessenger.hh
+++ b/source/intercoms/include/G4UImessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UImessenger.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UImessenger.hh,v 1.4 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UImessenger_h
diff --git a/source/intercoms/include/G4UIparameter.hh b/source/intercoms/include/G4UIparameter.hh
index 82d5d637a3..30e80cb251 100644
--- a/source/intercoms/include/G4UIparameter.hh
+++ b/source/intercoms/include/G4UIparameter.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIparameter.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIparameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------------
@@ -16,11 +16,7 @@
 
 #include "globals.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include "G4UItokenNum.hh"
 
diff --git a/source/intercoms/include/G4UIsession.hh b/source/intercoms/include/G4UIsession.hh
index d50fb74b75..8d7845fef1 100644
--- a/source/intercoms/include/G4UIsession.hh
+++ b/source/intercoms/include/G4UIsession.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIsession.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIsession.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $id$
 
diff --git a/source/intercoms/include/G4UItokenNum.hh b/source/intercoms/include/G4UItokenNum.hh
index 654f40d09a..61481c19b0 100644
--- a/source/intercoms/include/G4UItokenNum.hh
+++ b/source/intercoms/include/G4UItokenNum.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UItokenNum.hh,v 1.1.10.1 1999/12/07 20:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UItokenNum.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4UItokenNum.hh
 
diff --git a/source/intercoms/include/G4UnitsMessenger.hh b/source/intercoms/include/G4UnitsMessenger.hh
index 3eeea8b5db..dd00a9ecca 100644
--- a/source/intercoms/include/G4UnitsMessenger.hh
+++ b/source/intercoms/include/G4UnitsMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsMessenger.hh,v 1.2.2.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UnitsMessenger.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class description
 //
diff --git a/source/intercoms/include/G4VFlavoredParallelWorld.hh b/source/intercoms/include/G4VFlavoredParallelWorld.hh
index 36dfefc721..b52061d21d 100644
--- a/source/intercoms/include/G4VFlavoredParallelWorld.hh
+++ b/source/intercoms/include/G4VFlavoredParallelWorld.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VFlavoredParallelWorld.hh,v 1.1.8.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VFlavoredParallelWorld.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Abstract interface for GEANT4 Flavored Parallel World.
diff --git a/source/intercoms/include/G4VGlobalFastSimulationManager.hh b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
index 28bb6dfb49..916d02fdd1 100644
--- a/source/intercoms/include/G4VGlobalFastSimulationManager.hh
+++ b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGlobalFastSimulationManager.hh,v 1.1.8.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGlobalFastSimulationManager.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/include/G4VGraphicsScene.hh b/source/intercoms/include/G4VGraphicsScene.hh
index 81cd664f49..68e296fc14 100644
--- a/source/intercoms/include/G4VGraphicsScene.hh
+++ b/source/intercoms/include/G4VGraphicsScene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGraphicsScene.hh,v 1.3.4.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGraphicsScene.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // John Allison  19th July 1996
 //
 // Class Description:
diff --git a/source/intercoms/include/G4VStateDependent.hh b/source/intercoms/include/G4VStateDependent.hh
index 8bba1154b2..659916f107 100644
--- a/source/intercoms/include/G4VStateDependent.hh
+++ b/source/intercoms/include/G4VStateDependent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VStateDependent.hh,v 1.2.4.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VStateDependent.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/intercoms/include/G4VVisManager.hh b/source/intercoms/include/G4VVisManager.hh
index b958408800..00cd96eb6e 100644
--- a/source/intercoms/include/G4VVisManager.hh
+++ b/source/intercoms/include/G4VVisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisManager.hh,v 1.3.4.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisManager.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // John Allison 19/Oct/1996.
 // 
 // Class Description:
diff --git a/source/intercoms/src/G4StateManager.cc b/source/intercoms/src/G4StateManager.cc
index 493f24d887..d9ec7342e4 100644
--- a/source/intercoms/src/G4StateManager.cc
+++ b/source/intercoms/src/G4StateManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StateManager.cc,v 1.1.10.1 1999/12/07 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StateManager.cc,v 1.3 2000/02/14 12:24:42 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -139,7 +139,7 @@ void G4StateManager::Pause()
   Pause("G4_pause> ");
 }
 
-void G4StateManager::Pause(char* msg)
+void G4StateManager::Pause(const char* msg)
 {
   G4String msgS = msg;
   Pause(msgS);
diff --git a/source/intercoms/src/G4UIbatch.cc b/source/intercoms/src/G4UIbatch.cc
index 6574a5d891..71060f5dc9 100644
--- a/source/intercoms/src/G4UIbatch.cc
+++ b/source/intercoms/src/G4UIbatch.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIbatch.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIbatch.cc,v 1.2 1999/12/15 14:50:40 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIbatch.hh"
@@ -24,7 +24,7 @@ G4UIbatch::G4UIbatch(G4String fileName,G4UIsession* prevSession)
   if(macroFile.fail())
   {
     G4cerr << "macro file <" << fileName << "> could not open."
-         << endl;
+         << G4endl;
     openFailed = true;
   }
 }
@@ -46,7 +46,7 @@ G4UIsession * G4UIbatch::SessionStart()
       macroFile.getline( commandLine, lineLength );
       if( macroFile.bad() )
       {
-        G4cout << "Cannot read " << macroFileName << "." << endl;
+        G4cout << "Cannot read " << macroFileName << "." << G4endl;
         break;
       }
       if( macroFile.eof() ) break;
@@ -54,7 +54,7 @@ G4UIsession * G4UIbatch::SessionStart()
       if( commandLine[0] != '#' )
       { UImanager->ApplyCommand(commandLine); }
       else
-      { G4cout << commandLine << endl; }
+      { G4cout << commandLine << G4endl; }
     }
   }
   return previousSession;
@@ -62,9 +62,9 @@ G4UIsession * G4UIbatch::SessionStart()
 
 void G4UIbatch::PauseSessionStart(G4String Prompt) 
 {
-  G4cout << "Pause session <" << Prompt << "> start." << endl;
+  G4cout << "Pause session <" << Prompt << "> start." << G4endl;
   SessionStart();
-  G4cout << "Pause session <" << Prompt << "> Terminate." << endl;
+  G4cout << "Pause session <" << Prompt << "> Terminate." << G4endl;
 }
 
 
diff --git a/source/intercoms/src/G4UIcmdWith3Vector.cc b/source/intercoms/src/G4UIcmdWith3Vector.cc
index 6a9138767c..bf60159ed2 100644
--- a/source/intercoms/src/G4UIcmdWith3Vector.cc
+++ b/source/intercoms/src/G4UIcmdWith3Vector.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWith3Vector.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWith3Vector.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWith3Vector.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWith3Vector::G4UIcmdWith3Vector
 (const char * theCommandPath,G4UImessenger * theMessenger)
@@ -35,7 +31,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(G4String paramString)
   G4double vy;
   G4double vz;
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vx >> vy >> vz;
   return G4ThreeVector(vx,vy,vz);
 }
@@ -43,7 +39,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(G4String paramString)
 G4String G4UIcmdWith3Vector::ConvertToString(G4ThreeVector vec)
 {
   char st[100];
-  ostrstream os(st,100);
+  G4std::ostrstream os(st,100);
   os << vec.x() << " " << vec.y() << " " << vec.z() << '\0';
   G4String vl = st;
   return vl;
diff --git a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
index f396186f4c..8112a22ee7 100644
--- a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWith3VectorAndUnit.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWith3VectorAndUnit::G4UIcmdWith3VectorAndUnit
 (const char * theCommandPath,G4UImessenger * theMessenger)
@@ -39,7 +35,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorValue(G4String paramString
   G4double vz;
   char unts[30];
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vx >> vy >> vz >> unts;
   G4String unt = unts;
   G4double uv = ValueOf(unt);
@@ -53,7 +49,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorRawValue(G4String paramStr
   G4double vz;
   char unts[30];
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vx >> vy >> vz >> unts;
   return G4ThreeVector(vx,vy,vz);
 }
@@ -65,7 +61,7 @@ G4double G4UIcmdWith3VectorAndUnit::GetNewUnitValue(G4String paramString)
   G4double vz;
   char unts[30];
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vx >> vy >> vz >> unts;
   G4String unt = unts;
   return ValueOf(unt);
@@ -78,7 +74,7 @@ G4String G4UIcmdWith3VectorAndUnit::ConvertToString
   G4double uv = ValueOf(unitName);
   
   char st[100];
-  ostrstream os(st,100);
+  G4std::ostrstream os(st,100);
   os << vec.x()/uv << " " << vec.y()/uv << " " << vec.z()/uv
      << " " << unitName << '\0';
   G4String vl = st;
diff --git a/source/intercoms/src/G4UIcmdWithABool.cc b/source/intercoms/src/G4UIcmdWithABool.cc
index d2057ca9bc..d6d23a7f68 100644
--- a/source/intercoms/src/G4UIcmdWithABool.cc
+++ b/source/intercoms/src/G4UIcmdWithABool.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithABool.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithABool.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWithABool.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWithABool::G4UIcmdWithABool
 (const char * theCommandPath,G4UImessenger * theMessenger)
diff --git a/source/intercoms/src/G4UIcmdWithADouble.cc b/source/intercoms/src/G4UIcmdWithADouble.cc
index 644ffdd670..1062402cfe 100644
--- a/source/intercoms/src/G4UIcmdWithADouble.cc
+++ b/source/intercoms/src/G4UIcmdWithADouble.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithADouble.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithADouble.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWithADouble.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWithADouble::G4UIcmdWithADouble
 (const char * theCommandPath,G4UImessenger * theMessenger)
@@ -29,7 +25,7 @@ G4double G4UIcmdWithADouble::GetNewDoubleValue(G4String paramString)
 {
   G4double vl;
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl;
   return vl;
 }
@@ -37,7 +33,7 @@ G4double G4UIcmdWithADouble::GetNewDoubleValue(G4String paramString)
 G4String G4UIcmdWithADouble::ConvertToString(G4double dblValue)
 {
   char st[20];
-  ostrstream os(st,20);
+  G4std::ostrstream os(st,20);
   os << dblValue << '\0';
   G4String vl = st;
   return vl;
diff --git a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
index 0cc09a836d..849b54389b 100644
--- a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWithADoubleAndUnit.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWithADoubleAndUnit::G4UIcmdWithADoubleAndUnit
 (const char * theCommandPath,G4UImessenger * theMessenger)
@@ -34,7 +30,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(G4String paramString)
   char unts[30];
   
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl >> unts;
   G4String unt = unts;
   
@@ -47,7 +43,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleRawValue(G4String paramString)
   char unts[30];
   
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl >> unts;
   
   return vl;
@@ -59,7 +55,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewUnitValue(G4String paramString)
   char unts[30];
   
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl >> unts;
   G4String unt = unts;
   
@@ -73,7 +69,7 @@ G4String G4UIcmdWithADoubleAndUnit::ConvertToString
   G4double uv = ValueOf(unitName);
   
   char st[50];
-  ostrstream os(st,50);
+  G4std::ostrstream os(st,50);
   os << dblValue/uv << " " << unitName << '\0';
   G4String vl = st;
   return vl;
diff --git a/source/intercoms/src/G4UIcmdWithAString.cc b/source/intercoms/src/G4UIcmdWithAString.cc
index 4d88fc75ba..160762af2a 100644
--- a/source/intercoms/src/G4UIcmdWithAString.cc
+++ b/source/intercoms/src/G4UIcmdWithAString.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithAString.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithAString.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWithAString.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWithAString::G4UIcmdWithAString
 (const char * theCommandPath,G4UImessenger * theMessenger)
diff --git a/source/intercoms/src/G4UIcmdWithAnInteger.cc b/source/intercoms/src/G4UIcmdWithAnInteger.cc
index 61a1dea7ed..89abcd18c2 100644
--- a/source/intercoms/src/G4UIcmdWithAnInteger.cc
+++ b/source/intercoms/src/G4UIcmdWithAnInteger.cc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithAnInteger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithAnInteger.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
 #include "G4UIcmdWithAnInteger.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIcmdWithAnInteger::G4UIcmdWithAnInteger
 (const char * theCommandPath,G4UImessenger * theMessenger)
@@ -29,7 +25,7 @@ G4int G4UIcmdWithAnInteger::GetNewIntValue(G4String paramString)
 {
   G4int vl;
   const char* t = paramString;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl;
   return vl;
 }
@@ -37,7 +33,7 @@ G4int G4UIcmdWithAnInteger::GetNewIntValue(G4String paramString)
 G4String G4UIcmdWithAnInteger::ConvertToString(G4int intValue)
 {
   char st[20];
-  ostrstream os(st,20);
+  G4std::ostrstream os(st,20);
   os << intValue << '\0';
   G4String vl = st;
   return vl;
diff --git a/source/intercoms/src/G4UIcmdWithoutParameter.cc b/source/intercoms/src/G4UIcmdWithoutParameter.cc
index 52321d49f7..b833185e3f 100644
--- a/source/intercoms/src/G4UIcmdWithoutParameter.cc
+++ b/source/intercoms/src/G4UIcmdWithoutParameter.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcmdWithoutParameter.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcmdWithoutParameter.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcommand.cc b/source/intercoms/src/G4UIcommand.cc
index 72428bb0f6..cc511e2fd1 100644
--- a/source/intercoms/src/G4UIcommand.cc
+++ b/source/intercoms/src/G4UIcommand.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcommand.cc,v 1.4.2.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcommand.cc,v 1.5 1999/12/15 14:50:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -30,9 +30,9 @@ G4UIcommand::G4UIcommand(const char * theCommandPath,
   { // this must be a directory
     if(comStr(comStr.length()-1)!='/')
     {
-      G4cerr << "G4UIcommand Warning : " << endl;
-      G4cerr << "  <" << theCommandPath << "> must be a directory." << endl;
-      G4cerr << "  '/' is appended." << endl;
+      G4cerr << "G4UIcommand Warning : " << G4endl;
+      G4cerr << "  <" << theCommandPath << "> must be a directory." << G4endl;
+      G4cerr << "  '/' is appended." << G4endl;
       comStr += "/";
     }
   }
@@ -247,7 +247,7 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
   { if(UTbl[i]->GetName()==unitCategory) break; }
   if(i==UTbl.entries())
   { 
-    G4cerr << "Unit category <" << unitCategory << "> is not defined." << endl;
+    G4cerr << "Unit category <" << unitCategory << "> is not defined." << G4endl;
     return retStr;
   }
   G4UnitsContainer& UCnt = UTbl[i]->GetUnitsList();
@@ -268,34 +268,30 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
   
 void G4UIcommand::List()
 {
-  G4cout << endl;
-  G4cout << endl;
+  G4cout << G4endl;
+  G4cout << G4endl;
   if(commandPath(commandPath.length()-1)!='/')
-  { G4cout << "Command " << commandPath << endl; }
-  G4cout << "Guidance :" << endl;
+  { G4cout << "Command " << commandPath << G4endl; }
+  G4cout << "Guidance :" << G4endl;
   int n_guidanceEntry = commandGuidance.entries();
   for( int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ )
-  { G4cout << commandGuidance[i_thGuidance] << endl; }
+  { G4cout << commandGuidance[i_thGuidance] << G4endl; }
   if( ! rangeString.isNull() )
-  { G4cout << " Range of parameters : " << rangeString << endl; }
+  { G4cout << " Range of parameters : " << rangeString << G4endl; }
   int n_parameterEntry = parameter.entries();
   if( n_parameterEntry > 0 )
   {
     for( int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ )
     { parameter[i_thParameter]->List(); }
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 // ----- the following is used by CheckNewValue()  ------------
 
 
 #include <ctype.h>          // isalpha(), toupper()
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 //#include "checkNewValue_debug.icc"
 //#define DEBUG 1
@@ -318,7 +314,7 @@ TypeCheck(G4String newValues)
     G4String aNewValue;
     char type;
     const char* t = newValues;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     for (unsigned i=0; i< parameter.entries(); i++) {
         is >> aNewValue;
         type = toupper(parameter(i)->GetParameterType());
@@ -326,13 +322,13 @@ TypeCheck(G4String newValues)
             case 'D':
                 if( IsDouble(aNewValue)==0 ){
                     G4cerr << aNewValue << ": double value expected."
-                         << endl;
+                         << G4endl;
                     return 0;
                 } break;
             case 'I':
                 if( IsInt(aNewValue,20)==0 ){
                     G4cerr <<aNewValue<<": integer expected."
-                         <<endl;
+                         <<G4endl;
                      return 0;
                 } break;
             case 'S':
@@ -364,15 +360,15 @@ IsInt(const char* buf, short maxDigits)
         while( isdigit( (int)(*p) )) { ++p;  ++length; }
         if( *p == '\0' ) {
             if( length > maxDigits) {
-                G4cerr <<"digit length exceeds"<<endl;
+                G4cerr <<"digit length exceeds"<<G4endl;
                 return 0;
             }
             return 1;
         } else {
-            // G4cerr <<"illegal character after int:"<<buf<<endl;
+            // G4cerr <<"illegal character after int:"<<buf<<G4endl;
         }
     } else {
-        // G4cerr <<"illegal int:"<<buf<<endl;
+        // G4cerr <<"illegal int:"<<buf<<G4endl;
     }
     return 0;
 }
@@ -453,7 +449,7 @@ RangeCheck(G4String newValue) {
     char type;
     bp = 0;                 // reset buffer pointer for G4UIpGetc()
     const char* t = newValue;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     for (unsigned i=0; i< parameter.entries(); i++) {
         type= toupper(parameter(i)->GetParameterType());
         switch ( type ) {
@@ -470,11 +466,11 @@ RangeCheck(G4String newValue) {
 
    if( paramERR == 1 ) return 0;
    if( result.type != CONSTINT) {
-      G4cerr << "Illegal Expression in parameter range." << endl;
+      G4cerr << "Illegal Expression in parameter range." << G4endl;
       return 0;
    }
    if ( result.I ) return 1;
-   G4cerr << "parameter out of range: "<< rangeString << endl;
+   G4cerr << "parameter out of range: "<< rangeString << G4endl;
    return 0;
 }
 
@@ -484,7 +480,7 @@ Expression(void)
 {
     yystype result;
     #ifdef DEBUG
-        G4cerr << " Expression()" << endl;
+        G4cerr << " Expression()" << G4endl;
     #endif
     result = LogicalORExpression();
     return result;
@@ -498,7 +494,7 @@ LogicalORExpression(void)
     p = LogicalANDExpression();
     if( token != LOGICALOR)  return p;
     if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-        G4cerr << "Parameter range: illegal type at '||'" << endl;
+        G4cerr << "Parameter range: illegal type at '||'" << G4endl;
         paramERR = 1;
     }
     result.I = p.I;
@@ -507,7 +503,7 @@ LogicalORExpression(void)
         token = Yylex();
         p = LogicalANDExpression();
         if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-            G4cerr << "Parameter range: illegal type at '||'" <<endl;
+            G4cerr << "Parameter range: illegal type at '||'" <<G4endl;
             paramERR = 1;
         }
         switch (p.type) {
@@ -518,7 +514,7 @@ LogicalORExpression(void)
                 result.I += (p.D != 0.0); 
                 result.type = CONSTINT;      break;
             default: 
-                G4cerr << "Parameter range: unknown type"<<endl; 
+                G4cerr << "Parameter range: unknown type"<<G4endl; 
                 paramERR = 1;
         } 
     }
@@ -533,7 +529,7 @@ LogicalANDExpression(void)
     p = EqualityExpression();
     if( token != LOGICALAND)  return p;
     if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-        G4cerr << "Parameter range: illegal type at '&&'" << endl;
+        G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
         paramERR = 1;
     }
     result.I = p.I;
@@ -542,7 +538,7 @@ LogicalANDExpression(void)
         token = Yylex();
         p = EqualityExpression();
         if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-            G4cerr << "Parameter range: illegal type at '&&'" << endl;
+            G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
             paramERR = 1;
         }
         switch (p.type) {
@@ -553,7 +549,7 @@ LogicalANDExpression(void)
                 result.I *= (p.D != 0.0);
                 result.type = CONSTINT;      break;
             default:
-                G4cerr << "Parameter range: unknown type."<< endl;
+                G4cerr << "Parameter range: unknown type."<< G4endl;
                 paramERR = 1;
         } 
     }
@@ -568,7 +564,7 @@ EqualityExpression(void)
     int operat;
     yystype result;
     #ifdef DEBUG
-        G4cerr << " EqualityExpression()" <<endl;
+        G4cerr << " EqualityExpression()" <<G4endl;
     #endif
     result = RelationalExpression();
     if( token==EQ || token==NE ) {
@@ -579,12 +575,12 @@ EqualityExpression(void)
         result.I = Eval2( arg1, operat, arg2 );   // semantic action
         result.type = CONSTINT;
         #ifdef DEBUG
-            G4cerr << " return code of Eval2(): " << result.I <<endl;
+            G4cerr << " return code of Eval2(): " << result.I <<G4endl;
         #endif
     } else {
         if (result.type != CONSTINT && result.type != CONSTDOUBLE) {  
             G4cerr << "Parameter range: error at EqualityExpression"
-                 << endl;
+                 << G4endl;
             paramERR = 1;
         }
     }
@@ -599,7 +595,7 @@ RelationalExpression(void)
     int operat;
     yystype result;
     #ifdef DEBUG
-        G4cerr << " RelationalExpression()" <<endl;
+        G4cerr << " RelationalExpression()" <<G4endl;
     #endif
 
     arg1 = AdditiveExpression();
@@ -610,13 +606,13 @@ RelationalExpression(void)
         result.I = Eval2( arg1, operat, arg2 );    // semantic action
         result.type = CONSTINT;
         #ifdef DEBUG
-            G4cerr << " return code of Eval2(): " << result.I << endl;
+            G4cerr << " return code of Eval2(): " << result.I << G4endl;
         #endif
     } else {
               result = arg1;
     }
     #ifdef DEBUG
-       G4cerr <<" return RelationalExpression()"<< endl;
+       G4cerr <<" return RelationalExpression()"<< G4endl;
     #endif
     return  result;
 }
@@ -628,7 +624,7 @@ AdditiveExpression(void)
     if( token != '+' && token != '-' )  return result;
     G4cerr << "Parameter range: operator " 
          << (char)token 
-         << " is not supported." << endl;
+         << " is not supported." << G4endl;
     paramERR = 1;
     return  result;
 }
@@ -640,7 +636,7 @@ MultiplicativeExpression(void)
     if( token != '*' && token != '/' && token != '%' ) return result;
     G4cerr << "Parameter range: operator "
          << (char)token
-         << " is not supported." << endl;
+         << " is not supported." << G4endl;
     paramERR = 1;
     return  result;
 }
@@ -651,7 +647,7 @@ UnaryExpression(void)
     yystype result;
     yystype p;
     #ifdef DEBUG
-        G4cerr <<" UnaryExpression"<< endl;
+        G4cerr <<" UnaryExpression"<< G4endl;
     #endif
     switch(token) {
         case '-':
@@ -672,7 +668,7 @@ UnaryExpression(void)
             token = Yylex();
             G4cerr << "Parameter range error: "
                  << "operator '!' is not supported (sorry)."
-                 << endl;
+                 << G4endl;
             paramERR = 1;
             result = UnaryExpression();   break;
         default:
@@ -687,7 +683,7 @@ PrimaryExpression(void)
 {
      yystype result;
      #ifdef DEBUG
-         G4cerr <<" primary_exp"<<endl;
+         G4cerr <<" primary_exp"<<G4endl;
      #endif
      switch (token) {
          case IDENTIFIER:
@@ -706,7 +702,7 @@ PrimaryExpression(void)
               token= Yylex();
               result = Expression();
               if( token !=  ')'  ) {
-                  G4cerr << " ')' expected" << endl;
+                  G4cerr << " ')' expected" << G4endl;
                   paramERR = 1;
               }
               token = Yylex();
@@ -726,7 +722,7 @@ Eval2(yystype arg1, int op, yystype arg2)
     if( (arg1.type != IDENTIFIER) && (arg2.type != IDENTIFIER)) {
         G4cerr << commandName
              << ": meaningless comparison"
-             << endl;
+             << G4endl;
         paramERR = 1;
     }
 
@@ -740,7 +736,7 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } else {
                     G4cerr << "integer operand expected for "
                          <<  rangeString 
-                         << '.' << endl;
+                         << '.' << G4endl;
                 } break;
             case 'D':
                 if( arg2.type == CONSTDOUBLE ) {
@@ -762,7 +758,7 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } else {
                     G4cerr << "integer operand expected for "
                          <<  rangeString
-                         << '.' << endl;
+                         << '.' << G4endl;
                 } break;
             case 'D':
                 if( arg1.type == CONSTDOUBLE ) {
@@ -790,14 +786,14 @@ CompareInt(int arg1, int op, int arg2)
        case EQ:  result = ( arg1 == arg2); opr= "==";  break;
        case NE:  result = ( arg1 != arg2); opr= "!=";  break;
        default: 
-           G4cerr << "Parameter range: error at CompareInt" << endl;
+           G4cerr << "Parameter range: error at CompareInt" << G4endl;
            paramERR = 1;
     }
     #ifdef DEBUG
         G4cerr << "CompareInt "
              << arg1 << " " << opr << arg2 
              << " result: " << result
-             << endl;
+             << G4endl;
     #endif
     return result;
 }
@@ -816,14 +812,14 @@ CompareDouble(double arg1, int op, double arg2)
         case NE:  result = ( arg1 != arg2); opr= "!=";  break;
         default:
            G4cerr << "Parameter range: error at CompareDouble"
-                << endl;
+                << G4endl;
            paramERR = 1;
     }
     #ifdef DEBUG
         G4cerr << "CompareDouble " 
              << arg1 <<" " << opr << " "<< arg2
              << " result: " << result
-             << endl;
+             << G4endl;
     #endif
     return result;
 }
@@ -841,7 +837,7 @@ IndexOf( G4String nam)
         }
     }
     paramERR = 1;
-    G4cerr << "parameter name:"<<nam<<" not found."<< endl;
+    G4cerr << "parameter name:"<<nam<<" not found."<< G4endl;
     return 0;
 }
 
@@ -880,7 +876,7 @@ Yylex()         // reads input and returns token number, KR486
                    c=='e' || c=='E' || c=='+' || c=='-');
          G4UIpUngetc(c);
          const char* t = buf;
-	 istrstream is((char*)t);
+	 G4std::istrstream is((char*)t);
          if ( IsInt(buf.data(),20) ) {
              is >> yylval.I;
              return  CONSTINT;
@@ -889,7 +885,7 @@ Yylex()         // reads input and returns token number, KR486
              is >> yylval.D;
              return  CONSTDOUBLE;
          } else {
-             G4cerr << buf<<": numeric format error."<<endl;
+             G4cerr << buf<<": numeric format error."<<G4endl;
          }
     }
     buf="";
@@ -902,7 +898,7 @@ Yylex()         // reads input and returns token number, KR486
             yylval.S =buf;
             return IDENTIFIER;
         } else {
-            G4cerr << buf << " is not a parameter name."<< endl;
+            G4cerr << buf << " is not a parameter name."<< G4endl;
             paramERR = 1;
        }
     }
@@ -944,10 +940,10 @@ G4UIpUngetc(int c) {                 // emulation of ungetc()
     if (bp >0 && c == rangeString(bp-1)) {
          --bp;
     } else {
-         G4cerr << "G4UIpUngetc() failed." << endl;
+         G4cerr << "G4UIpUngetc() failed." << G4endl;
          G4cerr << "bp="<<bp <<" c="<<c
               << " pR(bp-1)=" << rangeString(bp-1)
-              << endl;
+              << G4endl;
          paramERR = 1;
          return -1;
     }
diff --git a/source/intercoms/src/G4UIcommandTree.cc b/source/intercoms/src/G4UIcommandTree.cc
index e123dff334..8df72be5c4 100644
--- a/source/intercoms/src/G4UIcommandTree.cc
+++ b/source/intercoms/src/G4UIcommandTree.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcommandTree.cc,v 1.2.2.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcommandTree.cc,v 1.4 2000/02/14 12:24:42 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIcommandTree.hh"
@@ -22,7 +22,7 @@ G4UIcommandTree::G4UIcommandTree(G4String thePathName)
   pathName = thePathName;
 }
 
-G4UIcommandTree::G4UIcommandTree(char * thePathName)
+G4UIcommandTree::G4UIcommandTree(const char * thePathName)
 :guidance(NULL)
 {
   pathName = thePathName;
@@ -174,45 +174,45 @@ G4UIcommand * G4UIcommandTree::FindPath(G4String commandPath)
 
 void G4UIcommandTree::ListCurrent()
 {
-  G4cout << "Command directory path : " << pathName << endl;
+  G4cout << "Command directory path : " << pathName << G4endl;
   if( guidance != NULL ) guidance->List();
   int i = 0;
-  G4cout << " Sub-directories : " << endl;
+  G4cout << " Sub-directories : " << G4endl;
   int n_treeEntry = tree.entries();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
   {
     G4cout << "   " << tree[i_thTree]->GetPathName() 
-	 << "   " << tree[i_thTree]->GetTitle() << endl;
+	 << "   " << tree[i_thTree]->GetTitle() << G4endl;
   }
-  G4cout << " Commands : " << endl;
+  G4cout << " Commands : " << G4endl;
   int n_commandEntry = command.entries();
   for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
   {
     G4cout << "   " << command[i_thCommand]->GetCommandName() 
-	 << " * " << command[i_thCommand]->GetTitle() << endl;
+	 << " * " << command[i_thCommand]->GetTitle() << G4endl;
   }
 }
 
 void G4UIcommandTree::ListCurrentWithNum()
 {
-  G4cout << "Command directory path : " << pathName << endl;
+  G4cout << "Command directory path : " << pathName << G4endl;
   if( guidance != NULL ) guidance->List();
   int i = 0;
-  G4cout << " Sub-directories : " << endl;
+  G4cout << " Sub-directories : " << G4endl;
   int n_treeEntry = tree.entries();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
   {
     i++;
     G4cout << " " << i << ") " << tree[i_thTree]->GetPathName() 
-	 << "   " << tree[i_thTree]->GetTitle() << endl;
+	 << "   " << tree[i_thTree]->GetTitle() << G4endl;
   }
-  G4cout << " Commands : " << endl;
+  G4cout << " Commands : " << G4endl;
   int n_commandEntry = command.entries();
   for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
   {
     i++;
     G4cout << " " << i << ") " << command[i_thCommand]->GetCommandName() 
-	 << " * " << command[i_thCommand]->GetTitle() << endl;
+	 << " * " << command[i_thCommand]->GetTitle() << G4endl;
   }
 }
 
diff --git a/source/intercoms/src/G4UIcontrolMessenger.cc b/source/intercoms/src/G4UIcontrolMessenger.cc
index 1c88dbd1ef..eaf52e2355 100644
--- a/source/intercoms/src/G4UIcontrolMessenger.cc
+++ b/source/intercoms/src/G4UIcontrolMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIcontrolMessenger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIcontrolMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIcontrolMessenger.hh"
diff --git a/source/intercoms/src/G4UIdirectory.cc b/source/intercoms/src/G4UIdirectory.cc
index 05c7331a8b..d6da19f3a6 100644
--- a/source/intercoms/src/G4UIdirectory.cc
+++ b/source/intercoms/src/G4UIdirectory.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIdirectory.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIdirectory.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UImanager.cc b/source/intercoms/src/G4UImanager.cc
index c2e390cf2d..54e9d2e73a 100644
--- a/source/intercoms/src/G4UImanager.cc
+++ b/source/intercoms/src/G4UImanager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UImanager.cc,v 1.3.2.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UImanager.cc,v 1.5 2000/02/14 08:41:25 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------------
@@ -22,11 +22,7 @@
 #include "G4ios.hh"
 #include "G4strstreambuf.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UImanager * G4UImanager::fUImanager = 0;
 G4bool G4UImanager::fUImanagerHasBeenKilled = false;
@@ -87,7 +83,7 @@ G4String G4UImanager::GetCurrentValues(const char * aCommand)
   savedCommand = treeTop->FindPath( theCommand );
   if( savedCommand == NULL ) 
   {
-    G4cerr << "command not found" << endl;
+    G4cerr << "command not found" << G4endl;
     return G4String();
   }
   return savedCommand->GetCurrentValue();
@@ -138,7 +134,7 @@ const char * aParameterName, G4bool reGet)
      GetCurrentStringValue( aCommand, aParameterName, reGet );
   G4int value;
   const char* t = targetParameter;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> value;
   return value;
 }
@@ -150,7 +146,7 @@ int parameterNumber, G4bool reGet)
      GetCurrentStringValue( aCommand, parameterNumber, reGet );
   G4int value;
   const char* t = targetParameter;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> value;
   return value;
 }
@@ -162,7 +158,7 @@ const char * aParameterName, G4bool reGet)
      GetCurrentStringValue( aCommand, aParameterName, reGet );
   G4double value;
   const char* t = targetParameter;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> value;
   return value;
 }
@@ -174,7 +170,7 @@ int parameterNumber, G4bool reGet)
      GetCurrentStringValue( aCommand, parameterNumber, reGet );
   G4double value;
   const char* t = targetParameter;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> value;
   return value;
 }
@@ -198,7 +194,7 @@ void G4UImanager::ExecuteMacroFile(G4String fileName)
   session = previousSession;
 }
 
-int G4UImanager::ApplyCommand(char * aCommand)
+int G4UImanager::ApplyCommand(const char * aCommand)
 {
   G4String theCommand = aCommand;
   return ApplyCommand(theCommand);
@@ -206,7 +202,7 @@ int G4UImanager::ApplyCommand(char * aCommand)
 
 int G4UImanager::ApplyCommand(G4String aCommand)
 {
-  if(verboseLevel) G4cout << aCommand << endl;
+  if(verboseLevel) G4cout << aCommand << G4endl;
 
   G4String commandString;
   G4String commandParameter;
@@ -224,14 +220,14 @@ int G4UImanager::ApplyCommand(G4String aCommand)
   G4UIcommand * targetCommand = treeTop->FindPath( commandString );
   if( targetCommand == NULL )
   {
-    // G4cout << commandString << " NOT FOUND." << endl;
+    // G4cout << commandString << " NOT FOUND." << G4endl;
     return fCommandNotFound;
   }
 
   if(!(targetCommand->IsAvailable())) 
   { return fIllegalApplicationState; }
  
-  if(saveHistory) historyFile << aCommand << endl; 
+  if(saveHistory) historyFile << aCommand << G4endl; 
   histVec.insert(aCommand);
   return targetCommand->DoIt( commandParameter );
 }
@@ -268,7 +264,7 @@ void G4UImanager::ListCommands(G4String direct)
   if(comTree)
   { comTree->List(); }
   else
-  { G4cout << direct << " is not found." << endl; }
+  { G4cout << direct << " is not found." << G4endl; }
 }
 
 G4UIcommandTree* G4UImanager::FindDirectory(const char* dirName)
@@ -297,7 +293,7 @@ void G4UImanager::Interact()
   Interact(G4String("G4> "));
 }
 
-void G4UImanager::Interact(char * pC)
+void G4UImanager::Interact(const char * pC)
 {
   G4String cc = pC;
   Interact(cc);
@@ -305,13 +301,13 @@ void G4UImanager::Interact(char * pC)
 
 void G4UImanager::Interact(G4String pC)
 {
-  G4cerr << "G4UImanager::Interact() is out of date and is not used anymore." << endl;
-  G4cerr << "This method will be removed shortly!!!" << endl;
-  G4cerr << "In case of main() use" << endl;
-  G4cerr << "    G4UIsession * session = new G4UIterminal;" << endl;
-  G4cerr << "    session->SessionStart();" << endl;
-  G4cerr << "In other cases use" << endl;
-  G4cerr << "    G4StateManager::GetStateManager()->Pause();" << endl;
+  G4cerr << "G4UImanager::Interact() is out of date and is not used anymore." << G4endl;
+  G4cerr << "This method will be removed shortly!!!" << G4endl;
+  G4cerr << "In case of main() use" << G4endl;
+  G4cerr << "    G4UIsession * session = new G4UIterminal;" << G4endl;
+  G4cerr << "    session->SessionStart();" << G4endl;
+  G4cerr << "In other cases use" << G4endl;
+  G4cerr << "    G4StateManager::GetStateManager()->Pause();" << G4endl;
 }
 
 
diff --git a/source/intercoms/src/G4UImessenger.cc b/source/intercoms/src/G4UImessenger.cc
index a362047188..e7bb7e4842 100644
--- a/source/intercoms/src/G4UImessenger.cc
+++ b/source/intercoms/src/G4UImessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UImessenger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UImessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UImessenger.hh"
@@ -15,11 +15,7 @@
 #include <string.h>
 #include "G4ios.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 G4UImessenger::G4UImessenger() { }
@@ -42,7 +38,7 @@ G4bool G4UImessenger::operator == (const G4UImessenger& messenger) const {
 G4String G4UImessenger::ItoS(G4int i)
 {
   char defVal[20];
-  ostrstream os(defVal,20);
+  G4std::ostrstream os(defVal,20);
   os << i << '\0';
   return G4String(defVal);
 }
@@ -50,7 +46,7 @@ G4String G4UImessenger::ItoS(G4int i)
 G4String G4UImessenger::DtoS(G4double a)
 {
   char defVal[40];
-  ostrstream os(defVal,40);
+  G4std::ostrstream os(defVal,40);
   os << a << '\0';
   return G4String(defVal);
 }
@@ -66,7 +62,7 @@ G4int G4UImessenger::StoI(G4String s)
 {
   G4int vl;
   const char* t = s;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl;
   return vl;
 }
@@ -75,7 +71,7 @@ G4double G4UImessenger::StoD(G4String s)
 {
   G4double vl;
   const char* t = s;
-  istrstream is((char*)t);
+  G4std::istrstream is((char*)t);
   is >> vl;
   return vl;
 }
@@ -94,6 +90,6 @@ G4bool G4UImessenger::StoB(G4String s)
 void G4UImessenger::AddUIcommand(G4UIcommand * newCommand)
 {
   G4cerr << "Warning : Old style definition of G4UIcommand <" 
-         << newCommand->GetCommandPath() << ">." << endl;
+         << newCommand->GetCommandPath() << ">." << G4endl;
 }
 
diff --git a/source/intercoms/src/G4UIparameter.cc b/source/intercoms/src/G4UIparameter.cc
index de97f956ae..cebd82d61b 100644
--- a/source/intercoms/src/G4UIparameter.cc
+++ b/source/intercoms/src/G4UIparameter.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIparameter.cc,v 1.3.2.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIparameter.cc,v 1.4 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIparameter.hh"
@@ -72,28 +72,28 @@ int G4UIparameter::operator!=(const G4UIparameter &right) const
 
 void G4UIparameter::List()
 {
-  G4cout << endl << "Parameter : " << parameterName << endl;
+  G4cout << G4endl << "Parameter : " << parameterName << G4endl;
   if( ! parameterGuidance.isNull() )
-  G4cout << parameterGuidance << endl ;
-  G4cout << " Parameter type  : " << parameterType << endl;
+  G4cout << parameterGuidance << G4endl ;
+  G4cout << " Parameter type  : " << parameterType << G4endl;
   if(omittable)
-  { G4cout << " Omittable       : True" << endl; }
+  { G4cout << " Omittable       : True" << G4endl; }
   else
-  { G4cout << " Omittable       : False" << endl; }
+  { G4cout << " Omittable       : False" << G4endl; }
   if( currentAsDefaultFlag )
-  { G4cout << " Default value   : taken from the current value" << endl; }
+  { G4cout << " Default value   : taken from the current value" << G4endl; }
   else if( ! defaultValue.isNull() )
-  { G4cout << " Default value   : " << defaultValue << endl; }
+  { G4cout << " Default value   : " << defaultValue << G4endl; }
   if( ! parameterRange.isNull() )
-  G4cout << " Parameter range : " << parameterRange << endl;
+  G4cout << " Parameter range : " << parameterRange << G4endl;
   if( ! parameterCandidate.isNull() )
-  G4cout << " Candidates      : " << parameterCandidate << endl;
+  G4cout << " Candidates      : " << parameterCandidate << G4endl;
 }
 
 void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
 {
   char defVal[20];
-  ostrstream os(defVal,20);
+  G4std::ostrstream os(defVal,20);
   os << theDefaultValue << '\0';
   defaultValue = defVal;
 }
@@ -101,7 +101,7 @@ void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
 void G4UIparameter::SetDefaultValue(G4double theDefaultValue)
 {
   char defVal[20];
-  ostrstream os(defVal,20);
+  G4std::ostrstream os(defVal,20);
   os << theDefaultValue << '\0';
   defaultValue = defVal;
 }
@@ -134,7 +134,7 @@ CandidateCheck(G4String newValue) {
       iToken++;
       if(aToken==newValue) return iToken;
     } 
-    G4cerr << "parameter value is not listed in the candidate List." << endl;
+    G4cerr << "parameter value is not listed in the candidate List." << G4endl;
     return 0;
 }
 
@@ -143,7 +143,7 @@ RangeCheck(G4String newValue) {
     yystype result;
     bp = 0;                   // reset buffer pointer for G4UIpGetc()
     const char* t = newValue;
-    istrstream is((char*)t); 
+    G4std::istrstream is((char*)t); 
     char type = toupper( parameterType );
     switch (type) {
         case 'D': { is >> newVal.D; } break;
@@ -155,11 +155,11 @@ RangeCheck(G4String newValue) {
    result = Expression();
    if( paramERR == 1 ) return 0;
    if( result.type != CONSTINT) {
-      G4cerr << "Illegal Expression in parameter range." << endl;
+      G4cerr << "Illegal Expression in parameter range." << G4endl;
       return 0;
    }
    if ( result.I ) return 1;
-   G4cerr << "parameter out of range: "<< parameterRange << endl;
+   G4cerr << "parameter out of range: "<< parameterRange << G4endl;
    return 0;
 }
 
@@ -172,13 +172,13 @@ TypeCheck(G4String newValue)
         case 'D':
             if( IsDouble(newValue.data())== 0) {
                 G4cerr<<newValue<<": double value expected."
-                    << endl;
+                    << G4endl;
                 return 0;
              } break;
         case 'I':
             if( IsInt(newValue.data(),20)== 0) {
                 G4cerr<<newValue<<": integer expected."
-                    << endl;
+                    << G4endl;
                 return 0;
              } break;
         case 'S': break;
@@ -191,7 +191,7 @@ TypeCheck(G4String newValue)
                   ||newValue == "TRUE" || newValue == "FALSE") 
                   return 1;
              else {
-                    G4cerr<<newValue<<": bool expected." << endl;
+                    G4cerr<<newValue<<": bool expected." << G4endl;
                     return 0; 
              } 
         default: ;
@@ -201,7 +201,7 @@ TypeCheck(G4String newValue)
 
 
 int G4UIparameter::
-IsInt(const char* buf, short maxDigits)  // do not allow any ws
+IsInt(const char* buf, short maxDigits)  // do not allow any G4std::ws
 {
     const char* p= buf;
     int length=0;
@@ -210,15 +210,15 @@ IsInt(const char* buf, short maxDigits)  // do not allow any ws
         while( isdigit( (int)(*p) )) { ++p;  ++length; }
         if( *p == '\0' ) {
             if( length > maxDigits) {
-                G4cerr <<"digit length exceeds"<<endl;
+                G4cerr <<"digit length exceeds"<<G4endl;
                 return 0;
             }
             return 1;
         } else {
-            // G4cerr <<"illegal character after int:"<<buf<<endl;
+            // G4cerr <<"illegal character after int:"<<buf<<G4endl;
         }
     } else {
-        // G4cerr <<"illegal int:"<<buf<<endl;
+        // G4cerr <<"illegal int:"<<buf<<G4endl;
     }
     return 0;
 }
@@ -296,7 +296,7 @@ Expression(void)
 {
     yystype result;
     #ifdef DEBUG
-        G4cerr << " Expression()" << endl;
+        G4cerr << " Expression()" << G4endl;
     #endif
     result = LogicalORExpression();
     return result;
@@ -310,7 +310,7 @@ LogicalORExpression(void)
     p = LogicalANDExpression();
     if( token != LOGICALOR)  return p;
     if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-        G4cerr << "Parameter range: illegal type at '||'" << endl;
+        G4cerr << "Parameter range: illegal type at '||'" << G4endl;
         paramERR = 1;
     }
     result.I = p.I;
@@ -319,7 +319,7 @@ LogicalORExpression(void)
         token = Yylex();
         p = LogicalANDExpression();
         if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-            G4cerr << "Parameter range: illegal type at '||'" <<endl;
+            G4cerr << "Parameter range: illegal type at '||'" <<G4endl;
             paramERR = 1;
         }
         switch (p.type) {
@@ -330,7 +330,7 @@ LogicalORExpression(void)
                 result.I += (p.D != 0.0); 
                 result.type = CONSTINT;      break;
             default: 
-                G4cerr << "Parameter range: unknown type"<<endl; 
+                G4cerr << "Parameter range: unknown type"<<G4endl; 
                 paramERR = 1;
         } 
     }
@@ -345,7 +345,7 @@ LogicalANDExpression(void)
     p = EqualityExpression();
     if( token != LOGICALAND)  return p;
     if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-        G4cerr << "Parameter range: illegal type at '&&'" << endl;
+        G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
         paramERR = 1;
     }
     result.I = p.I;
@@ -354,7 +354,7 @@ LogicalANDExpression(void)
         token = Yylex();
         p = EqualityExpression();
         if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
-            G4cerr << "Parameter range: illegal type at '&&'" << endl;
+            G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
             paramERR = 1;
         }
         switch (p.type) {
@@ -365,7 +365,7 @@ LogicalANDExpression(void)
                 result.I *= (p.D != 0.0);
                 result.type = CONSTINT;      break;
             default:
-                G4cerr << "Parameter range: unknown type."<< endl;
+                G4cerr << "Parameter range: unknown type."<< G4endl;
                 paramERR = 1;
         } 
     }
@@ -380,7 +380,7 @@ EqualityExpression(void)
     int operat;
     yystype result;
     #ifdef DEBUG
-        G4cerr << " EqualityExpression()" <<endl;
+        G4cerr << " EqualityExpression()" <<G4endl;
     #endif
     result = RelationalExpression();
     if( token==EQ || token==NE ) {
@@ -391,12 +391,12 @@ EqualityExpression(void)
         result.I = Eval2( arg1, operat, arg2 );   // semantic action
         result.type = CONSTINT;
         #ifdef DEBUG
-            G4cerr << " return code of Eval2(): " << result.I <<endl;
+            G4cerr << " return code of Eval2(): " << result.I <<G4endl;
         #endif
     } else {
         if (result.type != CONSTINT && result.type != CONSTDOUBLE) {  
             G4cerr << "Parameter range: error at EqualityExpression"
-                 << endl;
+                 << G4endl;
             paramERR = 1;
         }
     }
@@ -411,7 +411,7 @@ RelationalExpression(void)
     int operat;
     yystype result;
     #ifdef DEBUG
-        G4cerr << " RelationalExpression()" <<endl;
+        G4cerr << " RelationalExpression()" <<G4endl;
     #endif
 
     arg1 = AdditiveExpression();
@@ -422,13 +422,13 @@ RelationalExpression(void)
         result.I = Eval2( arg1, operat, arg2 );    // semantic action
         result.type = CONSTINT;
         #ifdef DEBUG
-            G4cerr << " return  Eval2(): " << endl;
+            G4cerr << " return  Eval2(): " << G4endl;
         #endif
     } else {
         result = arg1;
     }
     #ifdef DEBUG
-       G4cerr <<" return RelationalExpression()" <<endl;
+       G4cerr <<" return RelationalExpression()" <<G4endl;
     #endif
     return  result;
 }
@@ -440,7 +440,7 @@ AdditiveExpression(void)
     if( token != '+' && token != '-' )  return result;
     G4cerr << "Parameter range: operator " 
          << (char)token 
-         << " is not supported." << endl;
+         << " is not supported." << G4endl;
     paramERR = 1;
     return  result;
 }
@@ -452,7 +452,7 @@ MultiplicativeExpression(void)
     if( token != '*' && token != '/' && token != '%' ) return result;
     G4cerr << "Parameter range: operator "
          << (char)token
-         << " is not supported." << endl;
+         << " is not supported." << G4endl;
     paramERR = 1;
     return  result;
 }
@@ -463,7 +463,7 @@ UnaryExpression(void)
     yystype result;
     yystype p;
     #ifdef DEBUG
-        G4cerr <<" UnaryExpression"<< endl;
+        G4cerr <<" UnaryExpression"<< G4endl;
     #endif
     switch(token) {
         case '-':
@@ -484,7 +484,7 @@ UnaryExpression(void)
             token = Yylex();
             G4cerr << "Parameter range error: "
                  << "operator '!' is not supported (sorry)."
-                 << endl;
+                 << G4endl;
             paramERR = 1;
             result = UnaryExpression();   break;
         default:
@@ -499,7 +499,7 @@ PrimaryExpression(void)
 {
      yystype result;
      #ifdef DEBUG
-         G4cerr <<" PrimaryExpression" << endl;
+         G4cerr <<" PrimaryExpression" << G4endl;
      #endif
      switch (token) {
          case IDENTIFIER:
@@ -518,7 +518,7 @@ PrimaryExpression(void)
               token= Yylex();
               result = Expression();
               if( token !=  ')'  ) {
-                  G4cerr << " ')' expected" << endl;
+                  G4cerr << " ')' expected" << G4endl;
                   paramERR = 1;
               }
               token = Yylex();
@@ -537,7 +537,7 @@ Eval2(yystype arg1, int op, yystype arg2)
     if( (arg1.type != IDENTIFIER) && (arg2.type != IDENTIFIER)) {
         G4cerr << parameterName
              << ": meaningless comparison "
-             << arg1.type << " " << arg2.type << endl;
+             << arg1.type << " " << arg2.type << G4endl;
         paramERR = 1;
     }
     char type = toupper( parameterType );
@@ -549,7 +549,7 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } else {
                     G4cerr << "integer operand expected for "
                          << parameterRange << '.' 
-                         << endl; 
+                         << G4endl; 
                 }
                  break;
             case 'D': 
@@ -570,7 +570,7 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } else {
                     G4cerr << "integer operand expected for "
                          << parameterRange << '.' 
-                         << endl; 
+                         << G4endl; 
                 }
                  break;
             case 'D': 
@@ -583,7 +583,7 @@ Eval2(yystype arg1, int op, yystype arg2)
             default: ;
         }
     }
-    G4cerr << "no param name is specified at the param range."<<endl;
+    G4cerr << "no param name is specified at the param range."<<G4endl;
     return 0;
 }
 
@@ -600,14 +600,14 @@ CompareInt(int arg1, int op, int arg2)
        case EQ:  result = ( arg1 == arg2); opr= "==";  break;
        case NE:  result = ( arg1 != arg2); opr= "!=";  break;
        default: 
-           G4cerr << "Parameter range: error at CompareInt" << endl;
+           G4cerr << "Parameter range: error at CompareInt" << G4endl;
            paramERR = 1;
     }
     #ifdef DEBUG
         G4cerr << "CompareInt "
              << arg1 << " " << opr << arg2 
              << " result: " << result
-             << endl;
+             << G4endl;
     #endif
     return result;
 }
@@ -625,14 +625,14 @@ CompareDouble(double arg1, int op, double arg2)
         case EQ:  result = ( arg1 == arg2); opr= "==";  break;
         case NE:  result = ( arg1 != arg2); opr= "!=";  break;
         default:
-           G4cerr << "Parameter range: error at CompareDouble" << endl;
+           G4cerr << "Parameter range: error at CompareDouble" << G4endl;
            paramERR = 1;
     }
     #ifdef DEBUG
         G4cerr << "CompareDouble " 
              << arg1 <<" " << opr << " "<< arg2
              << " result: " << result
-             << endl;
+             << G4endl;
     #endif
     return result;
 }
@@ -658,7 +658,7 @@ Yylex()         // reads input and returns token number KR486
                    c=='e' || c=='E' || c=='+' || c=='-');
          G4UIpUngetc(c);
 	 const char* t = buf;
-	 istrstream is((char*)t);
+	 G4std::istrstream is((char*)t);
          if ( IsInt(buf.data(),20) ) {
              is >> yylval.I;
              return  CONSTINT;
@@ -667,7 +667,7 @@ Yylex()         // reads input and returns token number KR486
              is >> yylval.D;
              return  CONSTDOUBLE;
          } else {
-             G4cerr << buf<<": numeric format error."<<endl;
+             G4cerr << buf<<": numeric format error."<<G4endl;
          }
     }
     buf="";
@@ -680,7 +680,7 @@ Yylex()         // reads input and returns token number KR486
             yylval.S =buf;
             return IDENTIFIER;
         } else {
-            G4cerr << buf << " is not a parameter name."<< endl;
+            G4cerr << buf << " is not a parameter name."<< G4endl;
             paramERR = 1;
        }
     }
@@ -722,10 +722,10 @@ G4UIpUngetc(int c) {                 // emulation of ungetc()
     if (bp >0 && c == parameterRange(bp-1)) {
          --bp;
     } else {
-         G4cerr << "G4UIpUngetc() failed." << endl;
+         G4cerr << "G4UIpUngetc() failed." << G4endl;
          G4cerr << "bp="<<bp <<" c="<<c
               << " pR(bp-1)=" << parameterRange(bp-1)
-              << endl;
+              << G4endl;
          paramERR = 1;
          return -1;
     }
diff --git a/source/intercoms/src/G4UIsession.cc b/source/intercoms/src/G4UIsession.cc
index ed65213d3b..0bb6be7e86 100644
--- a/source/intercoms/src/G4UIsession.cc
+++ b/source/intercoms/src/G4UIsession.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIsession.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIsession.cc,v 1.3 1999/12/15 17:52:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------------
@@ -23,12 +23,12 @@ void G4UIsession::PauseSessionStart(G4String Prompt) {;}
 
 G4int G4UIsession::ReceiveG4cout(G4String coutString)
 {
-  cout <<  coutString << flush;
+  G4std::cout <<  coutString << G4std::flush;
   return 0;
 }
 
 G4int G4UIsession::ReceiveG4cerr(G4String cerrString)
 {
-  cerr <<  cerrString << flush;
+  G4std::cerr <<  cerrString << G4std::flush;
   return 0;
 }                                                                       
diff --git a/source/intercoms/src/G4UnitsMessenger.cc b/source/intercoms/src/G4UnitsMessenger.cc
index ee18d24699..7eee08c9da 100644
--- a/source/intercoms/src/G4UnitsMessenger.cc
+++ b/source/intercoms/src/G4UnitsMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsMessenger.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UnitsMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/intercoms/src/G4VGlobalFastSimulationManager.cc b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
index e6d632a8b8..9078eab043 100644
--- a/source/intercoms/src/G4VGlobalFastSimulationManager.cc
+++ b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGlobalFastSimulationManager.cc,v 1.1.8.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGlobalFastSimulationManager.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/src/G4VStateDependent.cc b/source/intercoms/src/G4VStateDependent.cc
index c70eb211d1..501145eb39 100644
--- a/source/intercoms/src/G4VStateDependent.cc
+++ b/source/intercoms/src/G4VStateDependent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VStateDependent.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VStateDependent.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/intercoms/src/G4VVisManager.cc b/source/intercoms/src/G4VVisManager.cc
index 75adee3fc1..382448a2b1 100644
--- a/source/intercoms/src/G4VVisManager.cc
+++ b/source/intercoms/src/G4VVisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisManager.cc,v 1.2.8.1 1999/12/07 20:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisManager.cc,v 1.3 1999/12/15 14:50:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Abstract interface for GEANT4 Visualization Manager.
diff --git a/source/interfaces/GAG/include/G4UIGAG.hh b/source/interfaces/GAG/include/G4UIGAG.hh
index 039afc849b..d21f0233fe 100644
--- a/source/interfaces/GAG/include/G4UIGAG.hh
+++ b/source/interfaces/GAG/include/G4UIGAG.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIGAG.hh,v 1.3.4.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIGAG.hh,v 1.3.4.1.2.2 1999/12/14 07:07:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4UIGAG.hh
 // GAG(Geant4 adaptive GUI) interface class
@@ -20,8 +20,8 @@
 
 #include "G4UIsession.hh"
 #include "G4UImanager.hh"
-#include <fstream.h>
-#include <g4std/vector>
+#include "g4std/fstream"
+#include "g4std/vector"
 
 enum UImode { terminal_mode , java_mode, tcl_mode };
 enum ChangeOfTree  { notChanged=0, added, deleted, addedAndDeleted };
diff --git a/source/interfaces/GAG/src/G4UIGAG.cc b/source/interfaces/GAG/src/G4UIGAG.cc
index 6ade3cebcb..278f94e1d5 100644
--- a/source/interfaces/GAG/src/G4UIGAG.cc
+++ b/source/interfaces/GAG/src/G4UIGAG.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIGAG.cc,v 1.6.2.1.2.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIGAG.cc,v 1.6.2.1.2.1.2.7 1999/12/17 12:04:58 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4UIGAG.cc
 // 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal
@@ -16,15 +16,11 @@
 #include "G4UIcommandTree.hh"
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIGAG::G4UIGAG(): TVersion("T1.0a"), JVersion("J1.0a")
 {
-  //G4cout << "G4UIGAG: Apr15,98." << endl;
+  //G4cout << "G4UIGAG: Apr15,98." << G4endl;
   prefix = "/";
   UI = G4UImanager::GetUIpointer();
   UI->SetSession(this);
@@ -50,7 +46,7 @@ G4UIGAG::~G4UIGAG()
   {
      UI->SetSession(NULL);
      UI->SetCoutDestination(NULL);
-     //     G4cout << "GAG session deleted" << endl;
+     //     G4cout << "GAG session deleted" << G4endl;
   }
 }                                                 
 
@@ -72,7 +68,7 @@ G4UIsession * G4UIGAG::SessionStart()
 void G4UIGAG::PauseSessionStart(G4String msg)
 {
   promptCharacter = msg;
-  G4cout << "@@PROMPT \"" << promptCharacter << "\"" << endl;
+  G4cout << "@@PROMPT \"" << promptCharacter << "\"" << G4endl;
   iCont = true;
   G4String newCommand = GetCommand();
   while( iCont )
@@ -93,16 +89,16 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
     case fCommandSucceeded:
       break;
     case fCommandNotFound:
-      G4cerr << "command not found" << endl;
+      G4cerr << "command not found" << G4endl;
       break;
     case fIllegalApplicationState:
-      G4cerr << "illegal application state -- command refused" << endl;
+      G4cerr << "illegal application state -- command refused" << G4endl;
       break;
     case fParameterOutOfRange:
     case fParameterUnreadable:
     case fParameterOutOfCandidates:
     default:
-      G4cerr << "command refused (" << commandStatus << ")" << endl;
+      G4cerr << "command refused (" << commandStatus << ")" << G4endl;
     }
   }else{
     switch(commandStatus) {
@@ -121,22 +117,22 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
       }
       break;
     case fCommandNotFound:
-      G4cout << "@@ErrResult \"command not found.\"" << endl;
+      G4cout << "@@ErrResult \"command not found.\"" << G4endl;
       break;
     case fIllegalApplicationState:
-      G4cout << "@@ErrResult \"Illegal application state -- command refused\"" << endl;
+      G4cout << "@@ErrResult \"Illegal application state -- command refused\"" << G4endl;
       break;
     case fParameterOutOfRange:
-      G4cout << "@@ErrResult \"Parameter Out of Range.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Out of Range.\"" << G4endl;
       break;
     case fParameterUnreadable:
-      G4cout << "@@ErrResult \"Parameter Unreadable.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Unreadable.\"" << G4endl;
       break;
     case fParameterOutOfCandidates:
-      G4cout << "@@ErrResult \"Parameter Out of Candidates.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Out of Candidates.\"" << G4endl;
       break;
     default:
-      G4cout << "@@ErrResult \"command refused (" << commandStatus << ")\"" << endl;
+      G4cout << "@@ErrResult \"command refused (" << commandStatus << ")\"" << G4endl;
     }
   }
 }
@@ -144,13 +140,13 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
 
 G4int G4UIGAG::ReceiveG4cout(G4String coutString)
 {
-  cout << coutString << flush;
+  G4std::cout << coutString << G4std::flush;
   return 0;
 }
 
 G4int G4UIGAG::ReceiveG4cerr(G4String cerrString)
 {
-  cerr << cerrString << flush;
+  G4std::cerr << cerrString << G4std::flush;
   return 0;
 }                                                    
 
@@ -167,15 +163,15 @@ G4String G4UIGAG::GetCommand()
   {
     G4UIcommandTree* tree = UI->GetTree();
     if ( uiMode != terminal_mode ){
-      G4cout << "@@PROMPT \"" << promptCharacter << "\"" << endl;
+      G4cout << "@@PROMPT \"" << promptCharacter << "\"" << G4endl;
     }
     if ( uiMode != java_mode ){
-      G4cout << promptCharacter << "> " << flush;
+      G4cout << promptCharacter << "> " << G4std::flush;
     }else{
-      G4cout << "@@Ready" << endl;
+      G4cout << "@@Ready" << G4endl;
     }
-    newCommand.readLine( cin, FALSE );
-    if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false;break;}
+    newCommand.readLine( G4cin, FALSE );
+    if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false;break;}
 
     newCommand = newCommand.strip(G4String::leading);
     if( newCommand.length() < 1) { break; }
@@ -184,8 +180,8 @@ G4String G4UIGAG::GetCommand()
     {
       G4String newLine;
       newCommand.remove(newCommand.length()-1);
-      newLine.readLine( cin );
-      if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false;break;}
+      newLine.readLine( G4cin );
+      if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false;break;}
       newCommand.append(newLine);
     }
 
@@ -195,23 +191,23 @@ G4String G4UIGAG::GetCommand()
     // -------------------- nC.toUpper();
     if( nC == "@@GAGmodeJAVA" ) {
       uiMode = java_mode;
-      G4cout << endl << "@@Version " << JVersion << endl;
+      G4cout << G4endl << "@@Version " << JVersion << G4endl;
       SendCommandProperties(tree);
       NotifyStateChange();
     }
     else if( nC == "@@GAGmodeTcl" ) {
       uiMode = tcl_mode;
-      G4cout << endl << "@@Version " << TVersion << endl;
+      G4cout << G4endl << "@@Version " << TVersion << G4endl;
       SendCommandProperties(tree);
       NotifyStateChange();
     }
     else if( nC(0) == '#' )
-      { G4cout << nC << endl; }
+      { G4cout << nC << G4endl; }
 
     else if( nC == "ls"  || nC(0,3) == "ls " )
     { ListDirectory( nC ); }
     else if( nC == "pwd" )
-    { G4cout << "Current Working Directory : " << prefix << endl; }
+    { G4cout << "Current Working Directory : " << prefix << G4endl; }
     else if( nC(0,2) == "cd"  || nC(0,3) == "cd " )
     { ChangeDirectory( nC ); }
     else if(  nC == "help" || nC(0,5) == "help ")
@@ -222,36 +218,36 @@ G4String G4UIGAG::GetCommand()
     {
       G4int nh = UI->GetNumberOfHistory();
       for(int i=0;i<nh;i++)
-      { G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; }
+      { G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; }
     }
     else if( nC(0) == '!' )
     {
       G4String ss = nC(1,nC.length()-1);
       G4int vl;
       const char* tt = ss;
-      istrstream is((char*)tt);
+      G4std::istrstream is((char*)tt);
       is >> vl;
       G4int nh = UI->GetNumberOfHistory();
       if(vl>=0 && vl<nh)
       { 
         newCommand = UI->GetPreviousCommand(vl); 
-        G4cout << newCommand << endl;
+        G4cout << newCommand << G4endl;
         break;
       }
       else
-      { G4cerr << "history " << vl << " is not found." << endl; }
+      { G4cerr << "history " << vl << " is not found." << G4endl; }
     }
     else if( nC(0,4) == "exit" )
     { 
       if( iCont )
       { 
 	if ( uiMode == terminal_mode){
-	  G4cerr << "You are now processing RUN." << endl;
-	  G4cerr << "Please abrot it using \"/run/abort\" command first" << endl;
-	  G4cerr << " and use \"continue\" command until the application" << endl;
-	  G4cerr << " becomes to Idle." << endl;
+	  G4cerr << "You are now processing RUN." << G4endl;
+	  G4cerr << "Please abrot it using \"/run/abort\" command first" << G4endl;
+	  G4cerr << " and use \"continue\" command until the application" << G4endl;
+	  G4cerr << " becomes to Idle." << G4endl;
 	}else{
-	  G4cout << "@@ErrResult \"You are now processing RUN.\"" << endl;
+	  G4cout << "@@ErrResult \"You are now processing RUN.\"" << G4endl;
 	}
       }
       else
@@ -307,7 +303,7 @@ G4String G4UIGAG::GetFullPath( G4String aNewCommand )
 
 void G4UIGAG::SessionTerminate()
 {
-  G4cout << "***** Terminal session end *****" << endl;
+  G4cout << "***** Terminal session end *****" << G4endl;
 }
 
 void G4UIGAG::ShowCurrent( G4String newCommand )
@@ -316,14 +312,14 @@ void G4UIGAG::ShowCurrent( G4String newCommand )
   G4String curV = UI->GetCurrentValues(theCommand);
   if( ! (curV.isNull()||curV(0)=='\0' ) ) {
     if (uiMode == terminal_mode){
-      G4cout << "Current value(s) of the parameter(s) : " << curV << endl;
+      G4cout << "Current value(s) of the parameter(s) : " << curV << G4endl;
     }else{
-      G4cout << "@@CurrentValue " << curV << endl;
+      G4cout << "@@CurrentValue " << curV << G4endl;
     }
   } else if (uiMode == terminal_mode){
-      G4cout << "Current value is not available." << endl;
+      G4cout << "Current value is not available." << G4endl;
     } else {
-      G4cout << "@@ErrResult \"Current value is not available.\"" << endl;
+      G4cout << "@@ErrResult \"Current value is not available.\"" << G4endl;
     }
 }
 
@@ -349,7 +345,7 @@ void G4UIGAG::ChangeDirectory( G4String newCommand )
   { prefix += "/"; }
   if( FindDirPath( prefix ) == NULL )
   {
-    G4cout << "Directory <" << prefix << "> is not found." << endl;
+    G4cout << "Directory <" << prefix << "> is not found." << G4endl;
     prefix = savedPrefix;
   }
 }
@@ -377,7 +373,7 @@ void G4UIGAG::ListDirectory( G4String newCommand )
   { targetDir += "/"; }
   G4UIcommandTree * commandTree = FindDirPath( targetDir );
   if( commandTree == NULL )
-  { G4cout << "Directory <" << targetDir << "> is not found." << endl; }
+  { G4cout << "Directory <" << targetDir << "> is not found." << G4endl; }
   else
   { commandTree->ListCurrent(); }
 }
@@ -400,7 +396,7 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
     }
     else
     {
-      G4cout << "Command <" << newValue << " is not found." << endl;
+      G4cout << "Command <" << newValue << " is not found." << G4endl;
       return;
     }
   }
@@ -420,12 +416,12 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
   floor[iFloor]->ListCurrentWithNum();
   // 1998 Oct 2 non-number input
   while(1){
-    G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<flush;
-    cin >> i;
-    if(!cin.good()){
-      cin.clear();
-      cin.ignore(30,'\n');
-      G4cout << endl << "Not a number, once more" << endl; continue;}
+    G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4std::flush;
+    G4cin >> i;
+    if(!G4cin.good()){
+      G4cin.clear();
+      G4cin.ignore(30,'\n');
+      G4cout << G4endl << "Not a number, once more" << G4endl; continue;}
     else if( i < 0 ){
       iFloor += i;
       if( iFloor < 0 ) iFloor = 0;
@@ -450,11 +446,11 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
     }
 
   }
-  G4cout << "Exit from HELP." << endl << endl;
-  G4cout << endl;
-  // cin.flush();
+  G4cout << "Exit from HELP." << G4endl << G4endl;
+  G4cout << G4endl;
+  // G4cin.flush();
   char temp[100];
-  cin.getline( temp, 100 );
+  G4cin.getline( temp, 100 );
 }
 
 
@@ -508,25 +504,25 @@ G4UIcommandTree * G4UIGAG::FindDirPath(G4String newCommand)
 void G4UIGAG::SendCommandProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << endl;
+    G4cerr << "GetTree() returnes null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
-    G4cout << "@@JTreeBegin" << endl;
+    G4cout << "@@JTreeBegin" << G4endl;
     CodeGenJavaTree(tree, 0);  
-    G4cout << "@@JTreeEnd" << endl;
+    G4cout << "@@JTreeEnd" << G4endl;
     CodeGenJavaParams(tree, 0);
   }else{
-    G4cout << endl << "@@maketree_start" << endl;
+    G4cout << G4endl << "@@maketree_start" << G4endl;
     CodeGenTclTree(tree,0);  
-    G4cout << "@@maketree_end" << endl;
+    G4cout << "@@maketree_end" << G4endl;
     CodeGenTclParams(tree, 0);
   }
 }
 void G4UIGAG::SendParameterProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << endl;
+    G4cerr << "GetTree() returnes null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
@@ -544,7 +540,7 @@ void G4UIGAG::CodeGenJavaTree(G4UIcommandTree * tree, int level)
 
   if(level!=0) {
     for(int i=0; i<commandEntry; i++){
-      G4cout << tree->GetCommand(i+1)->GetCommandPath() << endl;
+      G4cout << tree->GetCommand(i+1)->GetCommandPath() << G4endl;
     }
   }
   if(treeEntry == 0) return; //end recursion
@@ -570,9 +566,9 @@ void G4UIGAG::CodeGenJavaParams(G4UIcommandTree * tree, int level) //recursive
 
   for(i=0; i< treeEntry; i++) {
     treeLink = tree->GetTree(i+1);
-    G4cout << "@@JDirGuideBegin" << endl;
-    G4cout << treeLink->GetPathName() << endl << treeLink->GetTitle() << endl;
-    G4cout << "@@JDirGuideEnd" << endl;
+    G4cout << "@@JDirGuideBegin" << G4endl;
+    G4cout << treeLink->GetPathName() << G4endl << treeLink->GetTitle() << G4endl;
+    G4cout << "@@JDirGuideEnd" << G4endl;
     CodeGenJavaParams(treeLink, level+1); 
   }
 }
@@ -585,9 +581,9 @@ void G4UIGAG::SendAParamProperty(G4UIcommand * Comp)
   char c[2];
   guidanceEntry = Comp->GetGuidanceEntries();
   parameterEntry = Comp->GetParameterEntries();
-  G4cout << "@@JParamBegin" << endl;
-  G4cout << Comp->GetCommandPath() << endl;
-  G4cout << guidanceEntry << endl;
+  G4cout << "@@JParamBegin" << G4endl;
+  G4cout << Comp->GetCommandPath() << G4endl;
+  G4cout << guidanceEntry << G4endl;
   for (int j=0; j<guidanceEntry; j++){
     title = Comp->GetGuidanceLine(j);
     title2 = "";
@@ -601,21 +597,21 @@ void G4UIGAG::SendAParamProperty(G4UIcommand * Comp)
 	title2.append(c);
       }
     }
-    G4cout << title2 << endl;
+    G4cout << title2 << G4endl;
   }
-  G4cout << Comp->GetRange() << endl;
-  G4cout << parameterEntry << endl;
+  G4cout << Comp->GetRange() << G4endl;
+  G4cout << parameterEntry << G4endl;
   for( int par=0; par<parameterEntry; par++) {
     prp = (G4UIparameter *)Comp->GetParameter(par);
-    G4cout << prp->GetParameterName() << endl;
-    G4cout << prp->GetParameterGuidance() << endl;
-    G4cout << prp->GetParameterType() << endl;
-    G4cout << prp->IsOmittable() << endl;
-    G4cout << prp->GetDefaultValue() << endl;
-    G4cout << prp->GetParameterRange() << endl;
-    G4cout << prp->GetParameterCandidates() << endl;
+    G4cout << prp->GetParameterName() << G4endl;
+    G4cout << prp->GetParameterGuidance() << G4endl;
+    G4cout << prp->GetParameterType() << G4endl;
+    G4cout << prp->IsOmittable() << G4endl;
+    G4cout << prp->GetDefaultValue() << G4endl;
+    G4cout << prp->GetParameterRange() << G4endl;
+    G4cout << prp->GetParameterCandidates() << G4endl;
   }
-  G4cout << "@@JParamEnd" << endl;
+  G4cout << "@@JParamEnd" << G4endl;
 }
 
 void G4UIGAG::SendDisableList(G4UIcommandTree * tree, int level)
@@ -628,7 +624,7 @@ void G4UIGAG::SendDisableList(G4UIcommandTree * tree, int level)
   for(int com=0; com<commandEntry; com++) {
     Comp = tree->GetCommand(com+1);
     if( Comp->IsAvailable()==false ) {
-       G4cout << Comp->GetCommandPath()<<endl;
+       G4cout << Comp->GetCommandPath()<<G4endl;
     }
   }
   if( treeEntry == 0 ) return;     // end recursion
@@ -654,7 +650,7 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
   for(int com=0; com<commandEntry; com++){
     Comp = tree->GetCommand(com+1);
     commandPath = Comp->GetCommandPath();
-    G4cout << commandPath << " @@command" << endl;
+    G4cout << commandPath << " @@command" << G4endl;
     guidanceEntry = Comp->GetGuidanceEntries();
     if (guidanceEntry == 0){
       title2 = "...Title not available...";
@@ -678,7 +674,7 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
 	title2.append("\\n");
       }
     }
-    G4cout << commandPath << " @@title \""<< title2 <<"\""<< endl;
+    G4cout << commandPath << " @@title \""<< title2 <<"\""<< G4endl;
   }
 
   if(treeEntry == 0) return; //end recursion
@@ -696,9 +692,9 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
 	title2.append("\\\""); // a Backslash and a double quote
       else title2.append(c);
     }
-    if(level==0) G4cout << pathName<< endl;
-    else G4cout << pathName<< "  @@cascade"<<endl;
-    G4cout << pathName << "  @@title \"" << title1  << "\""<<endl;
+    if(level==0) G4cout << pathName<< G4endl;
+    else G4cout << pathName<< "  @@cascade"<<G4endl;
+    G4cout << pathName << "  @@title \"" << title1  << "\""<<G4endl;
     CodeGenTclTree(t, level+1);
   }
 }
@@ -728,13 +724,13 @@ void G4UIGAG::SendATclParamProperty(G4UIcommand * Comp)
     int parameterEntry = Comp->GetParameterEntries();
     G4String commandPath = Comp->GetCommandPath();
     G4String commandRange = Comp->GetRange();
-    G4cout << "@@parameter_start" << endl;
-    G4cout << commandPath << " @@param " << parameterEntry << endl;
-    G4cout << "@@command_range \"" << commandRange << "\"" << endl;
+    G4cout << "@@parameter_start" << G4endl;
+    G4cout << commandPath << " @@param " << parameterEntry << G4endl;
+    G4cout << "@@command_range \"" << commandRange << "\"" << G4endl;
     for( int par=0; par<parameterEntry; par++) {
       prp = (G4UIparameter *)Comp->GetParameter(par);
       G4cout << "{" ;
-      G4cout << "@@param_name : \"" << prp->GetParameterName() <<"\""<<endl;
+      G4cout << "@@param_name : \"" << prp->GetParameterName() <<"\""<<G4endl;
       G4String  guide1,guide2;
       guide1 = prp->GetParameterGuidance();
       guide2 = "";
@@ -746,15 +742,15 @@ void G4UIGAG::SendATclParamProperty(G4UIcommand * Comp)
         guide2.append("\\\""); // a Backslash and a double quote
         else guide2.append(c);
       }
-      G4cout << " @@param_guide : \"" << guide2 << "\""<<endl; 
-      G4cout << " @@param_type : \"" << prp->GetParameterType()<<"\""<<endl;
-      G4cout << " @@param_omit : \"" << prp->IsOmittable()<<"\""<<endl;
-      G4cout << " @@param_default : \""<< prp->GetDefaultValue()<<"\""<<endl;
-      G4cout << " @@param_range : \""<< prp->GetParameterRange()<<"\""<<endl;
-      G4cout << " @@param_candidate : \"" << prp->GetParameterCandidates()<< "\""<<endl;
-      G4cout << "}" << endl;
+      G4cout << " @@param_guide : \"" << guide2 << "\""<<G4endl; 
+      G4cout << " @@param_type : \"" << prp->GetParameterType()<<"\""<<G4endl;
+      G4cout << " @@param_omit : \"" << prp->IsOmittable()<<"\""<<G4endl;
+      G4cout << " @@param_default : \""<< prp->GetDefaultValue()<<"\""<<G4endl;
+      G4cout << " @@param_range : \""<< prp->GetParameterRange()<<"\""<<G4endl;
+      G4cout << " @@param_candidate : \"" << prp->GetParameterCandidates()<< "\""<<G4endl;
+      G4cout << "}" << G4endl;
     }
-    G4cout << "@@parameter_end" << endl;
+    G4cout << "@@parameter_end" << G4endl;
 }
 
 void G4UIGAG::NotifyStateChange(void)
@@ -764,10 +760,10 @@ void G4UIGAG::NotifyStateChange(void)
    G4UIcommandTree * tree = UI->GetTree();
    stateString = statM->GetStateString(statM->GetCurrentState());
    if ( uiMode != terminal_mode ){
-     G4cout << "@@State \"" << stateString << "\"" << endl;
-     G4cout << "@@DisableListBegin"<<endl;
+     G4cout << "@@State \"" << stateString << "\"" << G4endl;
+     G4cout << "@@DisableListBegin"<<G4endl;
      SendDisableList(tree, 0);
-     G4cout << "@@DisableListEnd" <<endl;
+     G4cout << "@@DisableListEnd" <<G4endl;
    }
 }
 
@@ -811,7 +807,7 @@ int G4UIGAG::CommandUpdated(void)
       }
       if( j==nEntry ) { 
          deleted = 1;
-         //G4cout <<"deleted: "<< previousTreeCommands(i) << endl;
+         //G4cout <<"deleted: "<< previousTreeCommands(i) << G4endl;
       }
   }
   for( i=0; i<nEntry; i++) {      // check added command(s)
@@ -820,12 +816,12 @@ int G4UIGAG::CommandUpdated(void)
       }
       if( j==pEntry ) { 
          added = 1;
-      //   G4cout <<"added: "<< newTreeCommands(i) << endl;
+      //   G4cout <<"added: "<< newTreeCommands(i) << G4endl;
       }
   }
-  if( added    && deleted==0 ) {G4cout<<"c added"<<endl;return added;}
-  if( added==0 && deleted ) {G4cout<<"c deleted"<<endl;return deleted;}
-  if( added    && deleted ) {G4cout<<"c add/deleted"<<endl;return addedAndDeleted;}
+  if( added    && deleted==0 ) {G4cout<<"c added"<<G4endl;return added;}
+  if( added==0 && deleted ) {G4cout<<"c deleted"<<G4endl;return deleted;}
+  if( added    && deleted ) {G4cout<<"c add/deleted"<<G4endl;return addedAndDeleted;}
   return notChanged;
 }
 
@@ -870,7 +866,7 @@ void G4UIGAG::UpdateParamVal(void)
     if( previousTreeParams[i] != newTreeParams[i]){
        Comp = newTreePCP[i];
        G4cout << Comp->GetCommandPath()
-            << " command is updated." <<endl; 
+            << " command is updated." <<G4endl; 
        NotifyParameterUpdate(Comp);
     }
   }
@@ -890,7 +886,7 @@ void G4UIGAG::UpdateParamVal(void)
 //    }
 //    if( j==nEntry ) { 
 //       deleted = 1;
-//       //G4cout <<"para deleted: "<< previousTreeParams(i) << endl;
+//       //G4cout <<"para deleted: "<< previousTreeParams(i) << G4endl;
 //    }
 //  }
 //  for( i=0; i<nEntry; i++) {      // check added param(s)
@@ -899,12 +895,12 @@ void G4UIGAG::UpdateParamVal(void)
 //    }
 //    if( j==pEntry ) { 
 //       added = 1;
-//       //G4cout <<"para added: "<< newTreeParams(i) << endl;
+//       //G4cout <<"para added: "<< newTreeParams(i) << G4endl;
 //    }
 //  }
-//  if( added    && deleted==0 ) {G4cout<<"p added"<<endl;return added;}
-// if( added==0 && deleted )  {G4cout<<"p deleted"<<endl;return deleted;}
-//  if( added    && deleted )  {G4cout<<"p add/deleted"<<endl; return addedAndDeleted;}
+//  if( added    && deleted==0 ) {G4cout<<"p added"<<G4endl;return added;}
+// if( added==0 && deleted )  {G4cout<<"p deleted"<<G4endl;return deleted;}
+//  if( added    && deleted )  {G4cout<<"p add/deleted"<<G4endl; return addedAndDeleted;}
 //  return notChanged;
 //}
 
diff --git a/source/interfaces/OPACS/include/G4UIWo.hh b/source/interfaces/OPACS/include/G4UIWo.hh
index c0f04198b2..c775ff0b60 100644
--- a/source/interfaces/OPACS/include/G4UIWo.hh
+++ b/source/interfaces/OPACS/include/G4UIWo.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWo.hh,v 1.2.8.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIWo_h
 #define G4UIWo_h 
diff --git a/source/interfaces/OPACS/include/G4WoMessenger.hh b/source/interfaces/OPACS/include/G4WoMessenger.hh
index 20fb598164..365d3519b2 100644
--- a/source/interfaces/OPACS/include/G4WoMessenger.hh
+++ b/source/interfaces/OPACS/include/G4WoMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoMessenger.hh,v 1.2.8.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4WoMessenger_h
 #define G4WoMessenger_h 1
diff --git a/source/interfaces/OPACS/include/G4oCommon.hh b/source/interfaces/OPACS/include/G4oCommon.hh
index ae9bf76e94..529c1e4f39 100644
--- a/source/interfaces/OPACS/include/G4oCommon.hh
+++ b/source/interfaces/OPACS/include/G4oCommon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.h.
diff --git a/source/interfaces/OPACS/include/G4oCommon.icc b/source/interfaces/OPACS/include/G4oCommon.icc
index fed86c497f..3fc3ecc655 100644
--- a/source/interfaces/OPACS/include/G4oCommon.icc
+++ b/source/interfaces/OPACS/include/G4oCommon.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.icc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.cc.
diff --git a/source/interfaces/OPACS/src/G4UIWo.cc b/source/interfaces/OPACS/src/G4UIWo.cc
index e038f28948..cdeae7c1d3 100644
--- a/source/interfaces/OPACS/src/G4UIWo.cc
+++ b/source/interfaces/OPACS/src/G4UIWo.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIWo.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIWo.cc,v 1.2.8.1.2.1 1999/12/08 17:34:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //G4UIWo.cc   -- copied from G4UIterminal.cc
 
@@ -202,7 +202,7 @@ void G4UIWo::PauseSessionStart (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "debug : G4UIWo::PauseSessionStart : begin : " << a_state << endl;
+  G4cout << "debug : G4UIWo::PauseSessionStart : begin : " << a_state << G4endl;
 #endif
 
   if(a_state=="G4_pause> ")
@@ -229,7 +229,7 @@ void G4UIWo::PauseSessionStart (
     }
 
 #ifdef DEBUG
-  G4cout << "debug : G4UIWo::PauseSessionStart : end." << endl;
+  G4cout << "debug : G4UIWo::PauseSessionStart : end." << G4endl;
 #endif
 }
 /***************************************************************************/
diff --git a/source/interfaces/OPACS/src/G4WoMessenger.cc b/source/interfaces/OPACS/src/G4WoMessenger.cc
index a52dd9ffb1..f902cc1247 100644
--- a/source/interfaces/OPACS/src/G4WoMessenger.cc
+++ b/source/interfaces/OPACS/src/G4WoMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoMessenger.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_WO_SESSION
 
diff --git a/source/interfaces/XVT/include/G4UIxvt.hh b/source/interfaces/XVT/include/G4UIxvt.hh
index e36fed7b47..2bf00106e8 100644
--- a/source/interfaces/XVT/include/G4UIxvt.hh
+++ b/source/interfaces/XVT/include/G4UIxvt.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvt.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvt.hh,v 1.2.8.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 //                     XVT driver class header                        //
@@ -70,7 +70,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include "G4VStateDependent.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/interfaces/XVT/include/G4UIxvtMessenger.hh b/source/interfaces/XVT/include/G4UIxvtMessenger.hh
index bf1e230ec4..d7cd494e88 100644
--- a/source/interfaces/XVT/include/G4UIxvtMessenger.hh
+++ b/source/interfaces/XVT/include/G4UIxvtMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIxvtMessenger.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
diff --git a/source/interfaces/XVT/src/G4UIxvt.cc b/source/interfaces/XVT/src/G4UIxvt.cc
index 408a441dd9..e227a844ba 100644
--- a/source/interfaces/XVT/src/G4UIxvt.cc
+++ b/source/interfaces/XVT/src/G4UIxvt.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvt.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvt.cc,v 1.2.8.1.2.1 1999/12/08 17:34:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
@@ -195,7 +195,7 @@ G4UIsession*  G4UIxvt::SessionStart(void)
 
   fillArrayEntries(comTree, 0);
 
-  G4cout << " --------- List of Array Entries ---------- " << endl;
+  G4cout << " --------- List of Array Entries ---------- " << G4endl;
 
   listCommandArray();
   briefListCommands();
@@ -326,7 +326,7 @@ void G4UIxvt::writeGeantToXvt(const G4String& theString)
   int write_check = write(fd_GeantToXvt, theString, number);
     
   if(write_check == -1)
-    G4cout << "ERROR WITH WRITE!!" << endl;
+    G4cout << "ERROR WITH WRITE!!" << G4endl;
 }
 
 
@@ -341,7 +341,7 @@ void G4UIxvt::writeGeantToXvt(const G4String& theString)
 ///////////////////////////////////////////////////////////////////////////////
 void G4UIxvt::errorHandler(const G4String& theError)
 {
-  G4cout << "Error with " << theError << endl;  
+  G4cout << "Error with " << theError << G4endl;  
 }
 
 
@@ -410,7 +410,7 @@ G4String G4UIxvt::GetCommand()
   }
 
   if( newCommand(0) != '/' )
-    G4cerr << "IT GOT THERE!!!!" << endl;
+    G4cerr << "IT GOT THERE!!!!" << G4endl;
     // If you ever see the error message in the output something has gone
     // wrong.
 
@@ -690,7 +690,7 @@ void G4UIxvt::fillArrayEntries(G4UIcommandTree * tree, int level)
     if(level==0) 
     {
       // --- This code shouldn't ever get executed --- //
-      G4cout << "Printing command Path" << commandPath << endl;
+      G4cout << "Printing command Path" << commandPath << G4endl;
     }
     else     
     {
@@ -772,11 +772,11 @@ void G4UIxvt::listCommandArray(void)
 {
   for(int i = 0; i < currentPosition; i++)
   {
-    G4cout << "CommandArray, Entry-> " << i << endl
-         << "Flag-> " << commandArray[i].flag << endl
-         << "Name-> " << commandArray[i].name << endl
-         << "Guidance-> " << commandArray[i].guidance << endl
-         << "Number of Parameters-> " << commandArray[i].numOfParameters << endl;
+    G4cout << "CommandArray, Entry-> " << i << G4endl
+         << "Flag-> " << commandArray[i].flag << G4endl
+         << "Name-> " << commandArray[i].name << G4endl
+         << "Guidance-> " << commandArray[i].guidance << G4endl
+         << "Number of Parameters-> " << commandArray[i].numOfParameters << G4endl;
          
          int numParam = commandArray[i].numOfParameters;
          
@@ -784,19 +784,19 @@ void G4UIxvt::listCommandArray(void)
          {
            for(int x = 0; x < numParam; x++)
            {
-             G4cout << "Parameters for this command: " << endl << endl
-                  << "Parameter Name-> "          << commandArray[i].parameters[x].name         << endl
-                  << "Parameter Guidance-> "      << commandArray[i].parameters[x].guidance     << endl
-                  << "Parameter Default Value-> " << commandArray[i].parameters[x].defaultValue << endl
-                  << "Parameter Range-> "         << commandArray[i].parameters[x].range        << endl
-                  << "Parameter Candidate-> "     << commandArray[i].parameters[x].candidate    << endl
-                  << "Parameter Type-> "          << commandArray[i].parameters[x].type         << endl
-                  << "Parameter Omittable-> "     << commandArray[i].parameters[x].omittable    << endl 
-                  << endl << endl;
+             G4cout << "Parameters for this command: " << G4endl << G4endl
+                  << "Parameter Name-> "          << commandArray[i].parameters[x].name         << G4endl
+                  << "Parameter Guidance-> "      << commandArray[i].parameters[x].guidance     << G4endl
+                  << "Parameter Default Value-> " << commandArray[i].parameters[x].defaultValue << G4endl
+                  << "Parameter Range-> "         << commandArray[i].parameters[x].range        << G4endl
+                  << "Parameter Candidate-> "     << commandArray[i].parameters[x].candidate    << G4endl
+                  << "Parameter Type-> "          << commandArray[i].parameters[x].type         << G4endl
+                  << "Parameter Omittable-> "     << commandArray[i].parameters[x].omittable    << G4endl 
+                  << G4endl << G4endl;
            }
          }
          
-         G4cout << "Number-> " << commandArray[i].commandNumber << endl << endl;
+         G4cout << "Number-> " << commandArray[i].commandNumber << G4endl << G4endl;
   }
 }
 
diff --git a/source/interfaces/XVT/src/G4UIxvtMessenger.cc b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
index 3ac3dce0ca..fb978b3dab 100644
--- a/source/interfaces/XVT/src/G4UIxvtMessenger.cc
+++ b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvtMessenger.cc,v 1.2.8.1 1999/12/07 20:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvtMessenger.cc,v 1.2.8.1.2.1 1999/12/08 17:34:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
@@ -60,7 +60,7 @@ void G4UIxvtMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
     if(newValue=="EndOfEvent") id=2;
     if(newValue=="endOfRun") id=3;
     if(id<0)
-    { G4cout << "Unknown break point <" << newValue << "> ignored." << endl; }
+    { G4cout << "Unknown break point <" << newValue << "> ignored." << G4endl; }
     else
     { xvtptr->set_breakPointAt(id,true); }
   }
diff --git a/source/interfaces/basic/include/G4UIWin32.hh b/source/interfaces/basic/include/G4UIWin32.hh
index 6720c69b7f..f54ae396a8 100644
--- a/source/interfaces/basic/include/G4UIWin32.hh
+++ b/source/interfaces/basic/include/G4UIWin32.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWin32.hh,v 1.7.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 
diff --git a/source/interfaces/basic/include/G4UIXaw.hh b/source/interfaces/basic/include/G4UIXaw.hh
index 26b7363e3f..33629a252f 100644
--- a/source/interfaces/basic/include/G4UIXaw.hh
+++ b/source/interfaces/basic/include/G4UIXaw.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXaw.hh,v 1.3.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 
diff --git a/source/interfaces/basic/include/G4UIXm.hh b/source/interfaces/basic/include/G4UIXm.hh
index 8defa0ec64..e4f7071fc3 100644
--- a/source/interfaces/basic/include/G4UIXm.hh
+++ b/source/interfaces/basic/include/G4UIXm.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXm.hh,v 1.8.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 
diff --git a/source/interfaces/basic/include/G4UIterminal.hh b/source/interfaces/basic/include/G4UIterminal.hh
index 43ea09f87a..7119177c87 100644
--- a/source/interfaces/basic/include/G4UIterminal.hh
+++ b/source/interfaces/basic/include/G4UIterminal.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIterminal.hh,v 1.3.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIterminal.hh,v 1.3.4.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UIterminal_h
@@ -14,7 +14,7 @@
 
 #include "G4VBasicShell.hh"
 #include "G4UImanager.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 // class description:
 //
diff --git a/source/interfaces/basic/src/G4UIWin32.cc b/source/interfaces/basic/src/G4UIWin32.cc
index c8578888ac..787b831768 100644
--- a/source/interfaces/basic/src/G4UIWin32.cc
+++ b/source/interfaces/basic/src/G4UIWin32.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIWin32.cc,v 1.5.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIWin32.cc,v 1.5.4.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -20,7 +20,7 @@
 #include <windowsx.h>
 #include <wingdi.h>
 
-#include <Strstrea.h>
+#include "g4std/strstream"
 
 #include "G4UImanager.hh"
 #include "G4StateManager.hh"
diff --git a/source/interfaces/basic/src/G4UIXaw.cc b/source/interfaces/basic/src/G4UIXaw.cc
index 5abaa082c4..987d45e8bc 100644
--- a/source/interfaces/basic/src/G4UIXaw.cc
+++ b/source/interfaces/basic/src/G4UIXaw.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXaw.cc,v 1.2.8.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIXm.cc b/source/interfaces/basic/src/G4UIXm.cc
index 4e5263ab28..2ae89a30b7 100644
--- a/source/interfaces/basic/src/G4UIXm.cc
+++ b/source/interfaces/basic/src/G4UIXm.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIXm.cc,v 1.5.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIXm.cc,v 1.5.4.1.2.4 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -14,11 +14,7 @@
 
 #ifdef G4UI_BUILD_XM_SESSION
 
-#ifdef WIN32
-#include <Strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include <string.h>
 
diff --git a/source/interfaces/basic/src/G4UIterminal.cc b/source/interfaces/basic/src/G4UIterminal.cc
index d4c722e98d..4c3eb39a0c 100644
--- a/source/interfaces/basic/src/G4UIterminal.cc
+++ b/source/interfaces/basic/src/G4UIterminal.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIterminal.cc,v 1.4.4.1.2.1 1999/12/07 20:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIterminal.cc,v 1.4.4.1.2.1.2.7 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIterminal.hh"
@@ -15,11 +15,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIterminal::G4UIterminal()
 {
@@ -39,7 +35,7 @@ G4UIterminal::~G4UIterminal()
   {
     UI->SetSession(NULL);
     UI->SetCoutDestination(NULL);
-    //    G4cout << "Terminal session deleted" << endl;
+    //    G4cout << "Terminal session deleted" << G4endl;
   }
 }
 
@@ -74,13 +70,13 @@ void G4UIterminal::PauseSessionStart(G4String msg)
 
 G4int G4UIterminal::ReceiveG4cout(G4String coutString)
 {
-  cout << coutString << flush;
+  G4std::cout << coutString << G4std::flush;
   return 0;
 }
 
 G4int G4UIterminal::ReceiveG4cerr(G4String cerrString)
 {
-  cerr << cerrString << flush;
+  G4std::cerr << cerrString << G4std::flush;
   return 0;
 }
 
@@ -95,19 +91,19 @@ void G4UIterminal::ExecuteCommand(G4String aCommand)
     case fCommandSucceeded:
       break;
     case fCommandNotFound:
-      G4cerr << "command <" << aCommand << "> not found" << endl;
+      G4cerr << "command <" << aCommand << "> not found" << G4endl;
        if ( aCommand.index("@@") != G4std::string::npos) {
-       G4cout << "@@G4UIterminal" << endl;
+       G4cout << "@@G4UIterminal" << G4endl;
        }
       break;
     case fIllegalApplicationState:
-      G4cerr << "illegal application state -- command refused" << endl;
+      G4cerr << "illegal application state -- command refused" << G4endl;
       break;
     case fParameterOutOfRange:
     case fParameterUnreadable:
     case fParameterOutOfCandidates:
     default:
-      G4cerr << "command refused (" << commandStatus << ")" << endl;
+      G4cerr << "command refused (" << commandStatus << ")" << G4endl;
   }
 }
 G4String G4UIterminal::GetCommand()
@@ -118,8 +114,8 @@ G4String G4UIterminal::GetCommand()
   {
     G4cout << promptCharacter;
     G4cout.flush();
-    newCommand.readLine( cin, FALSE );
-    if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false; break; }
+    newCommand.readLine( G4cin, FALSE );
+    if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false; break; }
     newCommand = newCommand.strip(G4String::leading);
     if( newCommand.length() < 1 ) { break; }
 
@@ -127,8 +123,8 @@ G4String G4UIterminal::GetCommand()
     {
       G4String newLine;
       newCommand.remove(newCommand.length()-1);
-      newLine.readLine( cin );
-      if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false; break; }
+      newLine.readLine( G4cin );
+      if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false; break; }
       newCommand.append(newLine);
     }
 
@@ -138,13 +134,13 @@ G4String G4UIterminal::GetCommand()
     // -------------------- nC.toUpper();
     if( nC.length() < 1 ){ break; }
     if( nC(0) == '#' )
-           { G4cout << nC << endl; }
+           { G4cout << nC << G4endl; }
     else if( nC == "ls" || nC(0,3) == "ls " )
            { ListDirectory( nC ); }
     else if( nC == "pwd" )
            { 
 	     G4cout << "Current Working Directory : " 
-		    << GetCurrentWorkingDirectory() << endl; 
+		    << GetCurrentWorkingDirectory() << G4endl; 
 	   }
     else if( nC == "cd" || nC(0,3) == "cd " )
            { ChangeDirectoryCommand( nC ); }
@@ -156,33 +152,33 @@ G4String G4UIterminal::GetCommand()
            {
 	     G4int nh = UI->GetNumberOfHistory();
 	     for(int i=0;i<nh;i++)
-	       { G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; }
+	       { G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; }
 	   }
     else if( nC(0) == '!' )
            {
 	     G4String ss = nC(1,nC.length()-1);
 	     G4int vl;
 	     const char* tt = ss;
-	     istrstream is((char*)tt);
+	     G4std::istrstream is((char*)tt);
 	     is >> vl;
 	     G4int nh = UI->GetNumberOfHistory();
 	     if(vl>=0 && vl<nh)
 	       { 
 		 newCommand = UI->GetPreviousCommand(vl); 
-		 G4cout << newCommand << endl;
+		 G4cout << newCommand << G4endl;
 		 break;
 	       }
 	     else
-	       { G4cerr << "history " << vl << " is not found." << endl; }
+	       { G4cerr << "history " << vl << " is not found." << G4endl; }
 	   }
     else if( nC == "exit" )
           { 
 	    if( iCont )
 	      { 
-		G4cout << "You are now processing RUN." << endl;
-		G4cout << "Please abort it using \"/run/abort\" command first" << endl;
-		G4cout << " and use \"continue\" command until the application" << endl;
-		G4cout << " becomes to Idle." << endl;
+		G4cout << "You are now processing RUN." << G4endl;
+		G4cout << "Please abort it using \"/run/abort\" command first" << G4endl;
+		G4cout << " and use \"continue\" command until the application" << G4endl;
+		G4cout << " becomes to Idle." << G4endl;
 	      }
 	    else
 	      {
@@ -204,18 +200,18 @@ G4String G4UIterminal::GetCommand()
 }
 
 G4bool G4UIterminal::GetHelpChoice(G4int& aInt){
-  cin >> aInt;
-  if(!cin.good()){
-    cin.clear();
-    cin.ignore(30,'\n');
+  G4cin >> aInt;
+  if(!G4cin.good()){
+    G4cin.clear();
+    G4cin.ignore(30,'\n');
     return false;
   } 
   return true;
 }
 void G4UIterminal::ExitHelp(){
-  // cin.flush();
+  // G4cin.flush();
   char temp[100];
-  cin.getline( temp, 100 );
+  G4cin.getline( temp, 100 );
 }
 
 
diff --git a/source/interfaces/common/include/G4VBasicShell.hh b/source/interfaces/common/include/G4VBasicShell.hh
index 2707719881..e2ab5dee76 100644
--- a/source/interfaces/common/include/G4VBasicShell.hh
+++ b/source/interfaces/common/include/G4VBasicShell.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBasicShell.hh,v 1.4.4.1 1999/12/07 20:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VBasicShell_H
diff --git a/source/interfaces/common/include/G4VInteractorManager.hh b/source/interfaces/common/include/G4VInteractorManager.hh
index ed47c08c1f..0d9a4f6567 100644
--- a/source/interfaces/common/include/G4VInteractorManager.hh
+++ b/source/interfaces/common/include/G4VInteractorManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VInteractorManager.hh,v 1.5.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/include/G4Win32.hh b/source/interfaces/common/include/G4Win32.hh
index 2c24ac4a22..431965e4d1 100644
--- a/source/interfaces/common/include/G4Win32.hh
+++ b/source/interfaces/common/include/G4Win32.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Win32.hh,v 1.4.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  To unify Windows message treatment between 
 // G4/interfaces Windows sessions and G4/visualizations Windows drivers.
diff --git a/source/interfaces/common/include/G4Xt.hh b/source/interfaces/common/include/G4Xt.hh
index 5c644b9919..5ec3195adc 100644
--- a/source/interfaces/common/include/G4Xt.hh
+++ b/source/interfaces/common/include/G4Xt.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Xt.hh,v 1.3.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  To unify X11 event treatment between 
 // G4/interfaces Xt sessions and G4/visualizations Xt drivers.
diff --git a/source/interfaces/common/src/G4VBasicShell.cc b/source/interfaces/common/src/G4VBasicShell.cc
index 1877c3ef44..f7281c7b74 100644
--- a/source/interfaces/common/src/G4VBasicShell.cc
+++ b/source/interfaces/common/src/G4VBasicShell.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VBasicShell.cc,v 1.5.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VBasicShell.cc,v 1.5.4.1.2.5 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "g4std/vector"
@@ -17,11 +17,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
 #include "G4UImanager.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4VBasicShell::G4VBasicShell()
 :currentDirectory("/")
@@ -192,10 +188,10 @@ G4String G4VBasicShell::FindMatchingPath(
     if(n_commandEntry==1) {
       return (pathName + commands[0]->GetCommandName());
     } else if (n_commandEntry>=2) {
-      G4cout << "Matching commands :" << endl; 
+      G4cout << "Matching commands :" << G4endl; 
       for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ ) {
 	G4UIcommand* cmd = commands[i_thCommand];
-	G4cout << cmd->GetCommandName() << endl; 
+	G4cout << cmd->GetCommandName() << G4endl; 
       }
       return empty;
     }
@@ -214,10 +210,10 @@ G4String G4VBasicShell::FindMatchingPath(
     if(n_treeEntry==1) {
       return trees[0]->GetPathName();
     } else if (n_treeEntry>=2) {
-      G4cout << "Matching directories :" << endl; 
+      G4cout << "Matching directories :" << G4endl; 
       for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ ) {
 	G4UIcommandTree* tree = trees[i_thTree];
-	G4cout << tree->GetPathName() << endl; 
+	G4cout << tree->GetPathName() << G4endl; 
       }
       return empty;
     } else {
@@ -256,16 +252,16 @@ void G4VBasicShell::ExecuteCommand (
   case fCommandSucceeded:
     break;
   case fCommandNotFound:
-    G4cerr << "command not found" << endl;
+    G4cerr << "command not found" << G4endl;
     break;
   case fIllegalApplicationState:
-    G4cerr << "illegal application state -- command refused" << endl;
+    G4cerr << "illegal application state -- command refused" << G4endl;
     break;
   case fParameterOutOfRange:
   case fParameterUnreadable:
   case fParameterOutOfCandidates:
   default:
-    G4cerr << "command refused (" << commandStatus << ")" << endl;
+    G4cerr << "command refused (" << commandStatus << ")" << G4endl;
   }
 }
 /***************************************************************************/
@@ -283,7 +279,7 @@ void G4VBasicShell::ApplyShellCommand (
   G4String command = a_string.strip(G4String::leading);
   if( command(0) == '#' ) { 
 
-    G4cout << command << endl; 
+    G4cout << command << G4endl; 
 
   } else if( command == "ls" || command(0,3) == "ls " ) {
 
@@ -292,7 +288,7 @@ void G4VBasicShell::ApplyShellCommand (
   } else if( command == "pwd" ) { 
 
     G4cout << "Current Working Directory : " 
-       << GetCurrentWorkingDirectory() << endl; 
+       << GetCurrentWorkingDirectory() << G4endl; 
 
   } else if( command(0,2) == "cd" ) { 
 
@@ -310,7 +306,7 @@ void G4VBasicShell::ApplyShellCommand (
 
     G4int nh = UI->GetNumberOfHistory();
     for(int i=0;i<nh;i++) { 
-      G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; 
+      G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; 
     }
 
   } else if( command(0) == '!' ) {
@@ -318,24 +314,24 @@ void G4VBasicShell::ApplyShellCommand (
     G4String ss = command(1,command.length()-1);
     G4int vl;
     const char* tt = ss;
-    istrstream is((char*)tt);
+    G4std::istrstream is((char*)tt);
     is >> vl;
     G4int nh = UI->GetNumberOfHistory();
     if(vl>=0 && vl<nh) { 
       G4String prev = UI->GetPreviousCommand(vl); 
-      G4cout << prev << endl;
+      G4cout << prev << G4endl;
       ExecuteCommand (ModifyToFullPathCommand(prev));
     } else { 
-      G4cerr << "history " << vl << " is not found." << endl; 
+      G4cerr << "history " << vl << " is not found." << G4endl; 
     }
 
   } else if( command(0,4) == "exit" ) { 
 
     if( exitPause == false) { //In a secondary loop.
-      G4cout << "You are now processing RUN." << endl;
-      G4cout << "Please abort it using \"/run/abort\" command first" << endl;
-      G4cout << " and use \"continue\" command until the application" << endl;
-      G4cout << " becomes to Idle." << endl;
+      G4cout << "You are now processing RUN." << G4endl;
+      G4cout << "Please abort it using \"/run/abort\" command first" << G4endl;
+      G4cout << " and use \"continue\" command until the application" << G4endl;
+      G4cout << " becomes to Idle." << G4endl;
     } else {
       exitSession = true;
     }
@@ -358,7 +354,7 @@ void G4VBasicShell::ShowCurrent(G4String newCommand)
   G4String theCommand = ModifyToFullPathCommand(comString);
   G4String curV = UI->GetCurrentValues(theCommand);
   if( ! curV.isNull() ) { 
-    G4cout << "Current value(s) of the parameter(s) : " << curV << endl; 
+    G4cout << "Current value(s) of the parameter(s) : " << curV << G4endl; 
   }
 }
 void G4VBasicShell::ChangeDirectoryCommand(G4String newCommand)
@@ -371,7 +367,7 @@ void G4VBasicShell::ChangeDirectoryCommand(G4String newCommand)
     prefix = aNewPrefix.strip(G4String::both);
   }
   if(!ChangeDirectory(prefix)) { 
-    G4cout << "directory <" << prefix << "> not found." << endl; 
+    G4cout << "directory <" << prefix << "> not found." << G4endl; 
   }
 }
 void G4VBasicShell::ListDirectory(G4String newCommand)
@@ -385,7 +381,7 @@ void G4VBasicShell::ListDirectory(G4String newCommand)
   }
   G4UIcommandTree* commandTree = FindDirectory( targetDir );
   if( commandTree == NULL ) { 
-    G4cout << "Directory <" << targetDir << "> is not found." << endl; 
+    G4cout << "Directory <" << targetDir << "> is not found." << G4endl; 
   } else { 
     commandTree->ListCurrent(); 
   }
@@ -409,7 +405,7 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
     }
     else
     {
-      G4cout << "Command <" << newValue << " is not found." << endl;
+      G4cout << "Command <" << newValue << " is not found." << G4endl;
       return;
     }
   }
@@ -430,11 +426,11 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
   floor[iFloor]->ListCurrentWithNum();
   // 1998 Oct 2 non-number input
   while(1){
-   //G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<flush;
-    G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<endl;
+   //G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4std::flush;
+    G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4endl;
     G4int i;
     if(!GetHelpChoice(i)){
-      G4cout << endl << "Not a number, once more" << endl; 
+      G4cout << G4endl << "Not a number, once more" << G4endl; 
       continue;
     } else if( i < 0 ){
       iFloor += i;
@@ -460,8 +456,8 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
       }
     }
   }
-  G4cout << "Exit from HELP." << endl << endl;
-  //G4cout << endl;
+  G4cout << "Exit from HELP." << G4endl << G4endl;
+  //G4cout << G4endl;
   ExitHelp();
 }
 
diff --git a/source/interfaces/common/src/G4VInteractorManager.cc b/source/interfaces/common/src/G4VInteractorManager.cc
index e3e28c4083..b68f07580f 100644
--- a/source/interfaces/common/src/G4VInteractorManager.cc
+++ b/source/interfaces/common/src/G4VInteractorManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VInteractorManager.cc,v 1.7.4.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VInteractorManager.cc,v 1.7.4.1.2.3 1999/12/15 11:43:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -221,9 +221,9 @@ void G4VInteractorManager::SecondaryLoop (
   if(secondaryLoopEnabled==FALSE) return;
   
   if (alreadyInSecondaryLoop==FALSE) {
-    G4cout << "------------------------------------------" << endl;
-    G4cout << "You have entered a viewer secondary X event loop." << endl;
-    G4cout << "Quit it with an 'Escape' viewer button" << endl;
+    G4cout << "------------------------------------------" << G4endl;
+    G4cout << "You have entered a viewer secondary X event loop." << G4endl;
+    G4cout << "Quit it with an 'Escape' viewer button" << G4endl;
     alreadyInSecondaryLoop   = TRUE;
     exitSecondaryLoop        = 0;
     SecondaryLoopPreActions  ();
diff --git a/source/interfaces/common/src/G4Win32.cc b/source/interfaces/common/src/G4Win32.cc
index 7a864dbb48..f1f8d2ec05 100644
--- a/source/interfaces/common/src/G4Win32.cc
+++ b/source/interfaces/common/src/G4Win32.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Win32.cc,v 1.4.8.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Win32.cc,v 1.4.8.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -73,7 +73,7 @@ G4Win32::G4Win32 (
     nCmdShow         = a_nCmdShow;
   
     if(hInstance==NULL) {
-      G4cout << "G4Win32::G4Win32 : NULL hInstance given." <<endl;
+      G4cout << "G4Win32::G4Win32 : NULL hInstance given." <<G4endl;
     }
 
     if(hPrevInstance==NULL) {
@@ -97,7 +97,7 @@ G4Win32::G4Win32 (
 				 NULL, NULL, hInstance, NULL);
     
     if(topWindow==NULL) {
-      G4cout << "G4Win32 : Unable to create Win32 window." << endl;
+      G4cout << "G4Win32 : Unable to create Win32 window." << G4endl;
     }
 
     Win32Inited = TRUE;
diff --git a/source/interfaces/common/src/G4Xt.cc b/source/interfaces/common/src/G4Xt.cc
index f0a143b172..c4b1403ee5 100644
--- a/source/interfaces/common/src/G4Xt.cc
+++ b/source/interfaces/common/src/G4Xt.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Xt.cc,v 1.4.6.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Xt.cc,v 1.4.6.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -91,7 +91,7 @@ G4Xt::G4Xt (
 				    &argc,a_args,NULL,
 				    xargs,1);
     if(topWidget==NULL) {
-      G4cout        << "G4Xt : Unable to init Xt." << endl;
+      G4cout        << "G4Xt : Unable to init Xt." << G4endl;
     }
     // Restore a_args. XtAppInitialize corrupts the given ones !!!
     if( (a_argn!=0) && (args!=NULL)) {
diff --git a/source/materials/include/G4AtomicShells.hh b/source/materials/include/G4AtomicShells.hh
index ab58f3f899..0456c23d3d 100644
--- a/source/materials/include/G4AtomicShells.hh
+++ b/source/materials/include/G4AtomicShells.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AtomicShells.hh,v 1.1.10.1 1999/12/07 20:49:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class consists of atomic subshell binding energies in   eV !!!
 // for first 100 elements
diff --git a/source/materials/include/G4Element.hh b/source/materials/include/G4Element.hh
index 6d61753742..3b2c399a6b 100644
--- a/source/materials/include/G4Element.hh
+++ b/source/materials/include/G4Element.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Element.hh,v 1.2.6.1.2.1 1999/12/07 20:49:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Element.hh,v 1.2.6.1.2.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ------------------- class G4Element -------------------
@@ -123,9 +123,9 @@ public:
 
     G4IonisParamElm* GetIonisation() const {return fIonisation;};
    
-    friend ostream& operator<<(ostream&, G4Element*);    
-    friend ostream& operator<<(ostream&, G4Element&);    
-    friend ostream& operator<<(ostream&, G4ElementTable);
+    friend G4std::ostream& operator<<(G4std::ostream&, G4Element*);    
+    friend G4std::ostream& operator<<(G4std::ostream&, G4Element&);    
+    friend G4std::ostream& operator<<(G4std::ostream&, G4ElementTable);
     
     G4int operator==(const G4Element&) const;
     G4int operator!=(const G4Element&) const;
diff --git a/source/materials/include/G4ElementTable.hh b/source/materials/include/G4ElementTable.hh
index fcf67cf2a3..209914a677 100644
--- a/source/materials/include/G4ElementTable.hh
+++ b/source/materials/include/G4ElementTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ElementTable.hh,v 1.1.10.1 1999/12/07 20:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4ElementVector.hh b/source/materials/include/G4ElementVector.hh
index eb9bbba459..0c6007b03a 100644
--- a/source/materials/include/G4ElementVector.hh
+++ b/source/materials/include/G4ElementVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ElementVector.hh,v 1.1.10.1 1999/12/07 20:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4IonisParamElm.hh b/source/materials/include/G4IonisParamElm.hh
index 5734fc28f6..38314e51ae 100644
--- a/source/materials/include/G4IonisParamElm.hh
+++ b/source/materials/include/G4IonisParamElm.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonisParamElm.hh,v 1.2.8.1 1999/12/07 20:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ------------------- class G4IonisParamElm -------------------
diff --git a/source/materials/include/G4IonisParamMat.hh b/source/materials/include/G4IonisParamMat.hh
index 9a8f2b8a2e..26516ab30c 100644
--- a/source/materials/include/G4IonisParamMat.hh
+++ b/source/materials/include/G4IonisParamMat.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonisParamMat.hh,v 1.2.8.1 1999/12/07 20:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
diff --git a/source/materials/include/G4Isotope.hh b/source/materials/include/G4Isotope.hh
index 6000fb55a6..4290e809a5 100644
--- a/source/materials/include/G4Isotope.hh
+++ b/source/materials/include/G4Isotope.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Isotope.hh,v 1.1.8.1.2.1 1999/12/07 20:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Isotope.hh,v 1.1.8.1.2.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -75,13 +75,13 @@ class G4Isotope
     static size_t GetNumberOfIsotopes()     {return theIsotopeTable.length();};
     
     friend
-    ostream& operator<<(ostream&, G4Isotope*);
+    G4std::ostream& operator<<(G4std::ostream&, G4Isotope*);
     
     friend
-    ostream& operator<<(ostream&, G4Isotope&);
+    G4std::ostream& operator<<(G4std::ostream&, G4Isotope&);
     
     friend
-    ostream& operator<<(ostream&, G4IsotopeTable);
+    G4std::ostream& operator<<(G4std::ostream&, G4IsotopeTable);
      
     G4int operator==(const G4Isotope &right) const;
     G4int operator!=(const G4Isotope &right) const;
diff --git a/source/materials/include/G4IsotopeVector.hh b/source/materials/include/G4IsotopeVector.hh
index e0edc84c66..e564dd91f5 100644
--- a/source/materials/include/G4IsotopeVector.hh
+++ b/source/materials/include/G4IsotopeVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IsotopeVector.hh,v 1.1.10.1 1999/12/07 20:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4MPVEntry.hh b/source/materials/include/G4MPVEntry.hh
index 92cdd5fa68..64830868c0 100644
--- a/source/materials/include/G4MPVEntry.hh
+++ b/source/materials/include/G4MPVEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MPVEntry.hh,v 1.3.2.1 1999/11/11 14:30:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4Material.hh b/source/materials/include/G4Material.hh
index 259e19e9d4..6fc371d274 100644
--- a/source/materials/include/G4Material.hh
+++ b/source/materials/include/G4Material.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Material.hh,v 1.4.6.1.2.1 1999/12/07 20:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Material.hh,v 1.4.6.1.2.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ------------------- class G4Material ---------------------
@@ -198,13 +198,13 @@ public:
     G4double GetA() const;
     
     friend
-    ostream& operator<<(ostream&, G4Material*);
+    G4std::ostream& operator<<(G4std::ostream&, G4Material*);
     
     friend
-    ostream& operator<<(ostream&, G4Material&);
+    G4std::ostream& operator<<(G4std::ostream&, G4Material&);
     
     friend
-    ostream& operator<<(ostream&, G4MaterialTable);
+    G4std::ostream& operator<<(G4std::ostream&, G4MaterialTable);
         
     G4int operator==(const G4Material&) const;
     G4int operator!=(const G4Material&) const;
@@ -288,7 +288,7 @@ inline
 G4double G4Material::GetZ() const
 { 
   if (fNumberOfElements > 1) {
-     G4cerr << "WARNING in GetZ. The material: " << fName << " is a mixture." << endl;
+     G4cerr << "WARNING in GetZ. The material: " << fName << " is a mixture." << G4endl;
      G4Exception ( " the Atomic number is not well defined." );
   } 
   return (*theElementVector)(0)->GetZ();      
@@ -301,7 +301,7 @@ inline
 G4double G4Material::GetA() const
 { 
   if (fNumberOfElements > 1) { 
-     G4cerr << "WARNING in GetA. The material: " << fName << " is a mixture." << endl;
+     G4cerr << "WARNING in GetA. The material: " << fName << " is a mixture." << G4endl;
      G4Exception ( " the Atomic mass is not well defined." );
   } 
   return  (*theElementVector)(0)->GetA();      
diff --git a/source/materials/include/G4MaterialPropertiesTable.hh b/source/materials/include/G4MaterialPropertiesTable.hh
index 0df840e1bf..dc950ea13b 100644
--- a/source/materials/include/G4MaterialPropertiesTable.hh
+++ b/source/materials/include/G4MaterialPropertiesTable.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MaterialPropertiesTable.hh,v 1.7 1999/11/16 08:31:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MaterialPropertiesTable.hh,v 1.7.4.1 1999/12/09 10:28:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -120,9 +120,9 @@ private:
 	// Private Data members
 	/////////////////////////
 
-	G4std::map<G4String, G4MaterialPropertyVector*, less<G4String> > MPT;
+	G4std::map<G4String, G4MaterialPropertyVector*, G4std::less<G4String> > MPT;
 	typedef G4std::map<G4String, G4MaterialPropertyVector*,
-	  less<G4String> >::iterator MPTiterator;
+	  G4std::less<G4String> >::iterator MPTiterator;
 };
 
 #endif /* G4MaterialPropertiesTable_h */
diff --git a/source/materials/include/G4MaterialPropertyVector.hh b/source/materials/include/G4MaterialPropertyVector.hh
index 6a7e102293..3333201db6 100644
--- a/source/materials/include/G4MaterialPropertyVector.hh
+++ b/source/materials/include/G4MaterialPropertyVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MaterialPropertyVector.hh,v 1.3.2.1 1999/11/11 14:30:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4MaterialTable.hh b/source/materials/include/G4MaterialTable.hh
index 5248229a17..9e0cf26169 100644
--- a/source/materials/include/G4MaterialTable.hh
+++ b/source/materials/include/G4MaterialTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MaterialTable.hh,v 1.1.10.1 1999/12/07 20:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4OpticalSurface.hh b/source/materials/include/G4OpticalSurface.hh
index 1ca1a69fe0..7bfa333ed0 100644
--- a/source/materials/include/G4OpticalSurface.hh
+++ b/source/materials/include/G4OpticalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpticalSurface.hh,v 1.4 1999/11/05 21:12:05 gum Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4SandiaTable.hh b/source/materials/include/G4SandiaTable.hh
index cf39758716..ad3a893873 100644
--- a/source/materials/include/G4SandiaTable.hh
+++ b/source/materials/include/G4SandiaTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SandiaTable.hh,v 1.3.8.1 1999/12/07 20:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
diff --git a/source/materials/include/G4StaticSandiaData.hh b/source/materials/include/G4StaticSandiaData.hh
index 175ce6e3dc..56b50c8966 100644
--- a/source/materials/include/G4StaticSandiaData.hh
+++ b/source/materials/include/G4StaticSandiaData.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StaticSandiaData.hh,v 1.2.8.1 1999/12/07 20:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // file G4StaticSandiaData.hh
 // File for static data of PhotoAbsorption cross section coefficients 
diff --git a/source/materials/src/G4AtomicShells.cc b/source/materials/src/G4AtomicShells.cc
index 1b49c8a84b..b5cdf53c57 100644
--- a/source/materials/src/G4AtomicShells.cc
+++ b/source/materials/src/G4AtomicShells.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AtomicShells.cc,v 1.1.10.1 1999/12/07 20:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
diff --git a/source/materials/src/G4Element.cc b/source/materials/src/G4Element.cc
index 05dee272d4..f012f44490 100644
--- a/source/materials/src/G4Element.cc
+++ b/source/materials/src/G4Element.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Element.cc,v 1.2.8.1 1999/12/07 20:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Element.cc,v 1.2.8.1.2.4 1999/12/14 07:07:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ------------ class G4Element ------------
@@ -30,7 +30,7 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 #include "G4Element.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 G4ElementTable G4Element::theElementTable;
 
@@ -51,7 +51,7 @@ G4Element::G4Element(const G4String& name, const G4String& symbol,
     if ((zeff-G4int(zeff)) > perMillion)
       G4cerr << name <<
       " : WARNING ! Trying to define an element as a mixture directly via effective Z."
-           << endl;
+           << G4endl;
 
     InitializePointers();
 
@@ -266,30 +266,30 @@ G4double G4Element::GetAtomicShell(G4int i) const
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-ostream& operator<<(ostream& flux, G4Element* element)
+G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
 { 
-  long mode = flux.setf(ios::fixed,ios::floatfield);
+  long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
   
   flux
-    << " Element: " << setw(8) << element->fName << setw(3) << element->fSymbol
-    << "   Z = " << setw(4) << setprecision(1) <<  element->fZeff 
-    << "   N = " << setw(5) << setprecision(1) <<  element->fNeff
-    << "   A = " << setw(6) << setprecision(2) << (element->fAeff)/(g/mole) 
+    << " Element: " << G4std::setw(8) << element->fName << G4std::setw(3) << element->fSymbol
+    << "   Z = " << G4std::setw(4) << G4std::setprecision(1) <<  element->fZeff 
+    << "   N = " << G4std::setw(5) << G4std::setprecision(1) <<  element->fNeff
+    << "   A = " << G4std::setw(6) << G4std::setprecision(2) << (element->fAeff)/(g/mole) 
     << " g/mole";
    
   for (G4int i=0; i<element->fNumberOfIsotopes; i++)
   flux 
     << "\n   ---> " << (*(element->theIsotopeVector))[i] 
-    << "   abundance: " << setw(6) << setprecision(2) 
+    << "   abundance: " << G4std::setw(6) << G4std::setprecision(2) 
     << (element->fRelativeAbundanceVector[i])/perCent << " %";
     
-  flux.setf(mode,ios::floatfield);         
+  flux.setf(mode,G4std::ios::floatfield);         
   return flux;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
- ostream& operator<<(ostream& flux, G4Element& element)
+ G4std::ostream& operator<<(G4std::ostream& flux, G4Element& element)
 {
   flux << &element;        
   return flux;
@@ -297,14 +297,14 @@ ostream& operator<<(ostream& flux, G4Element* element)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
      
-ostream& operator<<(ostream& flux, G4ElementTable ElementTable)
+G4std::ostream& operator<<(G4std::ostream& flux, G4ElementTable ElementTable)
 {
  //Dump info for all known elements
    flux << "\n***** Table : Nb of elements = " << ElementTable.length() 
-        << " *****\n" << endl;
+        << " *****\n" << G4endl;
         
    for (G4int i=0; i<ElementTable.length(); i++) flux << ElementTable[i] 
-                                                      << endl << endl;
+                                                      << G4endl << G4endl;
 
    return flux;
 }      
diff --git a/source/materials/src/G4IonisParamElm.cc b/source/materials/src/G4IonisParamElm.cc
index 37fb8e0075..79258dc985 100644
--- a/source/materials/src/G4IonisParamElm.cc
+++ b/source/materials/src/G4IonisParamElm.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonisParamElm.cc,v 1.2.8.1 1999/12/07 20:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ------------ class G4IonisParamElm ------------
diff --git a/source/materials/src/G4IonisParamMat.cc b/source/materials/src/G4IonisParamMat.cc
index 64ba1bea80..8dca4e85ca 100644
--- a/source/materials/src/G4IonisParamMat.cc
+++ b/source/materials/src/G4IonisParamMat.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonisParamMat.cc,v 1.2.8.1 1999/12/07 20:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4Isotope.cc b/source/materials/src/G4Isotope.cc
index f23199bfab..11d15f0ac3 100644
--- a/source/materials/src/G4Isotope.cc
+++ b/source/materials/src/G4Isotope.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Isotope.cc,v 1.1.10.1 1999/12/07 20:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Isotope.cc,v 1.1.10.1.2.4 1999/12/14 07:07:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -27,7 +27,7 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 #include "G4Isotope.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -90,24 +90,24 @@ G4int G4Isotope::operator!=(const G4Isotope &right) const
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-ostream& operator<<(ostream& flux, G4Isotope* isotope)
+G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope* isotope)
 {
-  long mode = flux.setf(ios::fixed,ios::floatfield);
+  long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
   
   flux
-    << " Isotope: " << setw(5) << isotope->fName 
-    << "   Z = " << setw(2) <<  isotope->fZ 
-    << "   N = " << setw(3) <<  isotope->fN
-    << "   A = " << setw(6) << setprecision(2) 
+    << " Isotope: " << G4std::setw(5) << isotope->fName 
+    << "   Z = " << G4std::setw(2) <<  isotope->fZ 
+    << "   N = " << G4std::setw(3) <<  isotope->fN
+    << "   A = " << G4std::setw(6) << G4std::setprecision(2) 
     << (isotope->fA)/(g/mole) << " g/mole";
     
-  flux.setf(mode,ios::floatfield);       
+  flux.setf(mode,G4std::ios::floatfield);       
   return flux;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
- ostream& operator<<(ostream& flux, G4Isotope& isotope)
+ G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope& isotope)
 {
   flux << &isotope;        
   return flux;
@@ -115,14 +115,14 @@ ostream& operator<<(ostream& flux, G4Isotope* isotope)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
      
-ostream& operator<<(ostream& flux, G4IsotopeTable IsotopeTable)
+G4std::ostream& operator<<(G4std::ostream& flux, G4IsotopeTable IsotopeTable)
 {
  //Dump info for all known isotopes
    flux 
      << "\n***** Table : Nb of isotopes = " << IsotopeTable.length() 
-     << " *****\n" << endl;
+     << " *****\n" << G4endl;
         
-   for (G4int i=0; i<IsotopeTable.length(); i++) flux << IsotopeTable[i] << endl;
+   for (G4int i=0; i<IsotopeTable.length(); i++) flux << IsotopeTable[i] << G4endl;
 
    return flux;
 }      
diff --git a/source/materials/src/G4MPVEntry.cc b/source/materials/src/G4MPVEntry.cc
index 0aa65c36b4..1f3b2ca4c9 100644
--- a/source/materials/src/G4MPVEntry.cc
+++ b/source/materials/src/G4MPVEntry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MPVEntry.cc,v 1.3.2.1 1999/11/11 14:30:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MPVEntry.cc,v 1.3.2.1.4.1 1999/12/08 17:34:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -104,5 +104,5 @@ void G4MPVEntry::DumpEntry()
 	     << ", " 
 	     << theProperty
  	     << ")" 
-	     << endl;	
+	     << G4endl;	
 }
diff --git a/source/materials/src/G4Material.cc b/source/materials/src/G4Material.cc
index 19529dcd9f..88aad693fd 100644
--- a/source/materials/src/G4Material.cc
+++ b/source/materials/src/G4Material.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Material.cc,v 1.5.8.1 1999/12/07 20:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Material.cc,v 1.5.8.1.2.4 1999/12/14 07:07:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //      ---------- class G4Material ----------
@@ -40,7 +40,7 @@
 
 #include "G4Material.hh"
 #include "G4UnitsTable.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 
 G4MaterialTable G4Material::theMaterialTable;
@@ -61,7 +61,7 @@ G4Material::G4Material(const G4String& name, G4double z,
               << " define a material with density=0 is not allowed. \n"
               << " The material " << name << " will be constructed with the"
               << " default minimal density: " << universe_mean_density/(g/cm3) 
-              << "g/cm3" << endl;
+              << "g/cm3" << G4endl;
          density = universe_mean_density;
        } 
 
@@ -109,7 +109,7 @@ G4Material::G4Material(const G4String& name, G4double density, G4int nComponents
             << " define a material with density=0 is not allowed. \n"
             << " The material " << name << " will be constructed with the"
             << " default minimal density: " << universe_mean_density/(g/cm3) 
-            << "g/cm3" << endl;
+            << "g/cm3" << G4endl;
        density = universe_mean_density;
       }
         
@@ -146,7 +146,7 @@ G4Material::G4Material(const G4String& name, const G4String& chFormula,
               << " define a material with density=0 is not allowed. \n"
               << " The material " << name << " will be constructed with the"
               << " default minimal density: " << universe_mean_density/(g/cm3) 
-              << "g/cm3" << endl;
+              << "g/cm3" << G4endl;
          density = universe_mean_density;
        } 
 
@@ -195,7 +195,7 @@ G4Material::G4Material(const G4String& name, const G4String& chFormula,
             << " define a material with density=0 is not allowed. \n"
             << " The material " << name << " will be constructed with the"
             << " default minimal density: " << universe_mean_density/(g/cm3) 
-            << "g/cm3" << endl;
+            << "g/cm3" << G4endl;
        density = universe_mean_density;
       }
         
@@ -267,7 +267,7 @@ void G4Material::AddElement(G4Element* element, G4double fraction)
     // if fAtomsVector is non-NULL, complain. Apples and oranges.  $$$
     if (fAtomsVector) {
         G4cerr << "This material is already being defined via elements by"
-             << "atoms." << endl;
+             << "atoms." << G4endl;
         G4Exception ("You are mixing apples and oranges ...");
     }
          
@@ -302,7 +302,7 @@ void G4Material::AddElement(G4Element* element, G4double fraction)
        if (abs(1.-wtSum) > perThousand) {
          G4cerr << "WARNING !! - Fractional masses do not sum to 1 :the Delta is > 0.001"
               << "( the weights are NOT renormalized; the results may be wrong)" 
-              << endl;
+              << G4endl;
        }
 
        ComputeDerivedQuantities();
@@ -322,7 +322,7 @@ void G4Material::AddMaterial(G4Material* material, G4double fraction)
     // if fAtomsVector is non-NULL, complain. Apples and oranges.  $$$
     if (fAtomsVector) {
         G4cerr << "This material is already being defined via elements by"
-             << "atoms." << endl;
+             << "atoms." << G4endl;
         G4Exception ("You are mixing apples and oranges ...");
     }
     // initialization
@@ -360,7 +360,7 @@ void G4Material::AddMaterial(G4Material* material, G4double fraction)
        if (abs(1.-wtSum) > perThousand) {
          G4cerr << "WARNING !! - Fractional masses do not sum to 1 :the Delta is > 0.001"
               << "( the weights are NOT renormalized; the results may be wrong)" 
-              << endl;
+              << G4endl;
        }
 
        ComputeDerivedQuantities();
@@ -503,40 +503,40 @@ G4int G4Material::operator!=(const G4Material& right) const
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 
-ostream& operator<<(ostream& flux, G4Material* material)
+G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
 {
-  long mode = flux.setf(ios::fixed,ios::floatfield);
+  long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
   
   flux
-    << " Material: "      << setw(8) <<  material->fName
+    << " Material: "      << G4std::setw(8) <<  material->fName
     << " " << material->fChemicalFormula << " "
-    << "  density: "     << setw(6) << setprecision(3)  
+    << "  density: "     << G4std::setw(6) << G4std::setprecision(3)  
                           << G4BestUnit(material->fDensity,"Volumic Mass") 
-    << "  temperature: " << setw(6) << setprecision(2)  
+    << "  temperature: " << G4std::setw(6) << G4std::setprecision(2)  
                           << (material->fTemp)/kelvin << " K"
-    << "  pressure: "    << setw(6) << setprecision(2)   
+    << "  pressure: "    << G4std::setw(6) << G4std::setprecision(2)   
                           << (material->fPressure)/atmosphere << " atm"
-    << "  RadLength: "   << setw(7)  << setprecision(3)  
+    << "  RadLength: "   << G4std::setw(7)  << G4std::setprecision(3)  
                           << G4BestUnit(material->fRadlen,"Length");
     
   for (G4int i=0; i<material->fNumberOfElements; i++)
   flux 
     << "\n   ---> " << (*(material->theElementVector))[i] 
-    << "  fractionMass: " << setw(6)<< setprecision(2) 
+    << "  fractionMass: " << G4std::setw(6)<< G4std::setprecision(2) 
                           << (material->fMassFractionVector[i])/perCent << " %" 
-    << "  Abundance "     << setw(6)<< setprecision(2) 
+    << "  Abundance "     << G4std::setw(6)<< G4std::setprecision(2) 
                           << 100*(material->VecNbOfAtomsPerVolume[i])/
                                  (material->TotNbOfAtomsPerVolume)
                           << " %";
     
-  flux.setf(mode,ios::floatfield);
+  flux.setf(mode,G4std::ios::floatfield);
             
   return flux;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
- ostream& operator<<(ostream& flux, G4Material& material)
+ G4std::ostream& operator<<(G4std::ostream& flux, G4Material& material)
 {
   flux << &material;        
   return flux;
@@ -544,14 +544,14 @@ ostream& operator<<(ostream& flux, G4Material* material)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
      
-ostream& operator<<(ostream& flux, G4MaterialTable MaterialTable)
+G4std::ostream& operator<<(G4std::ostream& flux, G4MaterialTable MaterialTable)
 {
  //Dump info for all known materials
    flux << "\n***** Table : Nb of materials = " << MaterialTable.length() 
-        << " *****\n" << endl;
+        << " *****\n" << G4endl;
         
    for (G4int i=0; i<MaterialTable.length(); i++) flux << MaterialTable[i] 
-                                                       << endl << endl;
+                                                       << G4endl << G4endl;
 
    return flux;
 }      
diff --git a/source/materials/src/G4MaterialPropertiesTable.cc b/source/materials/src/G4MaterialPropertiesTable.cc
index 34007eb325..fec9184b26 100644
--- a/source/materials/src/G4MaterialPropertiesTable.cc
+++ b/source/materials/src/G4MaterialPropertiesTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MaterialPropertiesTable.cc,v 1.5.2.1 1999/11/11 14:30:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MaterialPropertiesTable.cc,v 1.5.2.1.4.1 1999/12/08 17:34:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -171,7 +171,7 @@ void G4MaterialPropertiesTable::DumpTable()
 {
   MPTiterator i;
   for (i = MPT.begin(); i != MPT.end(); ++i) {
-		G4cout << *(*i).first << endl;
+		G4cout << *(*i).first << G4endl;
 		(*i).second->DumpVector();
   }
 }
diff --git a/source/materials/src/G4MaterialPropertyVector.cc b/source/materials/src/G4MaterialPropertyVector.cc
index 5a4be4641e..609cfa037f 100644
--- a/source/materials/src/G4MaterialPropertyVector.cc
+++ b/source/materials/src/G4MaterialPropertyVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MaterialPropertyVector.cc,v 1.3.2.1 1999/11/11 14:30:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MaterialPropertyVector.cc,v 1.3.2.1.4.1 1999/12/08 17:34:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ G4MaterialPropertyVector::GetProperty(G4double aPhotonMomentum) const
 	{
 		G4cout << "\nWarning: G4MaterialPropertyVector::GetProperty";
 		G4cout << "\n==> attempt to Retrieve Property below range" 
-		<< endl;
+		<< G4endl;
 		return minProp; 
 	} 
 
@@ -181,7 +181,7 @@ G4MaterialPropertyVector::GetProperty(G4double aPhotonMomentum) const
 	{
 		G4cout << "\nWarning: G4MaterialPropertyVector::GetProperty";
 		G4cout << "\n==> attempt to Retrieve Property above range" 
-		<< endl;
+		<< G4endl;
 		return maxProp;
 	} 
 	
@@ -278,14 +278,14 @@ G4MaterialPropertyVector::GetPhotonMomentum(G4double aProperty) const
 	{
 	  G4cout << "\nWarning: G4MaterialPropertyVector::GetPhotonMomentum";
 	  G4cout << "\n==> attempt to Retrieve Photon Momentum out of range" 
-	       << endl; 
+	       << G4endl; 
 	  return PMmin;
 	}
 
 	if (aProperty > PropMax) {
           G4cout << "\nWarning: G4MaterialPropertyVector::GetPhotonMomentum";
 	  G4cout << "\n==> attempt to Retrieve Photon Momentum out of range" 
-	       << endl;
+	       << G4endl;
 	  return PMmax;
 	}
 
@@ -340,7 +340,7 @@ void G4MaterialPropertyVector::ResetIterator()
 void G4MaterialPropertyVector::DumpVector()
 {
  	if (MPV.isEmpty())  {
- 		G4cerr << "nothing to dump" << endl;
+ 		G4cerr << "nothing to dump" << G4endl;
 		G4Exception("G4MaterialPropertyVector::DumpVector ==>"
 			    "Nothing to dump!  Vector is empty");
  	}
@@ -348,9 +348,9 @@ void G4MaterialPropertyVector::DumpVector()
 	for (G4int i = 0; i < NumEntries; i++) {
 		G4cout << "MPV["<< i << "]: ";
 		MPV[i]->DumpEntry();
-                G4cout << i << NumEntries << endl;
+                G4cout << i << NumEntries << G4endl;
 	}
-        G4cout << " Done DumpVector " << endl;
+        G4cout << " Done DumpVector " << G4endl;
 
 } 
 
diff --git a/source/materials/src/G4OpticalSurface.cc b/source/materials/src/G4OpticalSurface.cc
index f9efe9be9e..4a83fa5132 100644
--- a/source/materials/src/G4OpticalSurface.cc
+++ b/source/materials/src/G4OpticalSurface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpticalSurface.cc,v 1.3 1999/11/05 21:13:56 gum Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpticalSurface.cc,v 1.3.6.1 1999/12/08 17:34:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -105,19 +105,19 @@ void G4OpticalSurface::DumpInfo() const
 	// Dump info for surface
 
 	G4cout << 
-        "  Surface type   = " << theType   << endl <<
-	"  Surface finish = " << theFinish << endl <<
-	"  Surface model  = " << theModel  << endl;
+        "  Surface type   = " << theType   << G4endl <<
+	"  Surface finish = " << theFinish << G4endl <<
+	"  Surface model  = " << theModel  << G4endl;
 
-	G4cout << endl;
+	G4cout << G4endl;
 
-	G4cout << "  Surface parameter " << endl;
-	G4cout << "  ----------------- " << endl;
+	G4cout << "  Surface parameter " << G4endl;
+	G4cout << "  ----------------- " << G4endl;
 	if (theModel == glisur ){
-		G4cout << polish      << endl;
+		G4cout << polish      << G4endl;
 	}
 	else {
-		G4cout << sigma_alpha << endl;
+		G4cout << sigma_alpha << G4endl;
 	}
-	G4cout << endl;
+	G4cout << G4endl;
 }
diff --git a/source/materials/src/G4SandiaTable.cc b/source/materials/src/G4SandiaTable.cc
index 09a6ba34ac..ce90ed9516 100644
--- a/source/materials/src/G4SandiaTable.cc
+++ b/source/materials/src/G4SandiaTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SandiaTable.cc,v 1.4.4.1 1999/12/07 20:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SandiaTable.cc,v 1.4.4.1.2.1 1999/12/08 17:34:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
@@ -178,7 +178,7 @@ G4SandiaTable::SandiaIntervals(G4int Z[],
   }
   fMaxInterval += 2 ;
 
-//  G4cout<<"fMaxInterval = "<<fMaxInterval<<endl ;
+//  G4cout<<"fMaxInterval = "<<fMaxInterval<<G4endl ;
 
   fPhotoAbsorptionCof = new G4double* [fMaxInterval] ;
 
diff --git a/source/particles/bosons/include/G4BosonConstructor.hh b/source/particles/bosons/include/G4BosonConstructor.hh
index ba82f020ff..3f064fe7ea 100644
--- a/source/particles/bosons/include/G4BosonConstructor.hh
+++ b/source/particles/bosons/include/G4BosonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BosonConstructor.hh,v 1.1.10.1 1999/12/07 20:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4ChargedGeantino.hh b/source/particles/bosons/include/G4ChargedGeantino.hh
index ed36a28ae7..f714673c4e 100644
--- a/source/particles/bosons/include/G4ChargedGeantino.hh
+++ b/source/particles/bosons/include/G4ChargedGeantino.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChargedGeantino.hh,v 1.2.8.1 1999/12/07 20:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4Gamma.hh b/source/particles/bosons/include/G4Gamma.hh
index e52a15a056..38f69c2547 100644
--- a/source/particles/bosons/include/G4Gamma.hh
+++ b/source/particles/bosons/include/G4Gamma.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Gamma.hh,v 1.2.8.1 1999/12/07 20:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4Geantino.hh b/source/particles/bosons/include/G4Geantino.hh
index 3598b2ee98..9573b91e6c 100644
--- a/source/particles/bosons/include/G4Geantino.hh
+++ b/source/particles/bosons/include/G4Geantino.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Geantino.hh,v 1.2.8.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4OpticalPhoton.hh b/source/particles/bosons/include/G4OpticalPhoton.hh
index 016e86bb53..b384989aea 100644
--- a/source/particles/bosons/include/G4OpticalPhoton.hh
+++ b/source/particles/bosons/include/G4OpticalPhoton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpticalPhoton.hh,v 1.2.8.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4VBoson.hh b/source/particles/bosons/include/G4VBoson.hh
index 8faf8fdf01..a6e634b612 100644
--- a/source/particles/bosons/include/G4VBoson.hh
+++ b/source/particles/bosons/include/G4VBoson.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBoson.hh,v 1.1.10.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4BosonConstructor.cc b/source/particles/bosons/src/G4BosonConstructor.cc
index bdf22281b7..aafbe1386d 100644
--- a/source/particles/bosons/src/G4BosonConstructor.cc
+++ b/source/particles/bosons/src/G4BosonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BosonConstructor.cc,v 1.1.10.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4ChargedGeantino.cc b/source/particles/bosons/src/G4ChargedGeantino.cc
index 784199f647..3031665fb3 100644
--- a/source/particles/bosons/src/G4ChargedGeantino.cc
+++ b/source/particles/bosons/src/G4ChargedGeantino.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ChargedGeantino.cc,v 1.1.10.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ChargedGeantino.cc,v 1.1.10.1.2.2 1999/12/14 07:07:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add G4ChargedGeantino::ChargedGeantinoDefinition() H.Kurashige, 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4ChargedGeantino.hh"
 
diff --git a/source/particles/bosons/src/G4Gamma.cc b/source/particles/bosons/src/G4Gamma.cc
index ec5943a7b0..6c7b46bb74 100644
--- a/source/particles/bosons/src/G4Gamma.cc
+++ b/source/particles/bosons/src/G4Gamma.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Gamma.cc,v 1.1.10.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Gamma.cc,v 1.1.10.1.2.3 1999/12/14 07:07:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------
 
 #include "G4ios.hh"
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
  
 #include "G4Gamma.hh"
 
@@ -129,11 +129,11 @@ void G4Gamma::BuildAbsorptionLengthVector(
   }
   if ( theCutInMaxInteractionLength >= absorptionLengthMax ) {
       G4cout << "******** SetCuts for " << GetParticleName(); 
-      G4cout << " ********************" << endl;
+      G4cout << " ********************" << G4endl;
       G4cout << "The maximal meaningful cut is ";
-      G4cout << absorptionLengthMax/mm << " mm." << endl;
-      G4cout << "All the " << GetParticleName() << "will be killed !" << endl;
-      G4cout << "in the material " << aMaterial->GetName() << "." << endl;
+      G4cout << absorptionLengthMax/mm << " mm." << G4endl;
+      G4cout << "All the " << GetParticleName() << "will be killed !" << G4endl;
+      G4cout << "in the material " << aMaterial->GetName() << "." << G4endl;
   }
 }
 
@@ -228,8 +228,8 @@ G4double G4Gamma::ConvertCutToKineticEnergy(
      return T1;
   } else if ( theCutInMaxInteractionLength >= rmax ) {
       G4cout << "******** ConvertCutToKineticEnergy for " << GetParticleName(); 
-      G4cout << " ********************" << endl;
-      G4cout << "The cut energy is set " << DBL_MAX/GeV << "GeV " <<endl; 
+      G4cout << " ********************" << G4endl;
+      G4cout << "The cut energy is set " << DBL_MAX/GeV << "GeV " <<G4endl; 
       return  DBL_MAX;
   } else {
     G4double T2 = Tmax;
diff --git a/source/particles/bosons/src/G4Geantino.cc b/source/particles/bosons/src/G4Geantino.cc
index 9b0ca8b2ba..5faf711253 100644
--- a/source/particles/bosons/src/G4Geantino.cc
+++ b/source/particles/bosons/src/G4Geantino.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Geantino.cc,v 1.1.10.1 1999/12/07 20:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Geantino.cc,v 1.1.10.1.2.2 1999/12/14 07:08:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add G4Geantino::GeantinoDefinition() H.Kurashige, 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Geantino.hh"
 
diff --git a/source/particles/bosons/src/G4OpticalPhoton.cc b/source/particles/bosons/src/G4OpticalPhoton.cc
index ab3d1eebf1..306cbf48de 100644
--- a/source/particles/bosons/src/G4OpticalPhoton.cc
+++ b/source/particles/bosons/src/G4OpticalPhoton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpticalPhoton.cc,v 1.1.10.1 1999/12/07 20:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpticalPhoton.cc,v 1.1.10.1.2.2 1999/12/14 07:08:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Changed name intto "opticalphoton" Hisaya Kurashige, 08 Jan 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4OpticalPhoton.hh"
 
diff --git a/source/particles/bosons/src/G4VBoson.cc b/source/particles/bosons/src/G4VBoson.cc
index 7f153a8f31..594078fa8a 100644
--- a/source/particles/bosons/src/G4VBoson.cc
+++ b/source/particles/bosons/src/G4VBoson.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBoson.cc,v 1.1.10.1 1999/12/07 20:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiLambda.hh b/source/particles/hadrons/barions/include/G4AntiLambda.hh
index 99ecf74ff0..44b8740232 100644
--- a/source/particles/hadrons/barions/include/G4AntiLambda.hh
+++ b/source/particles/hadrons/barions/include/G4AntiLambda.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiLambda.hh,v 1.3.6.1 1999/12/07 20:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
index 9107527530..514a827c33 100644
--- a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiLambdacPlus.hh,v 1.3.6.1 1999/12/07 20:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiNeutron.hh b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
index cd91f3ae17..a47b3da0a6 100644
--- a/source/particles/hadrons/barions/include/G4AntiNeutron.hh
+++ b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutron.hh,v 1.3.6.1 1999/12/07 20:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
index dc1cae9ac1..b247efe8d1 100644
--- a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiOmegaMinus.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
index f739371bd5..27be65ee4c 100644
--- a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiOmegacZero.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiProton.hh b/source/particles/hadrons/barions/include/G4AntiProton.hh
index 48b1987570..4c3e55139e 100644
--- a/source/particles/hadrons/barions/include/G4AntiProton.hh
+++ b/source/particles/hadrons/barions/include/G4AntiProton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiProton.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
index 9edc0747fa..774eff05ed 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaMinus.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
index 04d39b74db..ebafe2d567 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaPlus.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
index 7a76673f55..e4ba6c4b9f 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaZero.hh,v 1.3.6.1 1999/12/07 20:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
index 44b4fd51da..4a856cc7ce 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacPlus.hh,v 1.3.6.1 1999/12/07 20:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
index 21ce990a21..a1b78ab3c6 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacPlusPlus.hh,v 1.3.6.1 1999/12/07 20:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
index 5d4a080113..4cab64421f 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacZero.hh,v 1.3.6.1 1999/12/07 20:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
index ca32057535..4441d4e02a 100644
--- a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiMinus.hh,v 1.3.6.1 1999/12/07 20:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXiZero.hh b/source/particles/hadrons/barions/include/G4AntiXiZero.hh
index a5434bc8c6..546bac76af 100644
--- a/source/particles/hadrons/barions/include/G4AntiXiZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXiZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiZero.hh,v 1.3.6.1 1999/12/07 20:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
index 6efcdc2cb8..f887812bf7 100644
--- a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXicPlus.hh,v 1.3.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXicZero.hh b/source/particles/hadrons/barions/include/G4AntiXicZero.hh
index 0d91b5e475..20d9c0792d 100644
--- a/source/particles/hadrons/barions/include/G4AntiXicZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXicZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXicZero.hh,v 1.3.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
index 6f0a0e0fb5..fe1bb3fe2d 100644
--- a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
+++ b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BaryonConstructor.hh,v 1.1.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Lambda.hh b/source/particles/hadrons/barions/include/G4Lambda.hh
index 0bd248ca11..6e33bad55b 100644
--- a/source/particles/hadrons/barions/include/G4Lambda.hh
+++ b/source/particles/hadrons/barions/include/G4Lambda.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Lambda.hh,v 1.3.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4LambdacPlus.hh b/source/particles/hadrons/barions/include/G4LambdacPlus.hh
index 1e4d2ee3f2..e157792a59 100644
--- a/source/particles/hadrons/barions/include/G4LambdacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4LambdacPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LambdacPlus.hh,v 1.3.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Neutron.hh b/source/particles/hadrons/barions/include/G4Neutron.hh
index 322bea57d0..180dc8aea5 100644
--- a/source/particles/hadrons/barions/include/G4Neutron.hh
+++ b/source/particles/hadrons/barions/include/G4Neutron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Neutron.hh,v 1.3.6.1 1999/12/07 20:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4OmegaMinus.hh b/source/particles/hadrons/barions/include/G4OmegaMinus.hh
index 7f04158325..4890af2517 100644
--- a/source/particles/hadrons/barions/include/G4OmegaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4OmegaMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OmegaMinus.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4OmegacZero.hh b/source/particles/hadrons/barions/include/G4OmegacZero.hh
index 598f219329..e5a4179c29 100644
--- a/source/particles/hadrons/barions/include/G4OmegacZero.hh
+++ b/source/particles/hadrons/barions/include/G4OmegacZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OmegacZero.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Proton.hh b/source/particles/hadrons/barions/include/G4Proton.hh
index 8d7c147c42..08186fad43 100644
--- a/source/particles/hadrons/barions/include/G4Proton.hh
+++ b/source/particles/hadrons/barions/include/G4Proton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Proton.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmaMinus.hh b/source/particles/hadrons/barions/include/G4SigmaMinus.hh
index 6f599a9282..88e8dec262 100644
--- a/source/particles/hadrons/barions/include/G4SigmaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaMinus.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmaPlus.hh b/source/particles/hadrons/barions/include/G4SigmaPlus.hh
index f2a6c8286a..6741d2894e 100644
--- a/source/particles/hadrons/barions/include/G4SigmaPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaPlus.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmaZero.hh b/source/particles/hadrons/barions/include/G4SigmaZero.hh
index d30622e9fe..776b0e124d 100644
--- a/source/particles/hadrons/barions/include/G4SigmaZero.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaZero.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlus.hh
index 978effd9fd..695fb338e6 100644
--- a/source/particles/hadrons/barions/include/G4SigmacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacPlus.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
index 848c682f38..ab5dc77589 100644
--- a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacPlusPlus.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacZero.hh b/source/particles/hadrons/barions/include/G4SigmacZero.hh
index cc0e39f8e7..f073dc9b98 100644
--- a/source/particles/hadrons/barions/include/G4SigmacZero.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacZero.hh,v 1.3.6.1 1999/12/07 20:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4VBaryon.hh b/source/particles/hadrons/barions/include/G4VBaryon.hh
index 71210f0444..6e41b901ce 100644
--- a/source/particles/hadrons/barions/include/G4VBaryon.hh
+++ b/source/particles/hadrons/barions/include/G4VBaryon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBaryon.hh,v 1.1.6.1 1999/12/07 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XiMinus.hh b/source/particles/hadrons/barions/include/G4XiMinus.hh
index e921e0493c..f2eabd4acf 100644
--- a/source/particles/hadrons/barions/include/G4XiMinus.hh
+++ b/source/particles/hadrons/barions/include/G4XiMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiMinus.hh,v 1.3.6.1 1999/12/07 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XiZero.hh b/source/particles/hadrons/barions/include/G4XiZero.hh
index c43750f5de..097d518ab9 100644
--- a/source/particles/hadrons/barions/include/G4XiZero.hh
+++ b/source/particles/hadrons/barions/include/G4XiZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiZero.hh,v 1.3.6.1 1999/12/07 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XicPlus.hh b/source/particles/hadrons/barions/include/G4XicPlus.hh
index 3c852da7a9..5044852691 100644
--- a/source/particles/hadrons/barions/include/G4XicPlus.hh
+++ b/source/particles/hadrons/barions/include/G4XicPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XicPlus.hh,v 1.3.6.1 1999/12/07 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XicZero.hh b/source/particles/hadrons/barions/include/G4XicZero.hh
index 8f8e037e6c..165b8d54b0 100644
--- a/source/particles/hadrons/barions/include/G4XicZero.hh
+++ b/source/particles/hadrons/barions/include/G4XicZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XicZero.hh,v 1.3.6.1 1999/12/07 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiLambda.cc b/source/particles/hadrons/barions/src/G4AntiLambda.cc
index eac10490bb..2706baf092 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambda.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambda.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiLambda.cc,v 1.3.6.1 1999/12/07 20:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiLambda.cc,v 1.3.6.1.2.2 1999/12/14 07:08:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiLambda.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
index 0bfcf1adfb..ce0feed240 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiLambdacPlus.cc,v 1.3.6.1 1999/12/07 20:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiLambdacPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiLambdacPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiNeutron.cc b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
index c60be146fc..7ef91f0d72 100644
--- a/source/particles/hadrons/barions/src/G4AntiNeutron.cc
+++ b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutron.cc,v 1.2.6.1 1999/12/07 20:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiNeutron.cc,v 1.2.6.1.2.2 1999/12/14 07:08:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 //                          H.Kurashige 7 July 1996
 // **********************************************************************
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiNeutron.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
index 46d50918cf..8f5259be1c 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiOmegaMinus.cc,v 1.3.6.1 1999/12/07 20:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiOmegaMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiOmegaMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
index 6ef73d2858..f1ebd15010 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiOmegacZero.cc,v 1.3.6.1 1999/12/07 20:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiOmegacZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiOmegacZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiProton.cc b/source/particles/hadrons/barions/src/G4AntiProton.cc
index e47ba6fcf4..abb57fc9e6 100644
--- a/source/particles/hadrons/barions/src/G4AntiProton.cc
+++ b/source/particles/hadrons/barions/src/G4AntiProton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiProton.cc,v 1.2.6.1 1999/12/07 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiProton.cc,v 1.2.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 // **********************************************************************
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiProton.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
index 277c44d9c3..5f3decabcd 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmaMinus.cc,v 1.3.6.1 1999/12/07 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmaMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmaMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
index d8a698935c..2845660c7b 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmaPlus.cc,v 1.3.6.1 1999/12/07 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmaPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmaPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
index 4ece101eaf..c650cb3b54 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmaZero.cc,v 1.3.6.1 1999/12/07 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmaZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmaZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
index 850723f74d..ab60fef0e8 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmacPlus.cc,v 1.2.6.1 1999/12/07 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmacPlus.cc,v 1.2.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmacPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
index 89cdb17b6b..fff033a13f 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmacPlusPlus.cc,v 1.2.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmacPlusPlus.cc,v 1.2.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmacPlusPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
index db46543e2e..9e80ad9a9e 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiSigmacZero.cc,v 1.2.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiSigmacZero.cc,v 1.2.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiSigmacZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
index 5eb98f0d1c..de55d0667f 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiXiMinus.cc,v 1.3.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiXiMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiXiMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiXiZero.cc b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
index ad989f94bf..690f2b4dc7 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiXiZero.cc,v 1.3.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiXiZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiXiZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
index cc2ad41988..5c5036d62d 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiXicPlus.cc,v 1.3.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiXicPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Modified PDG encoding           H.Kurashige 24 Sep. 98
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiXicPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4AntiXicZero.cc b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
index 7cc06873b0..a8eb38be89 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiXicZero.cc,v 1.3.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiXicZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Modified PDG encoding           H.Kurashige 24 Sep. 98
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiXicZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
index 7480b684da..e563944d68 100644
--- a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
+++ b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BaryonConstructor.cc,v 1.1.6.1 1999/12/07 20:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4Lambda.cc b/source/particles/hadrons/barions/src/G4Lambda.cc
index e97fd06118..53925388c3 100644
--- a/source/particles/hadrons/barions/src/G4Lambda.cc
+++ b/source/particles/hadrons/barions/src/G4Lambda.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Lambda.cc,v 1.3.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Lambda.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Lambda.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4LambdacPlus.cc b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
index f4806871bb..673d84944c 100644
--- a/source/particles/hadrons/barions/src/G4LambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LambdacPlus.cc,v 1.3.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LambdacPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4LambdacPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4Neutron.cc b/source/particles/hadrons/barions/src/G4Neutron.cc
index 9e18c98a6d..aa385f82fa 100644
--- a/source/particles/hadrons/barions/src/G4Neutron.cc
+++ b/source/particles/hadrons/barions/src/G4Neutron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Neutron.cc,v 1.2.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Neutron.cc,v 1.2.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 //                          H.Kurashige 7 July 1996
 // **********************************************************************
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Neutron.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4OmegaMinus.cc b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
index af3f85231f..a2f8171fbe 100644
--- a/source/particles/hadrons/barions/src/G4OmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OmegaMinus.cc,v 1.3.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OmegaMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4OmegaMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4OmegacZero.cc b/source/particles/hadrons/barions/src/G4OmegacZero.cc
index b167dd168e..e8a2892868 100644
--- a/source/particles/hadrons/barions/src/G4OmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4OmegacZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OmegacZero.cc,v 1.3.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OmegacZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4OmegacZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4Proton.cc b/source/particles/hadrons/barions/src/G4Proton.cc
index e533a9ce77..05b475d179 100644
--- a/source/particles/hadrons/barions/src/G4Proton.cc
+++ b/source/particles/hadrons/barions/src/G4Proton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Proton.cc,v 1.2.6.1 1999/12/07 20:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Proton.cc,v 1.2.6.1.2.2 1999/12/14 07:08:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add ProtonDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Proton.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmaMinus.cc b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
index e2372df56c..6c421d1f9a 100644
--- a/source/particles/hadrons/barions/src/G4SigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmaMinus.cc,v 1.3.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmaMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb  1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmaMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmaPlus.cc b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
index 8250ecde7f..bcb61b40fc 100644
--- a/source/particles/hadrons/barions/src/G4SigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmaPlus.cc,v 1.3.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmaPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmaPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmaZero.cc b/source/particles/hadrons/barions/src/G4SigmaZero.cc
index 5f3c7af040..bd509cb917 100644
--- a/source/particles/hadrons/barions/src/G4SigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmaZero.cc,v 1.3.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmaZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 // **********************************************************************
 //  Added particle definitions, H.Kurashige, 14 Feb  1997
 // ----------------------------------------------------------------------
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmaZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
index 9205af77b4..b4c08abd6c 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmacPlus.cc,v 1.2.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmacPlus.cc,v 1.2.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmacPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
index d45b89c838..5e40fc2a29 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmacPlusPlus.cc,v 1.2.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmacPlusPlus.cc,v 1.2.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmacPlusPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4SigmacZero.cc b/source/particles/hadrons/barions/src/G4SigmacZero.cc
index 6c6b2709c9..dbd690e9aa 100644
--- a/source/particles/hadrons/barions/src/G4SigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SigmacZero.cc,v 1.2.6.1 1999/12/07 20:49:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SigmacZero.cc,v 1.2.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4SigmacZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4VBaryon.cc b/source/particles/hadrons/barions/src/G4VBaryon.cc
index 5d41f10c9f..ed2893c62f 100644
--- a/source/particles/hadrons/barions/src/G4VBaryon.cc
+++ b/source/particles/hadrons/barions/src/G4VBaryon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBaryon.cc,v 1.1.6.1 1999/12/07 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XiMinus.cc b/source/particles/hadrons/barions/src/G4XiMinus.cc
index 850bd57bd9..fd200d41e4 100644
--- a/source/particles/hadrons/barions/src/G4XiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4XiMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XiMinus.cc,v 1.3.6.1 1999/12/07 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XiMinus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4XiMinus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4XiZero.cc b/source/particles/hadrons/barions/src/G4XiZero.cc
index 7195bd9619..bc4fb89405 100644
--- a/source/particles/hadrons/barions/src/G4XiZero.cc
+++ b/source/particles/hadrons/barions/src/G4XiZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XiZero.cc,v 1.3.6.1 1999/12/07 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XiZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Added particle definitions, H.Kurashige, 14 Feb 1997
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4XiZero.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4XicPlus.cc b/source/particles/hadrons/barions/src/G4XicPlus.cc
index 9b9b8c85d0..88acca8bff 100644
--- a/source/particles/hadrons/barions/src/G4XicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4XicPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XicPlus.cc,v 1.3.6.1 1999/12/07 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XicPlus.cc,v 1.3.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Modified PDG encoding           H.Kurashige 24 Sep. 98
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4XicPlus.hh"
 
diff --git a/source/particles/hadrons/barions/src/G4XicZero.cc b/source/particles/hadrons/barions/src/G4XicZero.cc
index b3a55b5c8a..57dfcfaa24 100644
--- a/source/particles/hadrons/barions/src/G4XicZero.cc
+++ b/source/particles/hadrons/barions/src/G4XicZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XicZero.cc,v 1.3.6.1 1999/12/07 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XicZero.cc,v 1.3.6.1.2.2 1999/12/14 07:08:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Modified PDG encoding           H.Kurashige 24 Sep. 98
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4XicZero.hh"
 
diff --git a/source/particles/hadrons/ions/include/G4Alpha.hh b/source/particles/hadrons/ions/include/G4Alpha.hh
index 12e63f640f..bdbb22808b 100644
--- a/source/particles/hadrons/ions/include/G4Alpha.hh
+++ b/source/particles/hadrons/ions/include/G4Alpha.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Alpha.hh,v 1.2.8.1 1999/12/07 20:49:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4Deuteron.hh b/source/particles/hadrons/ions/include/G4Deuteron.hh
index f252e93ee6..9e5ccf4794 100644
--- a/source/particles/hadrons/ions/include/G4Deuteron.hh
+++ b/source/particles/hadrons/ions/include/G4Deuteron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Deuteron.hh,v 1.2.8.1 1999/12/07 20:49:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4GenericIon.hh b/source/particles/hadrons/ions/include/G4GenericIon.hh
index 86a1a2f8fb..ee112cf004 100644
--- a/source/particles/hadrons/ions/include/G4GenericIon.hh
+++ b/source/particles/hadrons/ions/include/G4GenericIon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GenericIon.hh,v 1.2.8.1 1999/12/07 20:49:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4He3.hh b/source/particles/hadrons/ions/include/G4He3.hh
index ccbd1a2e1f..e4959944df 100644
--- a/source/particles/hadrons/ions/include/G4He3.hh
+++ b/source/particles/hadrons/ions/include/G4He3.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4He3.hh,v 1.2.8.1 1999/12/07 20:49:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4IonConstructor.hh b/source/particles/hadrons/ions/include/G4IonConstructor.hh
index a247cb49ac..5a1b9490c3 100644
--- a/source/particles/hadrons/ions/include/G4IonConstructor.hh
+++ b/source/particles/hadrons/ions/include/G4IonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonConstructor.hh,v 1.1.10.1 1999/12/07 20:49:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4Triton.hh b/source/particles/hadrons/ions/include/G4Triton.hh
index 0172f0a0ea..8099e10bc1 100644
--- a/source/particles/hadrons/ions/include/G4Triton.hh
+++ b/source/particles/hadrons/ions/include/G4Triton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Triton.hh,v 1.2.8.1 1999/12/07 20:49:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4VIon.hh b/source/particles/hadrons/ions/include/G4VIon.hh
index 4f64badb56..c9eb4ff227 100644
--- a/source/particles/hadrons/ions/include/G4VIon.hh
+++ b/source/particles/hadrons/ions/include/G4VIon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VIon.hh,v 1.1.10.1 1999/12/07 20:49:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Alpha.cc b/source/particles/hadrons/ions/src/G4Alpha.cc
index cd0ef84c8a..52b8f7dde5 100644
--- a/source/particles/hadrons/ions/src/G4Alpha.cc
+++ b/source/particles/hadrons/ions/src/G4Alpha.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Alpha.cc,v 1.2.8.1 1999/12/07 20:49:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Alpha.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Fixed  parameters by H.Kurashige, 25 Apr 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Alpha.hh"
 
diff --git a/source/particles/hadrons/ions/src/G4Deuteron.cc b/source/particles/hadrons/ions/src/G4Deuteron.cc
index f69161e55a..c24bd15aec 100644
--- a/source/particles/hadrons/ions/src/G4Deuteron.cc
+++ b/source/particles/hadrons/ions/src/G4Deuteron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Deuteron.cc,v 1.2.8.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Deuteron.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Fixed parameters H. Kurashige, 25 Apr 1998
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Deuteron.hh"
 
diff --git a/source/particles/hadrons/ions/src/G4GenericIon.cc b/source/particles/hadrons/ions/src/G4GenericIon.cc
index 3e7e016d0f..c11131b7eb 100644
--- a/source/particles/hadrons/ions/src/G4GenericIon.cc
+++ b/source/particles/hadrons/ions/src/G4GenericIon.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GenericIon.cc,v 1.2.8.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GenericIon.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4 Dec. 98 by H.Kurashige
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4GenericIon.hh"
 
diff --git a/source/particles/hadrons/ions/src/G4He3.cc b/source/particles/hadrons/ions/src/G4He3.cc
index b0f3538b36..acf26713d4 100644
--- a/source/particles/hadrons/ions/src/G4He3.cc
+++ b/source/particles/hadrons/ions/src/G4He3.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4He3.cc,v 1.2.8.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4He3.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      24th April 1998, H.Kurashige
 // **********************************************************************
 // ----------------------------------------------------------------------
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4He3.hh"
 
diff --git a/source/particles/hadrons/ions/src/G4IonConstructor.cc b/source/particles/hadrons/ions/src/G4IonConstructor.cc
index 1321bfd76a..c0d516f358 100644
--- a/source/particles/hadrons/ions/src/G4IonConstructor.cc
+++ b/source/particles/hadrons/ions/src/G4IonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonConstructor.cc,v 1.1.10.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Triton.cc b/source/particles/hadrons/ions/src/G4Triton.cc
index 34b6d7e805..da2cac18ac 100644
--- a/source/particles/hadrons/ions/src/G4Triton.cc
+++ b/source/particles/hadrons/ions/src/G4Triton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Triton.cc,v 1.2.8.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Triton.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 //  Add  G4Triton::TritonDefinition()  by H.Kurashige 27 June 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Triton.hh"
 
diff --git a/source/particles/hadrons/ions/src/G4VIon.cc b/source/particles/hadrons/ions/src/G4VIon.cc
index 342b3ecb4f..284c4b2c12 100644
--- a/source/particles/hadrons/ions/src/G4VIon.cc
+++ b/source/particles/hadrons/ions/src/G4VIon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VIon.cc,v 1.1.10.1 1999/12/07 20:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
index 7a658f8ddf..df6166d780 100644
--- a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiBMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
index ab3a3702c5..3e6818fb5c 100644
--- a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiBsMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
index 3912bff0f4..4410f47085 100644
--- a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiDMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
index c80840c15c..d4942f4e35 100644
--- a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiKaonZero.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
index f5143886a5..d7ff7f2051 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonMinus.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
index ca9e7401b1..56b1017532 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonPlus.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BMesonZero.hh b/source/particles/hadrons/mesons/include/G4BMesonZero.hh
index 545f801b1a..9069dc894f 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
index dc9cb89ee1..973e1a1faf 100644
--- a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BsMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
index 9eb181ac0a..79b855ee1e 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonMinus.hh,v 1.2.8.1 1999/12/07 20:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
index 1135f3e300..2b6a98299a 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonPlus.hh,v 1.2.8.1 1999/12/07 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonZero.hh b/source/particles/hadrons/mesons/include/G4DMesonZero.hh
index bf5529d3a9..d3130aa40d 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonZero.hh,v 1.2.8.1 1999/12/07 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
index cb322736a3..3611a0f3f4 100644
--- a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DsMesonMinus.hh,v 1.2.8.1 1999/12/07 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
index 3a021b1ac0..b1223896af 100644
--- a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DsMesonPlus.hh,v 1.2.8.1 1999/12/07 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4Eta.hh b/source/particles/hadrons/mesons/include/G4Eta.hh
index b5e3b8ea7f..5f12aca56d 100644
--- a/source/particles/hadrons/mesons/include/G4Eta.hh
+++ b/source/particles/hadrons/mesons/include/G4Eta.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Eta.hh,v 1.2.8.1 1999/12/07 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4EtaPrime.hh b/source/particles/hadrons/mesons/include/G4EtaPrime.hh
index 6ae6dac297..5d3de19a63 100644
--- a/source/particles/hadrons/mesons/include/G4EtaPrime.hh
+++ b/source/particles/hadrons/mesons/include/G4EtaPrime.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EtaPrime.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4JPsi.hh b/source/particles/hadrons/mesons/include/G4JPsi.hh
index eb054f6576..b192fe8ee7 100644
--- a/source/particles/hadrons/mesons/include/G4JPsi.hh
+++ b/source/particles/hadrons/mesons/include/G4JPsi.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4JPsi.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonMinus.hh b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
index 130ba353cd..39e39b0960 100644
--- a/source/particles/hadrons/mesons/include/G4KaonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinus.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonPlus.hh b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
index 09e6280c59..8bc89de6ac 100644
--- a/source/particles/hadrons/mesons/include/G4KaonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonPlus.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonZero.hh b/source/particles/hadrons/mesons/include/G4KaonZero.hh
index cf437a984b..ed47850406 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZero.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
index a70159169f..a2324852b8 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroLong.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
index a997423010..ae7d6c7d2b 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroShort.hh,v 1.2.8.1 1999/12/07 20:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
index 0d4ccc2567..c25aca73da 100644
--- a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
+++ b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MesonConstructor.hh,v 1.1.10.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4PionMinus.hh b/source/particles/hadrons/mesons/include/G4PionMinus.hh
index 09812f1537..c724107955 100644
--- a/source/particles/hadrons/mesons/include/G4PionMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionMinus.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4PionPlus.hh b/source/particles/hadrons/mesons/include/G4PionPlus.hh
index 27fd49c434..667e6469f8 100644
--- a/source/particles/hadrons/mesons/include/G4PionPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionPlus.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4PionZero.hh b/source/particles/hadrons/mesons/include/G4PionZero.hh
index 460980c4f0..9861457fc4 100644
--- a/source/particles/hadrons/mesons/include/G4PionZero.hh
+++ b/source/particles/hadrons/mesons/include/G4PionZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionZero.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4RhoMinus.hh b/source/particles/hadrons/mesons/include/G4RhoMinus.hh
index b443b4125c..45542b7714 100644
--- a/source/particles/hadrons/mesons/include/G4RhoMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4RhoMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RhoMinus.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4RhoPlus.hh b/source/particles/hadrons/mesons/include/G4RhoPlus.hh
index 5ec1f262bc..9df1a3a8e4 100644
--- a/source/particles/hadrons/mesons/include/G4RhoPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4RhoPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RhoPlus.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4RhoZero.hh b/source/particles/hadrons/mesons/include/G4RhoZero.hh
index 2b14690bd1..c42aa8139e 100644
--- a/source/particles/hadrons/mesons/include/G4RhoZero.hh
+++ b/source/particles/hadrons/mesons/include/G4RhoZero.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RhoZero.hh,v 1.2.8.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4VMeson.hh b/source/particles/hadrons/mesons/include/G4VMeson.hh
index 002a15b533..aa140937e9 100644
--- a/source/particles/hadrons/mesons/include/G4VMeson.hh
+++ b/source/particles/hadrons/mesons/include/G4VMeson.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMeson.hh,v 1.1.10.1 1999/12/07 20:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
index c0b11de813..68c5c150a6 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiBMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiBMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiBMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
index a99234caff..e5d225abe8 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiBsMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiBsMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiBsMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
index c02e773332..3e8d09fdfe 100644
--- a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiDMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiDMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiDMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
index 6ceb93e86c..8ca491db50 100644
--- a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiKaonZero.cc,v 1.1.10.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiKaonZero.cc,v 1.1.10.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiKaonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
index 08b742a332..2144045cec 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BMesonMinus.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BMesonMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4BMesonMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
index fbdacace16..25deb9ba61 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BMesonPlus.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BMesonPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4BMesonPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4BMesonZero.cc b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
index 06836073eb..4165ade3d6 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
 // ----------------------------------------------------------------
 
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4BMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
index 8c1d093bae..65918e0acf 100644
--- a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BsMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BsMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4BsMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
index 38f3661e72..51e5c35549 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DMesonMinus.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DMesonMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DMesonMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
index fb9f7b93cf..8662333ea1 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DMesonPlus.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DMesonPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DMesonPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4DMesonZero.cc b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
index d80662d0d7..03c596ff8c 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DMesonZero.cc,v 1.2.8.1 1999/12/07 20:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DMesonZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DMesonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
index a44483f1a7..130cdadc3e 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DsMesonMinus.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DsMesonMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DsMesonMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
index 2b8f02691f..3886773982 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DsMesonPlus.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DsMesonPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DsMesonPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4Eta.cc b/source/particles/hadrons/mesons/src/G4Eta.cc
index f87ccf88b0..4d36c2fcce 100644
--- a/source/particles/hadrons/mesons/src/G4Eta.cc
+++ b/source/particles/hadrons/mesons/src/G4Eta.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Eta.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Eta.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 // **********************************************************************
 // ------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Eta.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4EtaPrime.cc b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
index 99c7ec6ae7..4e68cd5ab1 100644
--- a/source/particles/hadrons/mesons/src/G4EtaPrime.cc
+++ b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EtaPrime.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EtaPrime.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 // ****************************************************************
 // ----------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4EtaPrime.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4JPsi.cc b/source/particles/hadrons/mesons/src/G4JPsi.cc
index 7ecd220e50..707b814233 100644
--- a/source/particles/hadrons/mesons/src/G4JPsi.cc
+++ b/source/particles/hadrons/mesons/src/G4JPsi.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4JPsi.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4JPsi.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
 // ------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4JPsi.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4KaonMinus.cc b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
index 8f7a7f2879..fdb778ed4c 100644
--- a/source/particles/hadrons/mesons/src/G4KaonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonMinus.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4KaonMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4KaonPlus.cc b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
index 961c0b5240..8c43e6e333 100644
--- a/source/particles/hadrons/mesons/src/G4KaonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonPlus.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4KaonPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4KaonZero.cc b/source/particles/hadrons/mesons/src/G4KaonZero.cc
index cf8321a7de..1a2f03bab9 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonZero.cc,v 1.1.10.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonZero.cc,v 1.1.10.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4KaonZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
index 132fa0f5b0..8a33091610 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonZeroLong.cc,v 1.2.8.1 1999/12/07 20:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonZeroLong.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4KaonZeroLong.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
index 6700606d94..d7ab80a2cb 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonZeroShort.cc,v 1.2.8.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonZeroShort.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //                              H.Kurashige   7 Jul 96
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4KaonZeroShort.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
index 41c0372a2d..1578296298 100644
--- a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
+++ b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MesonConstructor.cc,v 1.1.10.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4PionMinus.cc b/source/particles/hadrons/mesons/src/G4PionMinus.cc
index b95efaa49b..c089963278 100644
--- a/source/particles/hadrons/mesons/src/G4PionMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionMinus.cc,v 1.2.8.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PionMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add PionMinusDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4PionMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4PionPlus.cc b/source/particles/hadrons/mesons/src/G4PionPlus.cc
index 707db3d267..a7e42b5205 100644
--- a/source/particles/hadrons/mesons/src/G4PionPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionPlus.cc,v 1.2.8.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PionPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add PionPlusDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4PionPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4PionZero.cc b/source/particles/hadrons/mesons/src/G4PionZero.cc
index 3b8dfce451..1c13167a13 100644
--- a/source/particles/hadrons/mesons/src/G4PionZero.cc
+++ b/source/particles/hadrons/mesons/src/G4PionZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionZero.cc,v 1.2.8.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PionZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -22,8 +22,8 @@
 //  Add PionZeroDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4PionZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4RhoMinus.cc b/source/particles/hadrons/mesons/src/G4RhoMinus.cc
index 9dd5d54dc3..c877b533cd 100644
--- a/source/particles/hadrons/mesons/src/G4RhoMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4RhoMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RhoMinus.cc,v 1.1.10.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RhoMinus.cc,v 1.1.10.1.2.2 1999/12/14 07:08:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 // ------------------------------------------------------------
 
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4RhoMinus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4RhoPlus.cc b/source/particles/hadrons/mesons/src/G4RhoPlus.cc
index 8f562ad806..cec54681e4 100644
--- a/source/particles/hadrons/mesons/src/G4RhoPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4RhoPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RhoPlus.cc,v 1.2.4.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RhoPlus.cc,v 1.2.4.1.2.2 1999/12/14 07:08:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 // ------------------------------------------------------------
 
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4RhoPlus.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4RhoZero.cc b/source/particles/hadrons/mesons/src/G4RhoZero.cc
index 63e302beb5..c16a29e721 100644
--- a/source/particles/hadrons/mesons/src/G4RhoZero.cc
+++ b/source/particles/hadrons/mesons/src/G4RhoZero.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RhoZero.cc,v 1.2.8.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RhoZero.cc,v 1.2.8.1.2.2 1999/12/14 07:08:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -20,8 +20,8 @@
 // ------------------------------------------------------------
 
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4RhoZero.hh"
 
diff --git a/source/particles/hadrons/mesons/src/G4VMeson.cc b/source/particles/hadrons/mesons/src/G4VMeson.cc
index f084a95194..b27a77dbe0 100644
--- a/source/particles/hadrons/mesons/src/G4VMeson.cc
+++ b/source/particles/hadrons/mesons/src/G4VMeson.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMeson.cc,v 1.1.10.1 1999/12/07 20:49:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoE.hh b/source/particles/leptons/include/G4AntiNeutrinoE.hh
index c54cdabf7d..133c32b512 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoE.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoE.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoE.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoMu.hh b/source/particles/leptons/include/G4AntiNeutrinoMu.hh
index c5b14ec88f..ce2f599cd3 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoMu.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoMu.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoMu.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoTau.hh b/source/particles/leptons/include/G4AntiNeutrinoTau.hh
index 229c5600a5..f1396ab975 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoTau.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoTau.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoTau.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4Electron.hh b/source/particles/leptons/include/G4Electron.hh
index c7b5104a71..a73ea5518d 100644
--- a/source/particles/leptons/include/G4Electron.hh
+++ b/source/particles/leptons/include/G4Electron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Electron.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4LeptonConstructor.hh b/source/particles/leptons/include/G4LeptonConstructor.hh
index 83ce54c730..09e5ffa1f9 100644
--- a/source/particles/leptons/include/G4LeptonConstructor.hh
+++ b/source/particles/leptons/include/G4LeptonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LeptonConstructor.hh,v 1.1.10.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4MuonMinus.hh b/source/particles/leptons/include/G4MuonMinus.hh
index 65f4dfc397..3d6c1625da 100644
--- a/source/particles/leptons/include/G4MuonMinus.hh
+++ b/source/particles/leptons/include/G4MuonMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonMinus.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4MuonPlus.hh b/source/particles/leptons/include/G4MuonPlus.hh
index ab5a1cfa33..11aec8d942 100644
--- a/source/particles/leptons/include/G4MuonPlus.hh
+++ b/source/particles/leptons/include/G4MuonPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonPlus.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4NeutrinoE.hh b/source/particles/leptons/include/G4NeutrinoE.hh
index 650b8818fd..f1d627604b 100644
--- a/source/particles/leptons/include/G4NeutrinoE.hh
+++ b/source/particles/leptons/include/G4NeutrinoE.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoE.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4NeutrinoMu.hh b/source/particles/leptons/include/G4NeutrinoMu.hh
index e801e52158..dc4d660eed 100644
--- a/source/particles/leptons/include/G4NeutrinoMu.hh
+++ b/source/particles/leptons/include/G4NeutrinoMu.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoMu.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4NeutrinoTau.hh b/source/particles/leptons/include/G4NeutrinoTau.hh
index 88f1317cb8..e909e5dbe0 100644
--- a/source/particles/leptons/include/G4NeutrinoTau.hh
+++ b/source/particles/leptons/include/G4NeutrinoTau.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoTau.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4Positron.hh b/source/particles/leptons/include/G4Positron.hh
index e8ebeddb7b..2b9dba5e6a 100644
--- a/source/particles/leptons/include/G4Positron.hh
+++ b/source/particles/leptons/include/G4Positron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Positron.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4TauMinus.hh b/source/particles/leptons/include/G4TauMinus.hh
index ee9d4650da..83085f22f3 100644
--- a/source/particles/leptons/include/G4TauMinus.hh
+++ b/source/particles/leptons/include/G4TauMinus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TauMinus.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4TauPlus.hh b/source/particles/leptons/include/G4TauPlus.hh
index b43ad46345..368b9528cf 100644
--- a/source/particles/leptons/include/G4TauPlus.hh
+++ b/source/particles/leptons/include/G4TauPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TauPlus.hh,v 1.2.8.1 1999/12/07 20:49:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4VLepton.hh b/source/particles/leptons/include/G4VLepton.hh
index 761018e360..606a4c6f51 100644
--- a/source/particles/leptons/include/G4VLepton.hh
+++ b/source/particles/leptons/include/G4VLepton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VLepton.hh,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4AntiNeutrinoE.cc b/source/particles/leptons/src/G4AntiNeutrinoE.cc
index 4319752bcb..3eaeb5c5ae 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoE.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoE.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutrinoE.cc,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiNeutrinoE.cc,v 1.1.10.1.2.2 1999/12/14 07:08:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo        by H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiNeutrinoE.hh"
 
diff --git a/source/particles/leptons/src/G4AntiNeutrinoMu.cc b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
index c662facf0e..f886a08184 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoMu.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutrinoMu.cc,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiNeutrinoMu.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      by             H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiNeutrinoMu.hh"
 
diff --git a/source/particles/leptons/src/G4AntiNeutrinoTau.cc b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
index c94b5a9441..357e5a793d 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoTau.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutrinoTau.cc,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiNeutrinoTau.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      by             H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4AntiNeutrinoTau.hh"
 
diff --git a/source/particles/leptons/src/G4Electron.cc b/source/particles/leptons/src/G4Electron.cc
index f25a9ecfd9..a896666bf0 100644
--- a/source/particles/leptons/src/G4Electron.cc
+++ b/source/particles/leptons/src/G4Electron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Electron.cc,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Electron.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //  Add ElectronDefinition() H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
     
 #include "G4Electron.hh"
 // ######################################################################
diff --git a/source/particles/leptons/src/G4LeptonConstructor.cc b/source/particles/leptons/src/G4LeptonConstructor.cc
index add198826c..931c046f02 100644
--- a/source/particles/leptons/src/G4LeptonConstructor.cc
+++ b/source/particles/leptons/src/G4LeptonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LeptonConstructor.cc,v 1.1.10.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4MuonMinus.cc b/source/particles/leptons/src/G4MuonMinus.cc
index 3234ae4de4..3de0f59c27 100644
--- a/source/particles/leptons/src/G4MuonMinus.cc
+++ b/source/particles/leptons/src/G4MuonMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonMinus.cc,v 1.2.8.1 1999/12/07 20:49:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuonMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -23,8 +23,8 @@
 //  Add MuonMinusDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4MuonMinus.hh"
 
diff --git a/source/particles/leptons/src/G4MuonPlus.cc b/source/particles/leptons/src/G4MuonPlus.cc
index bc31ce73c0..9c654ebe18 100644
--- a/source/particles/leptons/src/G4MuonPlus.cc
+++ b/source/particles/leptons/src/G4MuonPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonPlus.cc,v 1.2.8.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuonPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -23,8 +23,8 @@
 //  Add MuonPlusDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4MuonPlus.hh"
 
diff --git a/source/particles/leptons/src/G4NeutrinoE.cc b/source/particles/leptons/src/G4NeutrinoE.cc
index c7b7e7952d..d8c98b8478 100644
--- a/source/particles/leptons/src/G4NeutrinoE.cc
+++ b/source/particles/leptons/src/G4NeutrinoE.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutrinoE.cc,v 1.1.10.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutrinoE.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      by             H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4NeutrinoE.hh"
 
diff --git a/source/particles/leptons/src/G4NeutrinoMu.cc b/source/particles/leptons/src/G4NeutrinoMu.cc
index a69a1fa1ab..96701daf9b 100644
--- a/source/particles/leptons/src/G4NeutrinoMu.cc
+++ b/source/particles/leptons/src/G4NeutrinoMu.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutrinoMu.cc,v 1.1.10.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutrinoMu.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      by             H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4NeutrinoMu.hh"
 
diff --git a/source/particles/leptons/src/G4NeutrinoTau.cc b/source/particles/leptons/src/G4NeutrinoTau.cc
index 806506b1ee..23ccde0733 100644
--- a/source/particles/leptons/src/G4NeutrinoTau.cc
+++ b/source/particles/leptons/src/G4NeutrinoTau.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutrinoTau.cc,v 1.1.10.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutrinoTau.cc,v 1.1.10.1.2.2 1999/12/14 07:08:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      by             H.Kurashige,7  July 1996
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4NeutrinoTau.hh"
 
diff --git a/source/particles/leptons/src/G4Positron.cc b/source/particles/leptons/src/G4Positron.cc
index c715944015..b64be88882 100644
--- a/source/particles/leptons/src/G4Positron.cc
+++ b/source/particles/leptons/src/G4Positron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Positron.cc,v 1.1.10.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Positron.cc,v 1.1.10.1.2.2 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -23,8 +23,8 @@
 //  Add PositronDefinition(), H.Kurashige 4 July 1996
 // ----------------------------------------------------------------------
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Positron.hh"
     
diff --git a/source/particles/leptons/src/G4TauMinus.cc b/source/particles/leptons/src/G4TauMinus.cc
index dd4aa5dce1..89092833cc 100644
--- a/source/particles/leptons/src/G4TauMinus.cc
+++ b/source/particles/leptons/src/G4TauMinus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TauMinus.cc,v 1.2.8.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TauMinus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      7 July 1996                   H.Kurashige 
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4TauMinus.hh"
 
diff --git a/source/particles/leptons/src/G4TauPlus.cc b/source/particles/leptons/src/G4TauPlus.cc
index 5bdd4153c8..b05e107943 100644
--- a/source/particles/leptons/src/G4TauPlus.cc
+++ b/source/particles/leptons/src/G4TauPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TauPlus.cc,v 1.2.8.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TauPlus.cc,v 1.2.8.1.2.2 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -19,8 +19,8 @@
 //      7 July 1996                   H.Kurashige 
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4TauPlus.hh"
 
diff --git a/source/particles/leptons/src/G4VLepton.cc b/source/particles/leptons/src/G4VLepton.cc
index 20c5060ff8..4bbfc1dd4e 100644
--- a/source/particles/leptons/src/G4VLepton.cc
+++ b/source/particles/leptons/src/G4VLepton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VLepton.cc,v 1.1.10.1 1999/12/07 20:49:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/management/include/G4DalitzDecayChannel.hh b/source/particles/management/include/G4DalitzDecayChannel.hh
index 35157fb9fe..7bdd08ed60 100644
--- a/source/particles/management/include/G4DalitzDecayChannel.hh
+++ b/source/particles/management/include/G4DalitzDecayChannel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DalitzDecayChannel.hh,v 1.2.4.1 1999/12/07 20:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayProducts.hh b/source/particles/management/include/G4DecayProducts.hh
index 89a0032873..3354539ec2 100644
--- a/source/particles/management/include/G4DecayProducts.hh
+++ b/source/particles/management/include/G4DecayProducts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayProducts.hh,v 1.4.4.1 1999/12/07 20:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayTable.hh b/source/particles/management/include/G4DecayTable.hh
index 01d40745f3..ad96efc193 100644
--- a/source/particles/management/include/G4DecayTable.hh
+++ b/source/particles/management/include/G4DecayTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayTable.hh,v 1.3.2.1 1999/12/07 20:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayTableMessenger.hh b/source/particles/management/include/G4DecayTableMessenger.hh
index f49c94369b..76804cd902 100644
--- a/source/particles/management/include/G4DecayTableMessenger.hh
+++ b/source/particles/management/include/G4DecayTableMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayTableMessenger.hh,v 1.3.4.1 1999/12/07 20:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticle.hh b/source/particles/management/include/G4DynamicParticle.hh
index ce60f106ab..ab7100ae42 100644
--- a/source/particles/management/include/G4DynamicParticle.hh
+++ b/source/particles/management/include/G4DynamicParticle.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DynamicParticle.hh,v 1.5.4.1 1999/12/07 20:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticle.icc b/source/particles/management/include/G4DynamicParticle.icc
index ac5118bdd2..7b60cef950 100644
--- a/source/particles/management/include/G4DynamicParticle.icc
+++ b/source/particles/management/include/G4DynamicParticle.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DynamicParticle.icc,v 1.2.4.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticleFastVector.hh b/source/particles/management/include/G4DynamicParticleFastVector.hh
index 9d2a8e634e..ed38500098 100644
--- a/source/particles/management/include/G4DynamicParticleFastVector.hh
+++ b/source/particles/management/include/G4DynamicParticleFastVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DynamicParticleFastVector.hh,v 1.1.10.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ElectronOccupancy.hh b/source/particles/management/include/G4ElectronOccupancy.hh
index d73083370e..e3cd38718f 100644
--- a/source/particles/management/include/G4ElectronOccupancy.hh
+++ b/source/particles/management/include/G4ElectronOccupancy.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ElectronOccupancy.hh,v 1.3.4.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4IonTable.hh b/source/particles/management/include/G4IonTable.hh
index 363b119190..b412a60ece 100644
--- a/source/particles/management/include/G4IonTable.hh
+++ b/source/particles/management/include/G4IonTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonTable.hh,v 1.13.2.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4Ions.hh b/source/particles/management/include/G4Ions.hh
index bf7927bbb8..65825d0204 100644
--- a/source/particles/management/include/G4Ions.hh
+++ b/source/particles/management/include/G4Ions.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ions.hh,v 1.5.4.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4IsotopeProperty.hh b/source/particles/management/include/G4IsotopeProperty.hh
index 1f9cb1926a..c71ecae45d 100644
--- a/source/particles/management/include/G4IsotopeProperty.hh
+++ b/source/particles/management/include/G4IsotopeProperty.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IsotopeProperty.hh,v 1.2 1999/10/28 23:24:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4KL3DecayChannel.hh b/source/particles/management/include/G4KL3DecayChannel.hh
index 63f771c042..7d1aedd81b 100644
--- a/source/particles/management/include/G4KL3DecayChannel.hh
+++ b/source/particles/management/include/G4KL3DecayChannel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KL3DecayChannel.hh,v 1.2.4.1 1999/12/07 20:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4MuonDecayChannel.hh b/source/particles/management/include/G4MuonDecayChannel.hh
index 3342610ef4..b10ad80c8f 100644
--- a/source/particles/management/include/G4MuonDecayChannel.hh
+++ b/source/particles/management/include/G4MuonDecayChannel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonDecayChannel.hh,v 1.2.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4NucleiProperties.hh b/source/particles/management/include/G4NucleiProperties.hh
index 7fc6e990eb..be49b645ac 100644
--- a/source/particles/management/include/G4NucleiProperties.hh
+++ b/source/particles/management/include/G4NucleiProperties.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NucleiProperties.hh,v 1.8.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NucleiProperties.hh,v 1.8.4.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -75,7 +75,7 @@ inline
 {
   if (A < 1 || Z < 0 || Z > A) {
     G4cout << "G4NucleiProperties::GetMassExccess: Wrong values for A = " << A 
-	   << " and Z = " << Z << endl;
+	   << " and Z = " << Z << G4endl;
     return 0.0;
 
   } else {
@@ -96,7 +96,7 @@ inline
 {
   if (Z < 0 || Z > A) {
     G4cout << "G4NucleiProperties::GetAtomicMass: Wrong values for A = " << A 
-	   << " and Z = " << Z << endl;	return 0.0;
+	   << " and Z = " << Z << G4endl;	return 0.0;
 
   } else if (abs(A - G4int(A)) > 1.e-10) {
     return AtomicMass(A,Z);
@@ -117,7 +117,7 @@ inline
 {
   if (A < 1 || Z < 0 || Z > A) {
     G4cout << "G4NucleiProperties::GetMassExccess: Wrong values for A = " << A 
-	   << " and Z = " << Z << endl;
+	   << " and Z = " << Z << G4endl;
     return 0.0;
 
   } else {
diff --git a/source/particles/management/include/G4NucleiPropertiesTable.hh b/source/particles/management/include/G4NucleiPropertiesTable.hh
index 52763f3f62..1bce47adec 100644
--- a/source/particles/management/include/G4NucleiPropertiesTable.hh
+++ b/source/particles/management/include/G4NucleiPropertiesTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NucleiPropertiesTable.hh,v 1.7.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
diff --git a/source/particles/management/include/G4PDGCodeChecker.hh b/source/particles/management/include/G4PDGCodeChecker.hh
index 7a5699ead5..cd76adc743 100644
--- a/source/particles/management/include/G4PDGCodeChecker.hh
+++ b/source/particles/management/include/G4PDGCodeChecker.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PDGCodeChecker.hh,v 1.4.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleDefinition.hh b/source/particles/management/include/G4ParticleDefinition.hh
index e93589a5fc..9969081d53 100644
--- a/source/particles/management/include/G4ParticleDefinition.hh
+++ b/source/particles/management/include/G4ParticleDefinition.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleDefinition.hh,v 1.5.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleDefinition.hh,v 1.5.4.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -353,7 +353,7 @@ G4int G4ParticleDefinition::GetQuarkContent(G4int flavor) const
   }else {
     if (verboseLevel >0) {
       G4cout << "Invalid Quark Flavor for G4ParticleDefinition::GetQuarkContent";
-      G4cout << ": flavor=" << flavor <<endl;
+      G4cout << ": flavor=" << flavor <<G4endl;
     }
     return 0;
   }  
@@ -367,7 +367,7 @@ G4int G4ParticleDefinition::GetAntiQuarkContent(G4int flavor) const
   }else {
     if (verboseLevel >0) {
       G4cout <<"Invalid Quark Flavor for G4ParticleDefinition::GetAntiQuarkContent";
-      G4cout << ": flavor=" << flavor <<endl;
+      G4cout << ": flavor=" << flavor <<G4endl;
     }
     return 0;
   }  
diff --git a/source/particles/management/include/G4ParticleMessenger.hh b/source/particles/management/include/G4ParticleMessenger.hh
index 2bddab2704..d95f0b4e24 100644
--- a/source/particles/management/include/G4ParticleMessenger.hh
+++ b/source/particles/management/include/G4ParticleMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleMessenger.hh,v 1.3.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleMomentum.hh b/source/particles/management/include/G4ParticleMomentum.hh
index 8fb47a1395..d6259ae0ca 100644
--- a/source/particles/management/include/G4ParticleMomentum.hh
+++ b/source/particles/management/include/G4ParticleMomentum.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleMomentum.hh,v 1.3.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticlePropertyMessenger.hh b/source/particles/management/include/G4ParticlePropertyMessenger.hh
index ecb003e7e9..969fb7bff4 100644
--- a/source/particles/management/include/G4ParticlePropertyMessenger.hh
+++ b/source/particles/management/include/G4ParticlePropertyMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticlePropertyMessenger.hh,v 1.3.4.1 1999/12/07 20:49:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.hh b/source/particles/management/include/G4ParticleTable.hh
index 9343f1fa84..6654b174e3 100644
--- a/source/particles/management/include/G4ParticleTable.hh
+++ b/source/particles/management/include/G4ParticleTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleTable.hh,v 1.12.2.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.icc b/source/particles/management/include/G4ParticleTable.icc
index 9a22b6b7f7..3014651801 100644
--- a/source/particles/management/include/G4ParticleTable.icc
+++ b/source/particles/management/include/G4ParticleTable.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleTable.icc,v 1.5.4.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTableIterator.hh b/source/particles/management/include/G4ParticleTableIterator.hh
index 3c2cb6478d..ac8ac78140 100644
--- a/source/particles/management/include/G4ParticleTableIterator.hh
+++ b/source/particles/management/include/G4ParticleTableIterator.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleTableIterator.hh,v 1.2.4.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleTableIterator.hh,v 1.2.4.1.2.1 1999/12/09 10:28:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -26,7 +26,7 @@
 template < class K, class V > class G4ParticleTableIterator
 {
  public:
-  typedef  G4std::map<K, V, less<K> > Map;
+  typedef  G4std::map<K, V, G4std::less<K> > Map;
   G4ParticleTableIterator( Map &adict):
     mydict(&adict),it(adict.begin()),defined(false){}
 
diff --git a/source/particles/management/include/G4ParticleWithCuts.hh b/source/particles/management/include/G4ParticleWithCuts.hh
index 6bf313996b..be8a31b7b8 100644
--- a/source/particles/management/include/G4ParticleWithCuts.hh
+++ b/source/particles/management/include/G4ParticleWithCuts.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleWithCuts.hh,v 1.4.4.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleWithCuts.hh,v 1.4.4.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -191,7 +191,7 @@ inline void G4ParticleWithCuts::ReCalcCuts()
   } else {
     if (GetVerboseLevel()>0) {
       G4cout << "G4ParticleWithCuts::ReCalcCuts() :";
-      G4cout << "theCutInMaxInteractionLength is not defined " << endl; 
+      G4cout << "theCutInMaxInteractionLength is not defined " << G4endl; 
     }
   }
 }
diff --git a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
index dcb0e12d63..73a8248fd3 100644
--- a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
+++ b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhaseSpaceDecayChannel.hh,v 1.2.4.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ShortLivedTable.hh b/source/particles/management/include/G4ShortLivedTable.hh
index 2cfb9c1d44..9b27f15eaf 100644
--- a/source/particles/management/include/G4ShortLivedTable.hh
+++ b/source/particles/management/include/G4ShortLivedTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShortLivedTable.hh,v 1.7.2.1 1999/12/07 20:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4VDecayChannel.hh b/source/particles/management/include/G4VDecayChannel.hh
index 9fa65b9f8e..20a634bfec 100644
--- a/source/particles/management/include/G4VDecayChannel.hh
+++ b/source/particles/management/include/G4VDecayChannel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDecayChannel.hh,v 1.5.4.1 1999/12/07 20:49:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VDecayChannel.hh,v 1.5.4.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
@@ -166,7 +166,7 @@ inline
     return daughters[anIndex];
   } else {
     if (verboseLevel>0)
-      G4cout << "G4VDecayChannel::GetDaughter  index out of range "<<anIndex<<endl;
+      G4cout << "G4VDecayChannel::GetDaughter  index out of range "<<anIndex<<G4endl;
     return 0;
   }
 }
@@ -179,7 +179,7 @@ inline
   } else {
     if (verboseLevel>0){
       G4cout << "G4VDecayChannel::GetDaughterName ";
-      G4cout << "index out of range " << anIndex << endl;
+      G4cout << "index out of range " << anIndex << G4endl;
     }
     return noName;
   }
@@ -193,7 +193,7 @@ inline
   } else {
     if (verboseLevel>0){
       G4cout << "G4VDecayChannel::GetDaughterMass ";
-      G4cout << "index out of range " << anIndex << endl;
+      G4cout << "index out of range " << anIndex << G4endl;
     }
     return 0.0;
   }
diff --git a/source/particles/management/include/G4VIsotopeTable.hh b/source/particles/management/include/G4VIsotopeTable.hh
index 763bbd91b8..c867a5d200 100644
--- a/source/particles/management/include/G4VIsotopeTable.hh
+++ b/source/particles/management/include/G4VIsotopeTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VIsotopeTable.hh,v 1.2 1999/10/28 23:24:14 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DalitzDecayChannel.cc b/source/particles/management/src/G4DalitzDecayChannel.cc
index deae6bd67d..9ad11e2bd3 100644
--- a/source/particles/management/src/G4DalitzDecayChannel.cc
+++ b/source/particles/management/src/G4DalitzDecayChannel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DalitzDecayChannel.cc,v 1.3.8.1 1999/12/07 20:49:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DalitzDecayChannel.cc,v 1.3.8.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -37,7 +37,7 @@ G4DalitzDecayChannel::G4DalitzDecayChannel(
   //#ifdef G4VERBOSE
   //if (GetVerboseLevel()>1) {
   //  G4cout << "G4DalitzDecayChannel:: constructor ";
-  //  G4cout << "addr[" << this << "]" << endl;
+  //  G4cout << "addr[" << this << "]" << G4endl;
   //}
   //#endif
   // set names for daughter particles
@@ -144,7 +144,7 @@ G4DecayProducts *G4DalitzDecayChannel::DecayIt(G4double)
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
      G4cout << "G4DalitzDecayChannel::DecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
   }
 #endif
diff --git a/source/particles/management/src/G4DecayProducts.cc b/source/particles/management/src/G4DecayProducts.cc
index bd819dd743..986e97aed4 100644
--- a/source/particles/management/src/G4DecayProducts.cc
+++ b/source/particles/management/src/G4DecayProducts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DecayProducts.cc,v 1.4.8.1 1999/12/07 20:49:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DecayProducts.cc,v 1.4.8.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -113,7 +113,7 @@ G4int G4DecayProducts::PushProducts(G4DynamicParticle *aParticle)
 #ifdef G4VERBOSE
      G4cout << "G4DecayProducts::PushProducts ";
      G4cout << " exceeds MaxNumberOfProducts(=" <<MaxNumberOfProducts << ")";
-     G4cout << endl;
+     G4cout << G4endl;
 #endif
    }
    return numberOfProducts;
@@ -212,7 +212,7 @@ G4bool G4DecayProducts::IsChecked()
   if ( (parent_momentum.mag() >0.0) && (abs(direction.mag()-1.0) >1.0e-6 ) ) {
 #ifdef G4VERBOSE
     G4cout << " Momentum Direction Vector of Parent is not normalized ";
-    G4cout << "  (=" << direction.mag() << ")" << endl;
+    G4cout << "  (=" << direction.mag() << ")" << G4endl;
 #endif
     returnValue = false;
     parent_momentum = parent_momentum * (1./direction.mag());
@@ -233,7 +233,7 @@ G4bool G4DecayProducts::IsChecked()
     if ( (momentum.mag()>0.0) && (abs(direction.mag()-1.0) > 1.0e-6)) {
 #ifdef G4VERBOSE
       G4cout << " Momentum Direction Vector of Daughter [" << index;
-      G4cout << "]  is not normalized (=" << direction.mag() << ")" << endl;
+      G4cout << "]  is not normalized (=" << direction.mag() << ")" << G4endl;
 #endif
       returnValue = false;
       momentum = momentum * (1./direction.mag());
@@ -241,7 +241,7 @@ G4bool G4DecayProducts::IsChecked()
     // whether daughter stops or not
     if (energy - mass < DBL_MIN ) {
 #ifdef G4VERBOSE
-      G4cout << "Daughter [" << index << "] has no kinetic energy "<< endl;
+      G4cout << "Daughter [" << index << "] has no kinetic energy "<< G4endl;
 #endif
       returnValue = false;
     }
@@ -252,7 +252,7 @@ G4bool G4DecayProducts::IsChecked()
   if ( (abs(total_energy) >1.0e-6) || (total_momentum.mag() >1.0e-6 ) ){ 
 #ifdef G4VERBOSE
     G4cout << " Energy/Momentum is not conserved   ";
-    G4cout << total_energy << "  " << total_momentum << endl;
+    G4cout << total_energy << "  " << total_momentum << G4endl;
 #endif
     returnValue = false;
   }
@@ -261,15 +261,15 @@ G4bool G4DecayProducts::IsChecked()
 
 void G4DecayProducts::DumpInfo()
 {
-   G4cout << " ----- List of DecayProducts  -----" << endl;
-   G4cout << " ------ Parent Particle ----------" << endl;
+   G4cout << " ----- List of DecayProducts  -----" << G4endl;
+   G4cout << " ------ Parent Particle ----------" << G4endl;
    if (theParentParticle != 0) theParentParticle->DumpInfo();
-   G4cout << " ------ Daughter Particles  ------" << endl;  
+   G4cout << " ------ Daughter Particles  ------" << G4endl;  
    for (G4int index=0; index < numberOfProducts; index++) 
    {
-      G4cout << " ----------" << index+1 << " -------------" << endl;  
+      G4cout << " ----------" << index+1 << " -------------" << G4endl;  
       theProductVector[index]-> DumpInfo();
    }
-   G4cout << " ----- End List of DecayProducts  -----" << endl;
-   G4cout << endl;
+   G4cout << " ----- End List of DecayProducts  -----" << G4endl;
+   G4cout << G4endl;
 } 
diff --git a/source/particles/management/src/G4DecayTable.cc b/source/particles/management/src/G4DecayTable.cc
index 260e6b4d58..d5701c230f 100644
--- a/source/particles/management/src/G4DecayTable.cc
+++ b/source/particles/management/src/G4DecayTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DecayTable.cc,v 1.4.8.1 1999/12/07 20:49:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DecayTable.cc,v 1.4.8.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -40,7 +40,7 @@ void G4DecayTable::Insert( G4VDecayChannel * aChannel){
 #ifdef G4VERBOSE
     G4cout << " G4DecayTable::Insert :: bad   G4VDecayChannel (mismatch parent) ";
     G4cout << "       " << parent->GetParticleName();
-    G4cout << " input:" << aChannel->GetParent()->GetParticleName() << endl;
+    G4cout << " input:" << aChannel->GetParent()->GetParticleName() << G4endl;
 #endif
   } else {
     channels->insert(aChannel);
@@ -74,14 +74,14 @@ G4VDecayChannel *G4DecayTable::SelectADecayChannel()
 
 void G4DecayTable::DumpInfo() const
 {
-  G4cout << "G4DecayTable:  " << parent->GetParticleName() << endl;
+  G4cout << "G4DecayTable:  " << parent->GetParticleName() << G4endl;
   G4int numberofchannels = channels->entries();
   for (G4int index= numberofchannels -1; index >=0 ; index -=1)
   {
     G4cout << index << ": ";
     ((*channels)(index))->DumpInfo();
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 
diff --git a/source/particles/management/src/G4DecayTableMessenger.cc b/source/particles/management/src/G4DecayTableMessenger.cc
index 89c3055b5c..0e7641bc20 100644
--- a/source/particles/management/src/G4DecayTableMessenger.cc
+++ b/source/particles/management/src/G4DecayTableMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DecayTableMessenger.cc,v 1.2.8.1 1999/12/07 20:49:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DecayTableMessenger.cc,v 1.2.8.1.2.3 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -35,7 +35,7 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ios.hh"                 // Include from 'system'
-#include <iomanip.h>                  // Include from 'system'
+#include "g4std/iomanip"                  // Include from 'system'
 
 G4DecayTableMessenger::G4DecayTableMessenger(G4ParticleTable* pTable)
                      :theParticleTable(pTable)
@@ -79,11 +79,11 @@ G4DecayTableMessenger::~G4DecayTableMessenger()
 void G4DecayTableMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
 {
   if (SetCurrentParticle()==0) {
-    G4cout << "Particle is not selected yet !! Command ignored." << endl;
+    G4cout << "Particle is not selected yet !! Command ignored." << G4endl;
     return;
   }
   if (currentDecayTable==0) {
-    G4cout << "The particle has no decay table !! Command ignored." << endl;
+    G4cout << "The particle has no decay table !! Command ignored." << G4endl;
     return;
   }
 
@@ -96,21 +96,21 @@ void G4DecayTableMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
     G4int index = selectCmd->GetNewIntValue(newValue) ;
     currentChannel = currentDecayTable->GetDecayChannel(index);
     if ( currentChannel == 0 ) {
-      G4cout << "Invalid index. Command ignored." << endl;
+      G4cout << "Invalid index. Command ignored." << G4endl;
     } else {
       idxCurrentChannel = index;
     }
 
   } else {
     if ( currentChannel == 0 ) {
-      G4cout << "Select a decay channel. Command ignored." << endl;
+      G4cout << "Select a decay channel. Command ignored." << G4endl;
       return;
     }
     if (command == brCmd) {
       //Commnad   /particle/property/decay/br
       G4double  br = brCmd->GetNewDoubleValue(newValue);
       if( (br<0.0) || (br>1.0) ) { 
-	G4cout << "Invalid brancing ratio. Command ignored." << endl;
+	G4cout << "Invalid brancing ratio. Command ignored." << G4endl;
       } else {
 	currentChannel->SetBR(br);
       }
diff --git a/source/particles/management/src/G4DynamicParticle.cc b/source/particles/management/src/G4DynamicParticle.cc
index 5b16027cfb..39fd2743fd 100644
--- a/source/particles/management/src/G4DynamicParticle.cc
+++ b/source/particles/management/src/G4DynamicParticle.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DynamicParticle.cc,v 1.5.6.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DynamicParticle.cc,v 1.5.6.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -329,21 +329,21 @@ void G4DynamicParticle::Set4Momentum(const G4LorentzVector &momentum )
 void G4DynamicParticle::DumpInfo(G4int mode) const
 {
   if (theParticleDefinition == 0) {
-    G4cout << " G4DynamicParticle::DumpInfo():: !!!Particle type not defined !!!! " << endl; 
+    G4cout << " G4DynamicParticle::DumpInfo():: !!!Particle type not defined !!!! " << G4endl; 
   } else {
-    G4cout << " Particle type - " << theParticleDefinition->GetParticleName() << endl
-         << "   mass:        " << GetMass()/GeV <<  "[GeV]" <<endl
-         << "   charge:      " << GetCharge()/eplus <<  "[e]" <<endl
+    G4cout << " Particle type - " << theParticleDefinition->GetParticleName() << G4endl
+         << "   mass:        " << GetMass()/GeV <<  "[GeV]" <<G4endl
+         << "   charge:      " << GetCharge()/eplus <<  "[e]" <<G4endl
          << "   Direction x: " << GetMomentumDirection().x() << ", y: "
 	 << GetMomentumDirection().y() << ", z: "
-                             << GetMomentumDirection().z() << endl
-         << "   Total Momentum = " << GetTotalMomentum() /GeV << "[GeV]" << endl
+                             << GetMomentumDirection().z() << G4endl
+         << "   Total Momentum = " << GetTotalMomentum() /GeV << "[GeV]" << G4endl
          << "   Momentum: "    << GetMomentum().x() /GeV << "[GeV]" << ", y: "
                                << GetMomentum().y() /GeV << "[GeV]" << ", z: "
-                               << GetMomentum().z() /GeV << "[GeV]" << endl
-         << "   Total Energy   = " << GetTotalEnergy()/GeV << "[GeV]"  << endl
-         << "   Kinetic Energy = " << GetKineticEnergy() /GeV << "[GeV]" << endl
-         << "   ProperTime     = " << GetProperTime() /ns <<  "[ns]" << endl;
+                               << GetMomentum().z() /GeV << "[GeV]" << G4endl
+         << "   Total Energy   = " << GetTotalEnergy()/GeV << "[GeV]"  << G4endl
+         << "   Kinetic Energy = " << GetKineticEnergy() /GeV << "[GeV]" << G4endl
+         << "   ProperTime     = " << GetProperTime() /ns <<  "[ns]" << G4endl;
     if (mode>0) {
       if( theElectronOccupancy != 0) {
 	theElectronOccupancy->DumpInfo();
diff --git a/source/particles/management/src/G4ElectronOccupancy.cc b/source/particles/management/src/G4ElectronOccupancy.cc
index 532620fe28..633ed050bb 100644
--- a/source/particles/management/src/G4ElectronOccupancy.cc
+++ b/source/particles/management/src/G4ElectronOccupancy.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ElectronOccupancy.cc,v 1.4.6.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ElectronOccupancy.cc,v 1.4.6.1.2.1 1999/12/08 17:34:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -111,10 +111,10 @@ G4int G4ElectronOccupancy::operator!=(const G4ElectronOccupancy& right) const
 
 void G4ElectronOccupancy::DumpInfo() const
 {
-  G4cout << "  -- Electron Occupancy -- " << endl;
+  G4cout << "  -- Electron Occupancy -- " << G4endl;
   G4int index;
   for (index = 0; index < theSizeOfOrbit; index++) {
     G4cout << "   " << index << "-th orbit       " 
-           <<  theOccupancies[index] << endl;
+           <<  theOccupancies[index] << G4endl;
   }
 }
diff --git a/source/particles/management/src/G4IonTable.cc b/source/particles/management/src/G4IonTable.cc
index b30826a840..d0376449ef 100644
--- a/source/particles/management/src/G4IonTable.cc
+++ b/source/particles/management/src/G4IonTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonTable.cc,v 1.22 1999/12/06 09:28:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IonTable.cc,v 1.22.4.6 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -37,14 +37,10 @@
 #include "G4VIsotopeTable.hh"
 
 #include "G4ios.hh"
-#include <iostream.h>               
-#include <iomanip.h>               
+#include "g4std/iostream"               
+#include "g4std/iomanip"               
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 ////////////////////
@@ -81,7 +77,7 @@ G4IonTable::~G4IonTable()
       G4String name;
       if (GetVerboseLevel()>1) {
         G4cout << "G4IonTable:~IonTable() : delete ion of  " ;
-        G4cout << particle->GetParticleName() << endl;
+        G4cout << particle->GetParticleName() << G4endl;
       }
 #endif
       delete particle;
@@ -109,8 +105,8 @@ G4ParticleDefinition* G4IonTable::CreateIon(G4int Z, G4int A, G4double E, G4int
   if ( name(0) == '?') {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "G4IonTable::GetIon() : can not create ions " << endl;
-      G4cout << " Z =" << Z << "  A = " << A <<  endl;
+      G4cout << "G4IonTable::GetIon() : can not create ions " << G4endl;
+      G4cout << " Z =" << Z << "  A = " << A <<  G4endl;
     }
 #endif
       return 0;
@@ -141,7 +137,7 @@ G4ParticleDefinition* G4IonTable::CreateIon(G4int Z, G4int A, G4double E, G4int
 
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
-    G4cout << "G4IonTable::GetIon() : create ion of " << name << endl;
+    G4cout << "G4IonTable::GetIon() : create ion of " << name << G4endl;
   } 
 #endif
   
@@ -175,8 +171,8 @@ G4ParticleDefinition* G4IonTable::GetIon(G4int Z, G4int A, G4double E, G4int J)
   if ( (A<1) || (Z>numberOfElements) || (Z<=0) || (J<0) || (E<0.0) ) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "G4IonTable::GetIon() : illegal atomic number/mass" << endl;
-      G4cout << " Z =" << Z << "  A = " << A <<  "  E = " << E/keV << endl;
+      G4cout << "G4IonTable::GetIon() : illegal atomic number/mass" << G4endl;
+      G4cout << " Z =" << Z << "  A = " << A <<  "  E = " << E/keV << G4endl;
     }
 #endif
     G4Exception("G4IonTable::GetIon : illegal atomic number/mass ");
@@ -201,8 +197,8 @@ G4ParticleDefinition* G4IonTable::FindIon(G4int Z, G4int A, G4double E, G4int J)
   if ( (A<1) || (Z>numberOfElements) || (Z<=0) || (J<0) || (E<0.0)) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "G4IonTable::FindIon() : illegal atomic number/mass or excitation level " << endl;
-      G4cout << " Z =" << Z << "  A = " << A <<  "  E = " << E/keV << endl;
+      G4cout << "G4IonTable::FindIon() : illegal atomic number/mass or excitation level " << G4endl;
+      G4cout << " Z =" << Z << "  A = " << A <<  "  E = " << E/keV << G4endl;
     }
 #endif
     return 0;
@@ -266,9 +262,9 @@ G4String G4IonTable::GetIonName(G4int Z, G4int A, G4double E) const
     return "?";
   }
   char val[50];
-  ostrstream os(val,50);
-  os.setf(ios::fixed);
-  os << A << '[' << setprecision(1) << E/keV << ']' << '\0';
+  G4std::ostrstream os(val,50);
+  os.setf(G4std::ios::fixed);
+  os << A << '[' << G4std::setprecision(1) << E/keV << ']' << '\0';
   name += val;
   return name;
 }
@@ -340,8 +336,8 @@ G4double  G4IonTable::GetNucleusMass(G4int Z, G4int A) const
   if ( (A<1) || (Z>numberOfElements) || (Z<0)) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "G4IonTable::GetNucleusMass() : illegal atomic number/mass " << endl;
-      G4cout << " Z =" << Z << "  A = " << A  << endl;
+      G4cout << "G4IonTable::GetNucleusMass() : illegal atomic number/mass " << G4endl;
+      G4cout << " Z =" << Z << "  A = " << A  << G4endl;
     }
 #endif
     G4Exception("G4IonTable::GetNucleusMass() : illegal atomic number/mass ");
@@ -386,7 +382,7 @@ void G4IonTable::Insert(G4ParticleDefinition* particle)
     //#ifdef G4VERBOSE
     //if (GetVerboseLevel()>0) {
     //  G4cout << "G4IonTable::Insert :" << particle->GetParticleName() ;
-    //  G4cout << " is not ions" << endl; 
+    //  G4cout << " is not ions" << G4endl; 
     //}
     //#endif
   }
@@ -411,7 +407,7 @@ void G4IonTable::Remove(G4ParticleDefinition* particle)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
       G4cout << "G4IonTable::Remove :" << particle->GetParticleName() ;
-      G4cout << " is not ions" << endl; 
+      G4cout << " is not ions" << G4endl; 
     }
 #endif
   }
@@ -470,7 +466,7 @@ void  G4IonTable::AddProcessManager(const G4String& name)
 {
   // create command string for addProcManager
   char cmdAdd[60];
-  ostrstream osAdd(cmdAdd,60);
+  G4std::ostrstream osAdd(cmdAdd,60);
   osAdd << "/run/particle/addProcManager "<< name << '\0';
 
   // set /control/verbose 0
@@ -498,7 +494,7 @@ void  G4IonTable::SetCuts(G4ParticleDefinition* ion)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()> 1) {
       G4cout << "G4IonTable::GetIon() : cut value =";
-      G4cout << genericIon->GetLengthCuts()/mm << "[mm]" <<endl;
+      G4cout << genericIon->GetLengthCuts()/mm << "[mm]" <<G4endl;
     } 
 #endif      
 
@@ -507,7 +503,7 @@ void  G4IonTable::SetCuts(G4ParticleDefinition* ion)
     // Build Physics Tables for the ion
     // create command string for buildPhysicsTable
     char cmdBld[60];
-    ostrstream osBld(cmdBld,60);
+    G4std::ostrstream osBld(cmdBld,60);
     osBld << "/run/particle/buildPhysicsTable "<< name << '\0';
  
     // set /control/verbose 0
diff --git a/source/particles/management/src/G4Ions.cc b/source/particles/management/src/G4Ions.cc
index f109fa9a5d..193c1c19d5 100644
--- a/source/particles/management/src/G4Ions.cc
+++ b/source/particles/management/src/G4Ions.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Ions.cc,v 1.3.6.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Ions.cc,v 1.3.6.1.2.2 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Ions.hh"
 
diff --git a/source/particles/management/src/G4IsotopeProperty.cc b/source/particles/management/src/G4IsotopeProperty.cc
index 1d446670bf..cc7a5b2a12 100644
--- a/source/particles/management/src/G4IsotopeProperty.cc
+++ b/source/particles/management/src/G4IsotopeProperty.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IsotopeProperty.cc,v 1.1 1999/10/05 06:45:19 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IsotopeProperty.cc,v 1.1.8.4 1999/12/14 07:08:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,7 +18,7 @@
 //      New design using G4VIsotopeTable          5 Oct. 99 H.Kurashige
 
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 #include "G4IsotopeProperty.hh"
 #include "G4DecayTable.hh"
@@ -85,15 +85,15 @@ G4int G4IsotopeProperty::operator!=(const G4IsotopeProperty &right) const
 
 void G4IsotopeProperty::DumpInfo() const
 {
-  G4cout << "AtomicNumber: " << fAtomicNumber << endl;
-  G4cout << "AtomicMass: " << fAtomicMass << endl;
-  G4cout << "Spin: " << fISpin << "/2" << endl;
-  G4cout << "Excited Energy: " << setprecision(1) << fEnergy/keV << "[keV]" << endl;
-  G4cout << "Life Time: " << fLifeTime/ns << "[ns]" << endl;
+  G4cout << "AtomicNumber: " << fAtomicNumber << G4endl;
+  G4cout << "AtomicMass: " << fAtomicMass << G4endl;
+  G4cout << "Spin: " << fISpin << "/2" << G4endl;
+  G4cout << "Excited Energy: " << G4std::setprecision(1) << fEnergy/keV << "[keV]" << G4endl;
+  G4cout << "Life Time: " << fLifeTime/ns << "[ns]" << G4endl;
   if (fDecayTable != 0) {
     fDecayTable->DumpInfo();
   } else {
-    G4cout << "Decay Table is not defined !" << endl;
+    G4cout << "Decay Table is not defined !" << G4endl;
   }
 }
 
diff --git a/source/particles/management/src/G4KL3DecayChannel.cc b/source/particles/management/src/G4KL3DecayChannel.cc
index 1b8cc2035e..3b0f84a986 100644
--- a/source/particles/management/src/G4KL3DecayChannel.cc
+++ b/source/particles/management/src/G4KL3DecayChannel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KL3DecayChannel.cc,v 1.3.8.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KL3DecayChannel.cc,v 1.3.8.1.2.1 1999/12/08 17:34:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -40,7 +40,7 @@ G4KL3DecayChannel::G4KL3DecayChannel(
   //#ifdef G4VERBOSE
   //if (GetVerboseLevel()>1) {
   //  G4cout << "G4KL3DecayChannel:: constructor ";
-  //  G4cout << "addr[" << this << "]" << endl;
+  //  G4cout << "addr[" << this << "]" << G4endl;
   //}
   //#endif
   // check modes
@@ -68,7 +68,7 @@ G4KL3DecayChannel::G4KL3DecayChannel(
     //#ifdef G4VERBOSE
     //if (GetVerboseLevel()>0) {
     //   G4cout << "G4KL3DecayChannel:: constructor :";
-    //   G4cout << "illegal arguments " << endl;;
+    //   G4cout << "illegal arguments " << G4endl;;
     //   DumpInfo();
     // }
     //#endif
@@ -88,7 +88,7 @@ G4DecayProducts* G4KL3DecayChannel::DecayIt(G4double)
   //              assumes the pure V-A coupling
   //              gives incorrect energy spectrum for Nutrinos
 #ifdef G4VERBOSE
-  if (GetVerboseLevel()>1) G4cout << "G4KL3DecayChannel::DecayIt " << endl;
+  if (GetVerboseLevel()>1) G4cout << "G4KL3DecayChannel::DecayIt " << G4endl;
 #endif
   // fill parent particle and its mass
   if (parent == 0) {
@@ -118,9 +118,9 @@ G4DecayProducts* G4KL3DecayChannel::DecayIt(G4double)
   // output message
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
-    G4cout << *daughters_name[0] << ":" << daughterP[0]/GeV << "[GeV/c]" <<endl;
-    G4cout << *daughters_name[1] << ":" << daughterP[1]/GeV << "[GeV/c]" <<endl;
-    G4cout << *daughters_name[2] << ":" << daughterP[2]/GeV << "[GeV/c]" <<endl;
+    G4cout << *daughters_name[0] << ":" << daughterP[0]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << *daughters_name[1] << ":" << daughterP[1]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << *daughters_name[2] << ":" << daughterP[2]/GeV << "[GeV/c]" <<G4endl;
   }
 #endif
    //create parent G4DynamicParticle at rest
@@ -171,8 +171,8 @@ G4DecayProducts* G4KL3DecayChannel::DecayIt(G4double)
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
      G4cout << "G4KL3DecayChannel::DecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
-     G4cout << "  decay products address=" << products << endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
+     G4cout << "  decay products address=" << products << G4endl;
      products->DumpInfo();
   }
 #endif
@@ -233,11 +233,11 @@ void G4KL3DecayChannel::PhaseSpace(G4double parentM,
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>2) {
      G4cout << "G4KL3DecayChannel::PhaseSpace    ";
-     G4cout << "Kon mass:" << parentM/GeV << "GeV/c/c" << endl;
+     G4cout << "Kon mass:" << parentM/GeV << "GeV/c/c" << G4endl;
      for (index=0; index<3; index++){
        G4cout << index << " : " << M[index]/GeV << "GeV/c/c  ";
        G4cout << " : " << E[index]/GeV << "GeV  ";
-       G4cout << " : " << P[index]/GeV << "GeV/c " << endl;
+       G4cout << " : " << P[index]/GeV << "GeV/c " << G4endl;
      }
   }
 #endif
@@ -291,13 +291,13 @@ G4double G4KL3DecayChannel::DalitzDensity(G4double Epi, G4double El, G4double En
  
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>2) {
-    G4cout << "G4KL3DecayChannel::DalitzDensity  " <<endl;
-    G4cout << " Pi[" << massPi/GeV <<"GeV/c/c] :" << Epi/GeV << "GeV" <<endl;
-    G4cout << " L[" << massL/GeV <<"GeV/c/c] :" << El/GeV << "GeV" <<endl;
-    G4cout << " Nu[" << massNu/GeV <<"GeV/c/c] :" << Enu/GeV << "GeV" <<endl;
-    G4cout << " F :" << F  << " Fmax :" << Fmax << "  Xi :" << Xi << endl;
-    G4cout << " A :" << coeffA << "  B :" << coeffB << "  C :"<< coeffC <<endl; 
-    G4cout << " Rho :" << Rho  << "   RhoMax :" << RhoMax << endl;
+    G4cout << "G4KL3DecayChannel::DalitzDensity  " <<G4endl;
+    G4cout << " Pi[" << massPi/GeV <<"GeV/c/c] :" << Epi/GeV << "GeV" <<G4endl;
+    G4cout << " L[" << massL/GeV <<"GeV/c/c] :" << El/GeV << "GeV" <<G4endl;
+    G4cout << " Nu[" << massNu/GeV <<"GeV/c/c] :" << Enu/GeV << "GeV" <<G4endl;
+    G4cout << " F :" << F  << " Fmax :" << Fmax << "  Xi :" << Xi << G4endl;
+    G4cout << " A :" << coeffA << "  B :" << coeffB << "  C :"<< coeffC <<G4endl; 
+    G4cout << " Rho :" << Rho  << "   RhoMax :" << RhoMax << G4endl;
   }
 #endif
   return (Rho/RhoMax);
diff --git a/source/particles/management/src/G4MuonDecayChannel.cc b/source/particles/management/src/G4MuonDecayChannel.cc
index 6fb7952a99..26e2d5936e 100644
--- a/source/particles/management/src/G4MuonDecayChannel.cc
+++ b/source/particles/management/src/G4MuonDecayChannel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonDecayChannel.cc,v 1.4.8.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuonDecayChannel.cc,v 1.4.8.1.2.1 1999/12/08 17:34:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -35,7 +35,7 @@ G4MuonDecayChannel::G4MuonDecayChannel(const G4String& theParentName,
   //#ifdef G4VERBOSE
   //if (GetVerboseLevel()>1) {
   //  G4cout << "G4MuonDecayChannel:: constructor ";
-  //  G4cout << "addr[" << this << "]" << endl;
+  //  G4cout << "addr[" << this << "]" << G4endl;
   //}
   //#endif
 
@@ -59,7 +59,7 @@ G4MuonDecayChannel::G4MuonDecayChannel(const G4String& theParentName,
     //  if (GetVerboseLevel()>0) {
     //   G4cout << "G4MuonDecayChannel:: constructor :";
     //   G4cout << " parent particle is not muon but ";
-    //   G4cout << theParentName << endl;
+    //   G4cout << theParentName << G4endl;
     // }
     //#endif
   }
@@ -162,7 +162,7 @@ G4DecayProducts *G4MuonDecayChannel::DecayIt(G4double)
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
     G4cout << "G4MuonDecayChannel::DecayIt ";
-    G4cout << "  create decay products in rest frame " <<endl;
+    G4cout << "  create decay products in rest frame " <<G4endl;
     products->DumpInfo();
   }
 #endif
diff --git a/source/particles/management/src/G4NucleiProperties.cc b/source/particles/management/src/G4NucleiProperties.cc
index b06e6f4230..8c1959f210 100644
--- a/source/particles/management/src/G4NucleiProperties.cc
+++ b/source/particles/management/src/G4NucleiProperties.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NucleiProperties.cc,v 1.5.6.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NucleiProperties.cc,v 1.5.6.1.2.1 1999/12/08 17:34:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -60,7 +60,7 @@ G4double G4NucleiProperties::GetNuclearMass(const G4double A, const G4double Z)
 {
 	if (A < 1 || Z < 0 || Z > A) {
 		G4cout << "G4NucleiProperties::GetNuclearMass: Wrong values for A = " << A 
-				 << " and Z = " << Z << endl;
+				 << " and Z = " << Z << G4endl;
 		return 0.0;
 	} else {
 	 	G4ParticleDefinition * nucleus = 0;
diff --git a/source/particles/management/src/G4NucleiPropertiesTableA.cc b/source/particles/management/src/G4NucleiPropertiesTableA.cc
index 77c92effa8..c3a23e8f11 100644
--- a/source/particles/management/src/G4NucleiPropertiesTableA.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTableA.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NucleiPropertiesTableA.cc,v 1.4.6.1 1999/12/07 20:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
diff --git a/source/particles/management/src/G4NucleiPropertiesTableB.cc b/source/particles/management/src/G4NucleiPropertiesTableB.cc
index d861678493..61d622e1c1 100644
--- a/source/particles/management/src/G4NucleiPropertiesTableB.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTableB.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NucleiPropertiesTableB.cc,v 1.3.6.1 1999/12/07 20:49:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
diff --git a/source/particles/management/src/G4PDGCodeChecker.cc b/source/particles/management/src/G4PDGCodeChecker.cc
index 6cffc41385..9bbf9eaf90 100644
--- a/source/particles/management/src/G4PDGCodeChecker.cc
+++ b/source/particles/management/src/G4PDGCodeChecker.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PDGCodeChecker.cc,v 1.2.6.1 1999/12/07 20:49:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PDGCodeChecker.cc,v 1.2.6.1.2.3 1999/12/14 07:08:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      17 Aug 1999 H.Kurashige
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4PDGCodeChecker.hh"
 
@@ -79,7 +79,7 @@ G4int G4PDGCodeChecker::CheckForBaryons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " meson has three quark ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -129,7 +129,7 @@ G4int G4PDGCodeChecker::CheckForBaryons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " illegal code for baryon ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -138,7 +138,7 @@ G4int G4PDGCodeChecker::CheckForBaryons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " ??? unknown quark ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -177,7 +177,7 @@ G4int G4PDGCodeChecker::CheckForMesons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " meson has only quark and anti-quark pair";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -186,7 +186,7 @@ G4int G4PDGCodeChecker::CheckForMesons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " illegal code for meson ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -197,7 +197,7 @@ G4int G4PDGCodeChecker::CheckForMesons()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " ??? unknown quark ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -245,7 +245,7 @@ G4int G4PDGCodeChecker::CheckForDiQuarks()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " ??? unknown quark ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return 0;
@@ -271,7 +271,7 @@ G4int G4PDGCodeChecker::CheckForQuarks()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " ??? unknown quark ";
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     //  --- code is wrong 
@@ -306,7 +306,7 @@ G4bool G4PDGCodeChecker::CheckCharge(G4double thePDGCharge) const
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << " illegal electric charge " << thePDGCharge/eplus;
-      G4cout << " PDG code=" << code <<endl;
+      G4cout << " PDG code=" << code <<G4endl;
     }
 #endif
     return false;
diff --git a/source/particles/management/src/G4ParticleDefinition.cc b/source/particles/management/src/G4ParticleDefinition.cc
index 10e64e3180..78425d16b2 100644
--- a/source/particles/management/src/G4ParticleDefinition.cc
+++ b/source/particles/management/src/G4ParticleDefinition.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleDefinition.cc,v 1.6.6.1 1999/12/07 20:49:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleDefinition.cc,v 1.6.6.1.2.1 1999/12/08 17:34:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -95,7 +95,7 @@ G4ParticleDefinition::G4ParticleDefinition(
        // cerr bnot G4cerr is used intentionally  
        // because G4ParticleDefinition constructor may be called 
        // before G4cerr object is instantiated !!
-       cerr << "Particle " << aName << " has a strange PDGEncoding " <<endl;
+       G4cerr << "Particle " << aName << " has a strange PDGEncoding " <<G4endl;
      }
    }
 #endif
@@ -164,7 +164,7 @@ G4int G4ParticleDefinition::FillQuarkContents()
 #ifdef G4VERBOSE
 	if (verboseLevel>1) {
 	  G4cout << " illegal charge (" << thePDGCharge/eplus;
-	  G4cout << " PDG code=" << thePDGEncoding <<endl;
+	  G4cout << " PDG code=" << thePDGEncoding <<G4endl;
 	}
 #endif
       }
@@ -174,7 +174,7 @@ G4int G4ParticleDefinition::FillQuarkContents()
 #ifdef G4VERBOSE
 	if (verboseLevel>1) {
 	  G4cout << " illegal SPIN (" << thePDGiSpin << "/2";
-	  G4cout << " PDG code=" << thePDGEncoding <<endl;
+	  G4cout << " PDG code=" << thePDGEncoding <<G4endl;
 	}
 #endif
       }
@@ -185,55 +185,55 @@ G4int G4ParticleDefinition::FillQuarkContents()
 
 void G4ParticleDefinition::DumpTable() const
 {
-  G4cout << endl;
-  G4cout << "--- G4ParticleDefinition ---" << endl;
-  G4cout << " Particle Name : " << theParticleName << endl;
+  G4cout << G4endl;
+  G4cout << "--- G4ParticleDefinition ---" << G4endl;
+  G4cout << " Particle Name : " << theParticleName << G4endl;
   G4cout << " PDG particle code : " << thePDGEncoding;
-  G4cout << " [PDG anti-particle code: " << this->GetAntiPDGEncoding() << "]"<< endl;
+  G4cout << " [PDG anti-particle code: " << this->GetAntiPDGEncoding() << "]"<< G4endl;
   G4cout << " Mass [GeV/c2] : " << thePDGMass/GeV ;
-  G4cout << "     Width : " << thePDGWidth/GeV << endl;
-  G4cout << " Lifetime [nsec] : " << thePDGLifeTime/ns << endl;
-  G4cout << " Charge [e]: " << thePDGCharge/eplus << endl;
-  G4cout << " Spin : " << thePDGiSpin << "/2" << endl;
-  G4cout << " Parity : " << thePDGiParity << endl;
-  G4cout << " Charge conjugation : " << thePDGiConjugation << endl;
+  G4cout << "     Width : " << thePDGWidth/GeV << G4endl;
+  G4cout << " Lifetime [nsec] : " << thePDGLifeTime/ns << G4endl;
+  G4cout << " Charge [e]: " << thePDGCharge/eplus << G4endl;
+  G4cout << " Spin : " << thePDGiSpin << "/2" << G4endl;
+  G4cout << " Parity : " << thePDGiParity << G4endl;
+  G4cout << " Charge conjugation : " << thePDGiConjugation << G4endl;
   G4cout << " Isospin : (I,Iz): (" << thePDGiIsospin <<"/2";
-  G4cout << " , " << thePDGiIsospin3 << "/2 ) " << endl;
-  G4cout << " GParity : " << thePDGiGParity << endl;
+  G4cout << " , " << thePDGiIsospin3 << "/2 ) " << G4endl;
+  G4cout << " GParity : " << thePDGiGParity << G4endl;
   G4cout << " Quark contents     (d,u,s,c,b,t) : " << theQuarkContent[0];
   G4cout << ", " << theQuarkContent[1];
   G4cout << ", " << theQuarkContent[2];
   G4cout << ", " << theQuarkContent[3];
   G4cout << ", " << theQuarkContent[4];
-  G4cout << ", " << theQuarkContent[5] << endl;
+  G4cout << ", " << theQuarkContent[5] << G4endl;
   G4cout << " AntiQuark contents               : " << theAntiQuarkContent[0];
   G4cout << ", " << theAntiQuarkContent[1];
   G4cout << ", " << theAntiQuarkContent[2];
   G4cout << ", " << theAntiQuarkContent[3];
   G4cout << ", " << theAntiQuarkContent[4];
-  G4cout << ", " << theAntiQuarkContent[5] << endl;
+  G4cout << ", " << theAntiQuarkContent[5] << G4endl;
   G4cout << " Lepton number : " << theLeptonNumber;
-  G4cout << " Baryon number : " << theBaryonNumber << endl;
-  G4cout << " Particle type : " << theParticleType << endl;
+  G4cout << " Baryon number : " << theBaryonNumber << G4endl;
+  G4cout << " Particle type : " << theParticleType << G4endl;
 
   if ( fShortLivedFlag ){
-    G4cout << " ShortLived : ON" << endl;
+    G4cout << " ShortLived : ON" << G4endl;
   }
 
   if ( thePDGStable ){
-    G4cout << " Stable : stable" << endl;
+    G4cout << " Stable : stable" << G4endl;
   } else {
     if( theDecayTable != 0 ){
       theDecayTable->DumpInfo();
     } else {
-      G4cout << "Decay Table is not defined !!" <<endl;
+      G4cout << "Decay Table is not defined !!" <<G4endl;
     }
   }
 
   if ( fApplyCutsFlag ){
-    G4cout << " ApplyCuts : ON" << endl;
+    G4cout << " ApplyCuts : ON" << G4endl;
   } else {
-    G4cout << " ApplyCuts : OFF" << endl;
+    G4cout << " ApplyCuts : OFF" << G4endl;
   }
 }
 
diff --git a/source/particles/management/src/G4ParticleMessenger.cc b/source/particles/management/src/G4ParticleMessenger.cc
index 538533ac1c..935e6858d7 100644
--- a/source/particles/management/src/G4ParticleMessenger.cc
+++ b/source/particles/management/src/G4ParticleMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleMessenger.cc,v 1.3.6.1 1999/12/07 20:49:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleMessenger.cc,v 1.3.6.1.2.3 1999/12/14 07:08:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -26,7 +26,7 @@
 //---------------------------------------------------------------
 
 #include "G4ios.hh"                 // Include from 'system'
-#include <iomanip.h>                  // Include from 'system'
+#include "g4std/iomanip"                  // Include from 'system'
 
 #include "G4ParticleMessenger.hh"
 #include "G4UImanager.hh"
@@ -98,30 +98,30 @@ void G4ParticleMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
     while( (*piter)() ){
       G4ParticleDefinition *particle = piter->value();
       if ((newValues=="all") || (newValues==particle->GetParticleType())) {
-        G4cout << setw(19) << particle->GetParticleName();
+        G4cout << G4std::setw(19) << particle->GetParticleName();
 	if ((counter++)%4 == 3) {
-	  G4cout << endl;
+	  G4cout << G4endl;
 	} else {
 	  G4cout << ",";
 	}
       }
     }
-    G4cout << endl;
-    if (counter == 0) G4cout << newValues << " is not found " << endl;
+    G4cout << G4endl;
+    if (counter == 0) G4cout << newValues << " is not found " << G4endl;
 
   } else if( command==selectCmd ){
     //Commnad   /particle/select
     currentParticle = theParticleTable->FindParticle(newValues);
     if(currentParticle == 0) {
-      G4cout << "Unknown particle [" << newValues << "]. Command ignored." << endl;
+      G4cout << "Unknown particle [" << newValues << "]. Command ignored." << G4endl;
     }   
   } else if( command==findCmd ){
     //Commnad   /particle/find
     G4ParticleDefinition* tmp = theParticleTable->FindParticle( findCmd->GetNewIntValue(newValues));
     if(tmp == 0) {
-      G4cout << "Unknown particle [" << newValues << "]. Command ignored." << endl;
+      G4cout << "Unknown particle [" << newValues << "]. Command ignored." << G4endl;
     } else {
-      G4cout << tmp->GetParticleName() << endl;
+      G4cout << tmp->GetParticleName() << G4endl;
       tmp->DumpTable();
     }
   }    
diff --git a/source/particles/management/src/G4ParticlePropertyMessenger.cc b/source/particles/management/src/G4ParticlePropertyMessenger.cc
index bf1426b998..ab469d05f0 100644
--- a/source/particles/management/src/G4ParticlePropertyMessenger.cc
+++ b/source/particles/management/src/G4ParticlePropertyMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticlePropertyMessenger.cc,v 1.2.8.1 1999/12/07 20:49:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticlePropertyMessenger.cc,v 1.2.8.1.2.3 1999/12/14 07:08:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -36,7 +36,7 @@
 #include "G4ParticlePropertyMessenger.hh"
 #include "G4ParticleTable.hh"
 #include "G4ios.hh"                 // Include from 'system'
-#include <iomanip.h>                  // Include from 'system'
+#include "g4std/iomanip"                  // Include from 'system'
 
 G4ParticlePropertyMessenger::G4ParticlePropertyMessenger(G4ParticleTable* pTable)
                         :theParticleTable(pTable),
@@ -102,7 +102,7 @@ G4ParticlePropertyMessenger::~G4ParticlePropertyMessenger()
 void G4ParticlePropertyMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
 {
   if (SetCurrentParticle()==0) {
-      G4cout << "Particle is not selected yet !! Command ignored." << endl;
+      G4cout << "Particle is not selected yet !! Command ignored." << G4endl;
       return;
   }
 
@@ -117,9 +117,9 @@ void G4ParticlePropertyMessenger::SetNewValue(G4UIcommand * command,G4String new
   } else if (command == stableCmd ) {
     //Commnad   /particle/property/stable
     if (currentParticle->GetPDGLifeTime()<0.0) {
-      G4cout << "Life time is negative! Command ignored." << endl; 
+      G4cout << "Life time is negative! Command ignored." << G4endl; 
     } else if (currentParticle->GetPDGMass()<=0.0) {
-      G4cout << "Zero Mass! Command ignored." << endl; 
+      G4cout << "Zero Mass! Command ignored." << G4endl; 
     } else {
       currentParticle->SetPDGStable(stableCmd->GetNewBoolValue(newValue));
     }
diff --git a/source/particles/management/src/G4ParticleTable.cc b/source/particles/management/src/G4ParticleTable.cc
index 926f735cd0..1e18e8f4c2 100644
--- a/source/particles/management/src/G4ParticleTable.cc
+++ b/source/particles/management/src/G4ParticleTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleTable.cc,v 1.14.4.1 1999/12/07 20:49:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleTable.cc,v 1.14.4.1.2.1 1999/12/08 17:34:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4ParticleTable
 //
@@ -146,7 +146,7 @@ void G4ParticleTable::RemoveAllParticles()
 
 #ifdef G4VERBOSE
   if (verboseLevel>1){
-    G4cout << "G4ParticleTable::RemoveAllParticles() " << endl;
+    G4cout << "G4ParticleTable::RemoveAllParticles() " << G4endl;
   }
 #endif
 
@@ -189,7 +189,7 @@ G4ParticleDefinition* G4ParticleTable::Insert(G4ParticleDefinition *particle)
   if ((particle == 0) || (GetKey(particle).isNull())) {
 #ifdef G4VERBOSE
     if (verboseLevel>0){
-      G4cout << "The particle[Addr:" << particle << "] has no name "<< endl;
+      G4cout << "The particle[Addr:" << particle << "] has no name "<< G4endl;
     }
 #endif
     return 0;
@@ -199,7 +199,7 @@ G4ParticleDefinition* G4ParticleTable::Insert(G4ParticleDefinition *particle)
     if (contains(particle)) {
 #ifdef G4VERBOSE
       if (verboseLevel>0){
-	G4cout << "The particle has same name "<< endl;
+	G4cout << "The particle has same name "<< G4endl;
       }
       if (verboseLevel>1){
         FindParticle(particle) -> DumpTable();
@@ -333,7 +333,7 @@ G4ParticleDefinition* G4ParticleTable::GetParticle(G4int index)
 #ifdef G4VERBOSE
   if (verboseLevel>0){
     G4cout << " G4ParticleTable::GetParticle";
-    G4cout << " invalid index (=" << index << ")" << endl;
+    G4cout << " invalid index (=" << index << ")" << G4endl;
   }
 #endif
   return 0;
@@ -353,7 +353,7 @@ G4ParticleDefinition* G4ParticleTable::FindParticle(G4int aPDGEncoding )
     if (aPDGEncoding == 0){ 
 #ifdef G4VERBOSE
       if (verboseLevel>0){
-        G4cout << "PDGEncoding  [" <<  aPDGEncoding << "] is not valid " << endl;
+        G4cout << "PDGEncoding  [" <<  aPDGEncoding << "] is not valid " << G4endl;
       }
 #endif
       return 0;
@@ -372,7 +372,7 @@ G4ParticleDefinition* G4ParticleTable::FindParticle(G4int aPDGEncoding )
 
 #ifdef G4VERBOSE
     if ((particle == 0) && (verboseLevel>0) ){
-      G4cout << "CODE:" << aPDGEncoding << " does not exist in ParticleTable " << endl;
+      G4cout << "CODE:" << aPDGEncoding << " does not exist in ParticleTable " << G4endl;
     }
 #endif
     return particle;
@@ -396,7 +396,7 @@ void G4ParticleTable::DumpTable(const G4String &particle_name)
     } else {
 #ifdef G4VERBOSE
       if (verboseLevel>0){
-        G4cout << particle_name << " does not exist in ParticleTable " <<endl;
+        G4cout << particle_name << " does not exist in ParticleTable " <<G4endl;
       }
 #endif
     }
diff --git a/source/particles/management/src/G4ParticleWithCuts.cc b/source/particles/management/src/G4ParticleWithCuts.cc
index 7cdfe8e1d5..81bb522233 100644
--- a/source/particles/management/src/G4ParticleWithCuts.cc
+++ b/source/particles/management/src/G4ParticleWithCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleWithCuts.cc,v 1.5.8.1 1999/12/07 20:50:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleWithCuts.cc,v 1.5.8.1.2.5 1999/12/14 09:16:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -32,11 +32,7 @@
 #include "G4PhysicsLogVector.hh"
 #include "G4ios.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 G4double  G4ParticleWithCuts::LowestEnergy = 0.99e-3*MeV;
@@ -184,13 +180,13 @@ void G4ParticleWithCuts::BuildLossTable()
     if (GetVerboseLevel()>2) {
       G4cout << "G4ParticleWithCuts::BuildLossTable() ";
       G4cout << "Create theLossTable[" << theLossTable << "]";
-      G4cout << " NumberOfElements=" << NumberOfElements <<endl;
+      G4cout << " NumberOfElements=" << NumberOfElements <<G4endl;
     }
 #endif
   } else {
     if (NumberOfElements != G4Element::GetNumberOfElements()){
       char errMsg[1024];
-      ostrstream errOs(errMsg,1024);
+      G4std::ostrstream errOs(errMsg,1024);
       errOs << "Error in G4ParticlWithCuts::BuildLossTable()";
       errOs << "[" <<  this->GetParticleName() << "] ";
       errOs << "  :  inconsistent G4Element::GetNumberOfElements =" << G4Element::GetNumberOfElements();
@@ -253,10 +249,10 @@ G4double G4ParticleWithCuts::ConvertCutToKineticEnergy(G4RangeVector* rangeVecto
   {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "Error in G4ParticleWithCuts::ConvertCutToKineticEnergy" <<endl;
+      G4cout << "Error in G4ParticleWithCuts::ConvertCutToKineticEnergy" <<G4endl;
       G4cout << "******** ConvertCutToKineticEnergy for " << GetParticleName(); 
-      G4cout << " ********************" << endl;
-      G4cout << "The cut energy is set " << DBL_MAX/GeV << "GeV " <<endl; 
+      G4cout << " ********************" << G4endl;
+      G4cout << "The cut energy is set " << DBL_MAX/GeV << "GeV " <<G4endl; 
     }
 #endif
     return  DBL_MAX;
@@ -285,7 +281,7 @@ G4double G4ParticleWithCuts::ConvertCutToKineticEnergy(G4RangeVector* rangeVecto
 void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut) 
 {
   char errMsg[1024];
-  ostrstream errOs(errMsg,1024);
+  G4std::ostrstream errOs(errMsg,1024);
   // check LowestEnergy/ HighestEnergy/TotBin 
   if (TotBin<1) {
     errOs <<  "Error in G4ParticlWithCuts::G4ParticlWithCuts" ;
@@ -332,7 +328,7 @@ void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut)
 #ifdef G4VERBOSE
       if (GetVerboseLevel()>0) {
 	    G4cout << " G4ParticleWithCuts::CalcEnergyCuts  ";
-	    G4cout << " proton is not defined !!" << endl;
+	    G4cout << " proton is not defined !!" << G4endl;
       }
 #endif
       useProtonCut = false;
@@ -355,7 +351,7 @@ void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>2) {
       G4cout << " G4ParticleWithCuts: [" << GetParticleName() <<"]";
-      G4cout << " uses Proton Cut " << endl;
+      G4cout << " uses Proton Cut " << G4endl;
     }
 #endif                                                      
     G4double ChargeSquare = Charge*Charge/(eplus*eplus) ;
@@ -373,7 +369,7 @@ void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>2) {
       G4cout << " G4ParticleWithCuts: [" << GetParticleName() <<"]";
-      G4cout << " calcurate by using its own loss table  " << endl;
+      G4cout << " calcurate by using its own loss table  " << G4endl;
     }
 #endif
     // Build the energy loss table
@@ -482,7 +478,7 @@ void G4ParticleWithCuts::BuildRangeVector(
   G4int NumEl = aMaterial->GetNumberOfElements();
   if (rangeVector == 0) {
     char errMsg[1024];
-    ostrstream errOs(errMsg,1024);
+    G4std::ostrstream errOs(errMsg,1024);
     errOs << "Error in G4ParticleWithCuts::BuildRangeVector()";
     errOs << "[" << this->GetParticleName() << "] ";
     errOs << " :  0 pointer is found in absorptionLengthVector" << '\0';
@@ -553,11 +549,11 @@ void G4ParticleWithCuts::BuildRangeVector(
   if ( theCutInMaxInteractionLength >= rmax) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << "Error in G4ParticleWithCuts::BuildRangeVector()" << endl;
-      G4cout << " SetCuts for " << GetParticleName() << endl;
-      G4cout << "The maximal meaningful cut is " << rmax/mm << " mm." << endl;
-      G4cout << "All the " << GetParticleName() << "will be killed !" << endl;
-      G4cout << "in the material " << aMaterial->GetName() << "." << endl;
+      G4cout << "Error in G4ParticleWithCuts::BuildRangeVector()" << G4endl;
+      G4cout << " SetCuts for " << GetParticleName() << G4endl;
+      G4cout << "The maximal meaningful cut is " << rmax/mm << " mm." << G4endl;
+      G4cout << "All the " << GetParticleName() << "will be killed !" << G4endl;
+      G4cout << "in the material " << aMaterial->GetName() << "." << G4endl;
     }
 #endif
   }
diff --git a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
index dc3f80b604..747ac3e0a1 100644
--- a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
+++ b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhaseSpaceDecayChannel.cc,v 1.3.8.1 1999/12/07 20:50:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhaseSpaceDecayChannel.cc,v 1.3.8.1.2.1 1999/12/08 17:34:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -75,7 +75,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::DecayIt(G4double parentMass)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
       G4cout << "G4PhaseSpaceDecayChannel::DecayIt ";
-      G4cout << " daughters not defined " <<endl;
+      G4cout << " daughters not defined " <<G4endl;
     }
 #endif
     break;
@@ -95,7 +95,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::DecayIt(G4double parentMass)
 #ifdef G4VERBOSE
   if ((products == 0) && (GetVerboseLevel()>0)) {
     G4cout << "G4PhaseSpaceDecayChannel::DecayIt ";
-    G4cout << *parent_name << " can not decay " << endl;
+    G4cout << *parent_name << " can not decay " << G4endl;
     DumpInfo();
   }
 #endif
@@ -105,7 +105,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::DecayIt(G4double parentMass)
 G4DecayProducts *G4PhaseSpaceDecayChannel::OneBodyDecayIt()
 {
 #ifdef G4VERBOSE
-  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::OneBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::OneBodyDecayIt()"<<G4endl;
 #endif
   G4double parentmass = parent_mass;
   G4double daughtermass = daughters_mass[0];
@@ -124,7 +124,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::OneBodyDecayIt()
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
      G4cout << "G4PhaseSpaceDecayChannel::OneBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
   }
 #endif
@@ -134,7 +134,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::OneBodyDecayIt()
 G4DecayProducts *G4PhaseSpaceDecayChannel::TwoBodyDecayIt()
 {
 #ifdef G4VERBOSE
-  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::TwoBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::TwoBodyDecayIt()"<<G4endl;
 #endif
   // parent mass
   G4double parentmass = parent_mass;
@@ -169,7 +169,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::TwoBodyDecayIt()
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
      G4cout << "G4PhaseSpaceDecayChannel::TwoBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
   }
 #endif
@@ -180,7 +180,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ThreeBodyDecayIt()
 // algorism of this code is originally written in GDECA3 of GEANT3
 {
 #ifdef G4VERBOSE
-  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::ThreeBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::ThreeBodyDecayIt()"<<G4endl;
 #endif
   // parent mass
   G4double parentmass = parent_mass;
@@ -235,10 +235,10 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ThreeBodyDecayIt()
   // output message
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
-    G4cout << "     daughter 0:" << daughtermomentum[0]/GeV << "[GeV/c]" <<endl;
-    G4cout << "     daughter 1:" << daughtermomentum[1]/GeV << "[GeV/c]" <<endl;
-    G4cout << "     daughter 2:" << daughtermomentum[2]/GeV << "[GeV/c]" <<endl;
-    G4cout << "   momentum sum:" << momentumsum/GeV << "[GeV/c]" <<endl;
+    G4cout << "     daughter 0:" << daughtermomentum[0]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "     daughter 1:" << daughtermomentum[1]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "     daughter 2:" << daughtermomentum[2]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "   momentum sum:" << momentumsum/GeV << "[GeV/c]" <<G4endl;
   }
 #endif
 
@@ -277,7 +277,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ThreeBodyDecayIt()
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
      G4cout << "G4PhaseSpaceDecayChannel::ThreeBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
   }
 #endif
@@ -301,7 +301,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
   G4DecayProducts *products;
 
 #ifdef G4VERBOSE
-  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::ManyBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::ManyBodyDecayIt()"<<G4endl;
 #endif
   // parent mass
   G4double parentmass = parent_mass;
@@ -347,7 +347,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
       temp -= daughtermass[index];
       if (GetVerboseLevel()>1) {
         G4cout << index << "  rundom number:" << rd[index]; 
-        G4cout << "   virtual mass:" << sm[index]/GeV << "[GeV/c/c]" <<endl; 
+        G4cout << "   virtual mass:" << sm[index]/GeV << "[GeV/c/c]" <<G4endl; 
       }
     }
     delete [] rd;
@@ -359,7 +359,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>1) {
       G4cout << "     daughter " << index << ":" << *daughters_name[index];
-      G4cout << " momentum:" << daughtermomentum[index]/GeV << "[GeV/c]" <<endl;
+      G4cout << " momentum:" << daughtermomentum[index]/GeV << "[GeV/c]" <<G4endl;
     }
 #endif
     for(index =numberOfDaughters-2; index>=0; index--) {
@@ -370,12 +370,12 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
 #ifdef G4VERBOSE
         if (GetVerboseLevel()>0) {
           G4cout << "G4PhaseSpaceDecayChannel::ManyBodyDecayIt ";
-          G4cout << "     can not calculate daughter momentum " <<endl;
+          G4cout << "     can not calculate daughter momentum " <<G4endl;
           G4cout << "     parent:" << *parent_name;
-          G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<endl;
+          G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<G4endl;
           G4cout << "     daughter " << index << ":" << *daughters_name[index];
           G4cout << " mass:" << daughtermass[index]/GeV << "[GeV/c/c]" ;
-          G4cout << " mass:" << daughtermomentum[index]/GeV << "[GeV/c]" <<endl;
+          G4cout << " mass:" << daughtermomentum[index]/GeV << "[GeV/c]" <<G4endl;
         }
 #endif
 	delete [] sm;
@@ -388,19 +388,19 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
         weight *=  daughtermomentum[index]/sm[index];
         if (GetVerboseLevel()>1) {
           G4cout << "     daughter " << index << ":" << *daughters_name[index];
-          G4cout << " momentum:" << daughtermomentum[index]/GeV << "[GeV/c]" <<endl;
+          G4cout << " momentum:" << daughtermomentum[index]/GeV << "[GeV/c]" <<G4endl;
         }
       }
     }
     if (GetVerboseLevel()>1) {
-      G4cout << "    weight: " << weight <<endl;
+      G4cout << "    weight: " << weight <<G4endl;
     }
     
     // exit if number of Try exceeds 100
     if (numberOfTry++ >100) {
       if (GetVerboseLevel()>0) {
         G4cout << "G4PhaseSpaceDecayChannel::ManyBodyDecayIt: ";
-	G4cout << " can not determine Decay Kinematics " << endl;
+	G4cout << " can not determine Decay Kinematics " << G4endl;
       }
       delete [] sm;
       delete [] daughtermass;
@@ -411,7 +411,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
 
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
-      G4cout << "Start calulation of daughters momentum vector "<<endl;
+      G4cout << "Start calulation of daughters momentum vector "<<G4endl;
   }
 #endif  
   G4double costheta, sintheta, phi;
@@ -467,7 +467,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt()
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) { 
     G4cout << "G4PhaseSpaceDecayChannel::ManyBodyDecayIt ";
-    G4cout << "  create decay products in rest frame " << endl;
+    G4cout << "  create decay products in rest frame " << G4endl;
     products->DumpInfo();
   }
 #endif
diff --git a/source/particles/management/src/G4ShortLivedTable.cc b/source/particles/management/src/G4ShortLivedTable.cc
index 605e37bf66..e25e2b9a61 100644
--- a/source/particles/management/src/G4ShortLivedTable.cc
+++ b/source/particles/management/src/G4ShortLivedTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ShortLivedTable.cc,v 1.7.4.1 1999/12/07 20:50:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ShortLivedTable.cc,v 1.7.4.1.2.5 1999/12/14 09:16:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -25,11 +25,7 @@
 
 #include "G4ios.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 G4ShortLivedTable::G4ShortLivedTable()
@@ -76,7 +72,7 @@ void G4ShortLivedTable::Insert(G4ParticleDefinition* particle)
     //#ifdef G4VERBOSE
     //if (GetVerboseLevel()>0) {
     //  G4cout << "G4ShortLivedTable::Insert :" << particle->GetParticleName() ;
-    //  G4cout << " is not short lived" << endl; 
+    //  G4cout << " is not short lived" << G4endl; 
     //}
     //#endif
   }
@@ -100,7 +96,7 @@ void G4ShortLivedTable::Remove(G4ParticleDefinition* particle)
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
       G4cout << "G4ShortLivedTable::Remove :" << particle->GetParticleName() ;
-      G4cout << " is not short lived" << endl; 
+      G4cout << " is not short lived" << G4endl; 
     }
 #endif
   }
diff --git a/source/particles/management/src/G4VDecayChannel.cc b/source/particles/management/src/G4VDecayChannel.cc
index bd6f334761..6c1f68004a 100644
--- a/source/particles/management/src/G4VDecayChannel.cc
+++ b/source/particles/management/src/G4VDecayChannel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDecayChannel.cc,v 1.5.6.1 1999/12/07 20:50:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VDecayChannel.cc,v 1.5.6.1.2.1 1999/12/08 17:34:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -155,7 +155,7 @@ void G4VDecayChannel::ClearDaughtersName()
 #ifdef G4VERBOSE
       if (verboseLevel>1) {
 	G4cout << "G4VDecayChannel::ClearDaughtersName ";
-	G4cout << "clear all daughters " << endl;
+	G4cout << "clear all daughters " << G4endl;
       }
 #endif
       for (G4int index=0; index < numberOfDaughters; index++) { 
@@ -194,7 +194,7 @@ void G4VDecayChannel::SetDaughter(G4int anIndex,
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cout << "G4VDecayChannel::SetDaughter: ";
-      G4cout << "Number of daughters is not defined" << endl;
+      G4cout << "Number of daughters is not defined" << G4endl;
     }
 #endif
     return;
@@ -214,7 +214,7 @@ void G4VDecayChannel::SetDaughter(G4int anIndex,
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cout << "G4VDecayChannel::SetDaughter";
-      G4cout << "index out of range " << anIndex << endl;
+      G4cout << "index out of range " << anIndex << G4endl;
     }
 #endif
   } else {
@@ -227,7 +227,7 @@ void G4VDecayChannel::SetDaughter(G4int anIndex,
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << "G4VDecayChannel::SetDaughter[" << anIndex <<"] :";
-      G4cout << daughters_name[anIndex] << ":" << *daughters_name[anIndex]<<endl;
+      G4cout << daughters_name[anIndex] << ":" << *daughters_name[anIndex]<<G4endl;
     }
 #endif
   }
@@ -243,7 +243,7 @@ void G4VDecayChannel::FillDaughters()
   G4int index;
   
 #ifdef G4VERBOSE
-  if (verboseLevel>1) G4cout << "G4VDecayChannel::FillDaughters()" <<endl;
+  if (verboseLevel>1) G4cout << "G4VDecayChannel::FillDaughters()" <<G4endl;
 #endif
   if (daughters != 0) delete [] daughters;
 
@@ -274,7 +274,7 @@ void G4VDecayChannel::FillDaughters()
 #ifdef G4VERBOSE
       if (verboseLevel>0) {
 	G4cout << "G4VDecayChannel::FillDaughters  ";
-	G4cout << index << "-th daughter is not defined yet" << endl;
+	G4cout << index << "-th daughter is not defined yet" << G4endl;
       }
 #endif
       daughters[index] = 0;
@@ -288,8 +288,8 @@ void G4VDecayChannel::FillDaughters()
       if (verboseLevel>0) {
 	G4cout << "G4VDecayChannel::FillDaughters  ";
 	G4cout << index << ":" << *daughters_name[index];
-	G4cout << " is not defined !!" << endl;
-        G4cout << " The BR of this decay mode is set to zero " << endl;
+	G4cout << " is not defined !!" << G4endl;
+        G4cout << " The BR of this decay mode is set to zero " << G4endl;
       }
 #endif
       SetBR(0.0);
@@ -298,7 +298,7 @@ void G4VDecayChannel::FillDaughters()
 #ifdef G4VERBOSE
     if (verboseLevel>1) {
       G4cout << index << ":" << *daughters_name[index];
-      G4cout << ":" << daughters[index] << endl;
+      G4cout << ":" << daughters[index] << G4endl;
     }
 #endif
     daughters_mass[index] = daughters[index]->GetPDGMass();
@@ -311,12 +311,12 @@ void G4VDecayChannel::FillDaughters()
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
       G4cout << "G4VDecayChannel::FillDaughters ";
-      G4cout << "    Energy/Momentum conserevation breaks " <<endl;
+      G4cout << "    Energy/Momentum conserevation breaks " <<G4endl;
       G4cout << "    parent:" << *parent_name;
-      G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<endl;
+      G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<G4endl;
       for (index=0; index < numberOfDaughters; index++){
         G4cout << "     daughter " << index << ":" << *daughters_name[index];
-        G4cout << " mass:" << daughters[index]->GetPDGMass()/GeV << "[GeV/c/c]" <<endl;
+        G4cout << " mass:" << daughters[index]->GetPDGMass()/GeV << "[GeV/c/c]" <<G4endl;
       }
     }
 #endif
@@ -334,7 +334,7 @@ void G4VDecayChannel::FillParent()
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cout << "G4VDecayChannel::FillParent   ";
-      G4cout << ": parent name is not defined !!" << endl;
+      G4cout << ": parent name is not defined !!" << G4endl;
     }
 #endif
     parent = 0;
@@ -347,7 +347,7 @@ void G4VDecayChannel::FillParent()
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cout << "G4VDecayChannel::FillParent   ";
-      G4cout << *parent_name << " does not exist !!" << endl;
+      G4cout << *parent_name << " does not exist !!" << G4endl;
     }
 #endif
     G4Exception("G4VDecayChannel::FillParent");
@@ -372,7 +372,7 @@ void G4VDecayChannel::DumpInfo()
       G4cout << " not defined ";
     }
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 
diff --git a/source/particles/shortlived/include/G4DiQuarks.hh b/source/particles/shortlived/include/G4DiQuarks.hh
index 96b2b2d772..c2b7e80845 100644
--- a/source/particles/shortlived/include/G4DiQuarks.hh
+++ b/source/particles/shortlived/include/G4DiQuarks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DiQuarks.hh,v 1.2.8.1 1999/12/07 20:50:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
index 6d2f1fa04f..da693d9a8d 100644
--- a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedBaryonConstructor.hh,v 1.2.6.1 1999/12/07 20:50:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryons.hh b/source/particles/shortlived/include/G4ExcitedBaryons.hh
index 7d59573dbd..8f9dd06dcc 100644
--- a/source/particles/shortlived/include/G4ExcitedBaryons.hh
+++ b/source/particles/shortlived/include/G4ExcitedBaryons.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedBaryons.hh,v 1.2.6.1 1999/12/07 20:50:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
index 14a9fe7435..8df7ac7b9e 100644
--- a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedDeltaConstructor.hh,v 1.2.6.1 1999/12/07 20:50:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
index 072d320714..3cd6e3a86c 100644
--- a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedLambdaConstructor.hh,v 1.2.6.1 1999/12/07 20:50:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
index e71ca014c0..b3920c6076 100644
--- a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedMesonConstructor.hh,v 1.3.6.1 1999/12/07 20:50:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedMesons.hh b/source/particles/shortlived/include/G4ExcitedMesons.hh
index feea4b5738..cbc2faa307 100644
--- a/source/particles/shortlived/include/G4ExcitedMesons.hh
+++ b/source/particles/shortlived/include/G4ExcitedMesons.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedMesons.hh,v 1.2.6.1 1999/12/07 20:50:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
index ab1c4a6d05..59c1b71c8a 100644
--- a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedNucleonConstructor.hh,v 1.2.6.1 1999/12/07 20:50:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
index 936405387b..57f61fad48 100644
--- a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedSigmaConstructor.hh,v 1.2.6.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
index d98af6de40..556286bc21 100644
--- a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedXiConstructor.hh,v 1.2.6.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Gluons.hh b/source/particles/shortlived/include/G4Gluons.hh
index d3f54b9ed8..024d5147af 100644
--- a/source/particles/shortlived/include/G4Gluons.hh
+++ b/source/particles/shortlived/include/G4Gluons.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Gluons.hh,v 1.2.8.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Quarks.hh b/source/particles/shortlived/include/G4Quarks.hh
index 28df1f96d0..0865cf2f00 100644
--- a/source/particles/shortlived/include/G4Quarks.hh
+++ b/source/particles/shortlived/include/G4Quarks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Quarks.hh,v 1.2.8.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ShortLivedConstructor.hh b/source/particles/shortlived/include/G4ShortLivedConstructor.hh
index e46936c3d4..1e36251dea 100644
--- a/source/particles/shortlived/include/G4ShortLivedConstructor.hh
+++ b/source/particles/shortlived/include/G4ShortLivedConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShortLivedConstructor.hh,v 1.2.6.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4VShortLivedParticle.hh b/source/particles/shortlived/include/G4VShortLivedParticle.hh
index c24ab9fdc7..d183aa41ab 100644
--- a/source/particles/shortlived/include/G4VShortLivedParticle.hh
+++ b/source/particles/shortlived/include/G4VShortLivedParticle.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VShortLivedParticle.hh,v 1.2.8.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4DiQuarks.cc b/source/particles/shortlived/src/G4DiQuarks.cc
index d7d45b69b9..f49ff9947c 100644
--- a/source/particles/shortlived/src/G4DiQuarks.cc
+++ b/source/particles/shortlived/src/G4DiQuarks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DiQuarks.cc,v 1.1.10.1 1999/12/07 20:50:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DiQuarks.cc,v 1.1.10.1.2.2 1999/12/14 07:08:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4DiQuarks.hh"
 
diff --git a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
index 406381336a..402c80ea17 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExcitedBaryonConstructor.cc,v 1.2.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExcitedBaryonConstructor.cc,v 1.2.6.1.2.1 1999/12/08 17:34:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -55,7 +55,7 @@ void G4ExcitedBaryonConstructor::Construct(G4int idx)
 #ifdef G4VERBOSE
     if (G4ParticleTable::GetParticleTable()->GetVerboseLevel()>1) {
       G4cerr << "G4ExcitedBaryonConstructor::Construct()";
-      G4cerr << "   illegal index os state = " << idx << endl;
+      G4cerr << "   illegal index os state = " << idx << G4endl;
     }
 #endif
   }
diff --git a/source/particles/shortlived/src/G4ExcitedBaryons.cc b/source/particles/shortlived/src/G4ExcitedBaryons.cc
index f827c97bfe..a9e7a6e133 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryons.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryons.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExcitedBaryons.cc,v 1.2.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExcitedBaryons.cc,v 1.2.6.1.2.2 1999/12/14 07:08:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4ExcitedBaryons.hh"
 
diff --git a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
index 50df48d696..3ba4006a02 100644
--- a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedDeltaConstructor.cc,v 1.3.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
index d45c7fcd8e..b94511bf2d 100644
--- a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedLambdaConstructor.cc,v 1.2.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
index 542d25427f..4afd942326 100644
--- a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExcitedMesonConstructor.cc,v 1.6.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExcitedMesonConstructor.cc,v 1.6.6.1.2.1 1999/12/08 17:34:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -54,7 +54,7 @@ void G4ExcitedMesonConstructor::Construct(G4int idx)
 #ifdef G4VERBOSE
     if (G4ParticleTable::GetParticleTable()->GetVerboseLevel()>1) {
       G4cerr << "G4ExcitedMesonConstructor::Construct()";
-      G4cerr << "   illegal index os state = " << idx << endl;
+      G4cerr << "   illegal index os state = " << idx << G4endl;
     }
 #endif
   }
diff --git a/source/particles/shortlived/src/G4ExcitedMesons.cc b/source/particles/shortlived/src/G4ExcitedMesons.cc
index cba57fce53..1ec785d326 100644
--- a/source/particles/shortlived/src/G4ExcitedMesons.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesons.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExcitedMesons.cc,v 1.2.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ExcitedMesons.cc,v 1.2.6.1.2.2 1999/12/14 07:08:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4ExcitedMesons.hh"
 
diff --git a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
index 24ff96fc0c..6d2d2d91b4 100644
--- a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedNucleonConstructor.cc,v 1.3.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
index 2e14d6b5d6..57761aeaeb 100644
--- a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedSigmaConstructor.cc,v 1.3.6.1 1999/12/07 20:50:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
index 712ff258ef..af58e86db0 100644
--- a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedXiConstructor.cc,v 1.2.6.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4Gluons.cc b/source/particles/shortlived/src/G4Gluons.cc
index 3eb4397c34..5917368a69 100644
--- a/source/particles/shortlived/src/G4Gluons.cc
+++ b/source/particles/shortlived/src/G4Gluons.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Gluons.cc,v 1.1.10.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Gluons.cc,v 1.1.10.1.2.2 1999/12/14 07:08:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Gluons.hh"
 
diff --git a/source/particles/shortlived/src/G4Quarks.cc b/source/particles/shortlived/src/G4Quarks.cc
index 41ce803b22..1142f6a33f 100644
--- a/source/particles/shortlived/src/G4Quarks.cc
+++ b/source/particles/shortlived/src/G4Quarks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Quarks.cc,v 1.1.10.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Quarks.cc,v 1.1.10.1.2.2 1999/12/14 07:08:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -18,8 +18,8 @@
 //      4th April 1996, G.Cosmo
 // **********************************************************************
 
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "G4Quarks.hh"
 
diff --git a/source/particles/shortlived/src/G4ShortLivedConstructor.cc b/source/particles/shortlived/src/G4ShortLivedConstructor.cc
index c1e72ca2af..9632fb1fe4 100644
--- a/source/particles/shortlived/src/G4ShortLivedConstructor.cc
+++ b/source/particles/shortlived/src/G4ShortLivedConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShortLivedConstructor.cc,v 1.3.6.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4VShortLivedParticle.cc b/source/particles/shortlived/src/G4VShortLivedParticle.cc
index 5e6edcfb97..31dc1561a9 100644
--- a/source/particles/shortlived/src/G4VShortLivedParticle.cc
+++ b/source/particles/shortlived/src/G4VShortLivedParticle.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VShortLivedParticle.cc,v 1.2.8.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VShortLivedParticle.cc,v 1.2.8.1.2.1 1999/12/08 17:34:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -46,32 +46,32 @@ G4VShortLivedParticle::G4VShortLivedParticle(const G4String&  aName,
 
 void            G4VShortLivedParticle::ResetCuts()
 {
-  G4cout << "G4VShortLivedParticle::ResetCuts() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::ResetCuts() causes no effect!!" << G4endl;
 }
 void            G4VShortLivedParticle::SetCuts(G4double )
 {
-  G4cout << "G4VShortLivedParticle::SetCuts() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::SetCuts() causes no effect!!" << G4endl;
 }
 void            G4VShortLivedParticle::ReCalcCuts()
 {
-  G4cout << "G4VShortLivedParticle::ReCalcCuts() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::ReCalcCuts() causes no effect!!" << G4endl;
 }
 
 G4double      	G4VShortLivedParticle::GetLengthCuts() const
 {
-  G4cout << "G4VShortLivedParticle::GetLengthCuts() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::GetLengthCuts() causes no effect!!" << G4endl;
   return -1.0;
 }
 
 G4double*	G4VShortLivedParticle::GetEnergyCuts() const
 {
-  G4cout << "G4VShortLivedParticle::GetLengthCuts() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::GetLengthCuts() causes no effect!!" << G4endl;
   return 0;
 }
 
 G4double      	G4VShortLivedParticle::GetEnergyThreshold(const G4Material* ) const
 {
-  G4cout << "G4VShortLivedParticle::GetEnergyThreshold() causes no effect!!" << endl;
+  G4cout << "G4VShortLivedParticle::GetEnergyThreshold() causes no effect!!" << G4endl;
   return -1.0;
 }
 
diff --git a/source/persistency/History b/source/persistency/History
index 24d52cd898..5fdac10ca0 100644
--- a/source/persistency/History
+++ b/source/persistency/History
@@ -15,6 +15,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+23 Feburuary, 00   Y.Morita (persistency-V01-00-00)
+- fixed a minor typo in G4PersistentGeomMan.cc
+
 December 6, 99   Y.Morita (persistency-V00-01-12)
 - Bug fix in G4PGeometryObjectMap.cc
 
diff --git a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
index 2df29b3361..95ca66047e 100644
--- a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PDCofThisEvent.ddl,v 1.3 1999/12/02 16:10:19 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PDCofThisEvent_h
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigit.ddl b/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
index 92cba5d8f7..1cf762d35d 100644
--- a/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVDigit.ddl,v 1.2 1999/11/24 20:28:06 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PVDigit_h
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl b/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
index 5c5f306920..a7f1868853 100644
--- a/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVDigitsCollection.ddl,v 1.4 1999/12/01 14:45:10 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PVDigitsCollection_h
diff --git a/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh b/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
index 85268c8abf..5276f52486 100644
--- a/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
+++ b/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentDigitMan.hh,v 1.6 1999/11/29 20:11:16 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentDigitMan 
 //
diff --git a/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc b/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
index d992ad5d4c..a96491e662 100644
--- a/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
+++ b/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PDCofThisEvent.cc,v 1.3 1999/12/02 16:10:20 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PDCofThisEvent.hh"
diff --git a/source/persistency/digits+hits/digits/src/G4PVDigit.cc b/source/persistency/digits+hits/digits/src/G4PVDigit.cc
index 50a43f8d03..6602e978b1 100644
--- a/source/persistency/digits+hits/digits/src/G4PVDigit.cc
+++ b/source/persistency/digits+hits/digits/src/G4PVDigit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVDigit.cc,v 1.2 1999/11/24 20:28:07 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PVDigit.hh"
diff --git a/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc b/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
index bd0f80937a..91e4391479 100644
--- a/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
+++ b/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVDigitsCollection.cc,v 1.3 1999/11/29 20:11:17 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4PVDigitsCollection
diff --git a/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc b/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
index e2f4afa41c..c293c45bc2 100644
--- a/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
+++ b/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentDigitMan.cc,v 1.4 1999/11/28 21:54:14 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentDigitMan 
 //
diff --git a/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl b/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
index 6f57e86f79..8b8e8dbeda 100644
--- a/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PHCofThisEvent.ddl,v 1.8 1999/12/02 16:10:21 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PHCofThisEvent_h
diff --git a/source/persistency/digits+hits/hits/include/G4PVHit.ddl b/source/persistency/digits+hits/hits/include/G4PVHit.ddl
index 1a395c89ac..352ff5829e 100644
--- a/source/persistency/digits+hits/hits/include/G4PVHit.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PVHit.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVHit.ddl,v 1.6 1999/11/24 20:27:24 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PVHit_h
diff --git a/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl b/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
index 8e2f065f73..660092a63a 100644
--- a/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVHitsCollection.ddl,v 1.12 1999/12/01 14:45:13 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PVHitsCollection_h
diff --git a/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh b/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
index 279f86871e..d7ac06c374 100644
--- a/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
+++ b/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentHitMan.hh,v 1.5 1999/11/28 21:54:15 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentHitMan 
 //
diff --git a/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc b/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
index 689c2b8bcf..e62595721e 100644
--- a/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
+++ b/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PHCofThisEvent.cc,v 1.6 1999/12/02 16:10:22 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PHCofThisEvent.hh"
diff --git a/source/persistency/digits+hits/hits/src/G4PVHit.cc b/source/persistency/digits+hits/hits/src/G4PVHit.cc
index 99341ed392..3ee325bd08 100644
--- a/source/persistency/digits+hits/hits/src/G4PVHit.cc
+++ b/source/persistency/digits+hits/hits/src/G4PVHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVHit.cc,v 1.4 1999/11/24 20:27:24 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PVHit.hh"
diff --git a/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc b/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
index cd4b00702a..ecaed03537 100644
--- a/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
+++ b/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVHitsCollection.cc,v 1.8 1999/11/28 21:54:16 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4PVHitsCollection
diff --git a/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc b/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
index 4f94d67bc1..64e31e5c0f 100644
--- a/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
+++ b/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentHitMan.cc,v 1.4 1999/11/28 21:54:16 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentHitMan 
 //
diff --git a/source/persistency/events/include/G4PEvent.ddl b/source/persistency/events/include/G4PEvent.ddl
index 8d4a0ac606..5b9efa0295 100644
--- a/source/persistency/events/include/G4PEvent.ddl
+++ b/source/persistency/events/include/G4PEvent.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PEvent.ddl,v 1.8 1999/11/28 21:54:17 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PEvent_h
diff --git a/source/persistency/events/include/G4PPrimaryParticle.ddl b/source/persistency/events/include/G4PPrimaryParticle.ddl
index 5b3ac0d0fd..c084419081 100644
--- a/source/persistency/events/include/G4PPrimaryParticle.ddl
+++ b/source/persistency/events/include/G4PPrimaryParticle.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPrimaryParticle.ddl,v 1.1 1999/12/05 22:32:25 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PPrimaryParticle_h
diff --git a/source/persistency/events/include/G4PPrimaryVertex.ddl b/source/persistency/events/include/G4PPrimaryVertex.ddl
index 96bbe16fbb..d2d5d3d9ce 100644
--- a/source/persistency/events/include/G4PPrimaryVertex.ddl
+++ b/source/persistency/events/include/G4PPrimaryVertex.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPrimaryVertex.ddl,v 1.7 1999/12/05 22:32:26 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/persistency/events/include/G4PersistentEventMan.hh b/source/persistency/events/include/G4PersistentEventMan.hh
index 4ce69bbe5c..36989936b3 100644
--- a/source/persistency/events/include/G4PersistentEventMan.hh
+++ b/source/persistency/events/include/G4PersistentEventMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentEventMan.hh,v 1.9 1999/11/28 21:54:17 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentEventMan 
 //
diff --git a/source/persistency/events/src/G4PEvent.cc b/source/persistency/events/src/G4PEvent.cc
index 0cd17994b9..a55d975b69 100644
--- a/source/persistency/events/src/G4PEvent.cc
+++ b/source/persistency/events/src/G4PEvent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PEvent.cc,v 1.10.2.1 1999/12/07 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PEvent.cc,v 1.11 1999/12/15 14:51:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // G4PEvent
diff --git a/source/persistency/events/src/G4PPrimaryParticle.cc b/source/persistency/events/src/G4PPrimaryParticle.cc
index 102872dcf2..53d0a39e44 100644
--- a/source/persistency/events/src/G4PPrimaryParticle.cc
+++ b/source/persistency/events/src/G4PPrimaryParticle.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPrimaryParticle.cc,v 1.1 1999/12/05 22:32:26 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PPrimaryParticle.hh"
diff --git a/source/persistency/events/src/G4PPrimaryVertex.cc b/source/persistency/events/src/G4PPrimaryVertex.cc
index ecd1e1797c..9ed4f5c776 100644
--- a/source/persistency/events/src/G4PPrimaryVertex.cc
+++ b/source/persistency/events/src/G4PPrimaryVertex.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPrimaryVertex.cc,v 1.6.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPrimaryVertex.cc,v 1.7 1999/12/15 14:51:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PPrimaryVertex.hh"
diff --git a/source/persistency/events/src/G4PersistentEventMan.cc b/source/persistency/events/src/G4PersistentEventMan.cc
index af599ef650..bc0843d87b 100644
--- a/source/persistency/events/src/G4PersistentEventMan.cc
+++ b/source/persistency/events/src/G4PersistentEventMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentEventMan.cc,v 1.15 1999/12/02 19:40:51 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentEventMan 
 //
diff --git a/source/persistency/geometry/global/include/G4PAffineTransform.ddl b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
index 12b9f279e0..64343b1991 100644
--- a/source/persistency/geometry/global/include/G4PAffineTransform.ddl
+++ b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAffineTransform.ddl,v 1.3.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAffineTransform.ddl,v 1.4 1999/12/15 14:51:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // persistenet class of G4AffineTransform
 //
diff --git a/source/persistency/geometry/global/include/G4PVSolid.ddl b/source/persistency/geometry/global/include/G4PVSolid.ddl
index 2e404b4e8c..b1312af411 100644
--- a/source/persistency/geometry/global/include/G4PVSolid.ddl
+++ b/source/persistency/geometry/global/include/G4PVSolid.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVSolid.ddl,v 1.2.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVSolid.ddl,v 1.3 1999/12/15 14:51:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVSolid
diff --git a/source/persistency/geometry/global/src/G4PAffineTransform.cc b/source/persistency/geometry/global/src/G4PAffineTransform.cc
index def9f85198..53ad05cfcd 100644
--- a/source/persistency/geometry/global/src/G4PAffineTransform.cc
+++ b/source/persistency/geometry/global/src/G4PAffineTransform.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAffineTransform.cc,v 1.1.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAffineTransform.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PAffineTransform
 //
diff --git a/source/persistency/geometry/global/src/G4PVSolid.cc b/source/persistency/geometry/global/src/G4PVSolid.cc
index 06fe72dd1a..736121d8b6 100644
--- a/source/persistency/geometry/global/src/G4PVSolid.cc
+++ b/source/persistency/geometry/global/src/G4PVSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVSolid.cc,v 1.1.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVSolid.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PVSolid
 //
diff --git a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
index 78cd812641..466ba3f2c1 100644
--- a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
+++ b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PGeometryObjectMap.ddl,v 1.3.2.1 1999/12/07 20:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PGeometryObjectMap.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PGeometryObjectMap 
 //
diff --git a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
index e697ca1dbe..cd30532f97 100644
--- a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PLogicalVolume.ddl,v 1.6.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PLogicalVolume.ddl,v 1.7 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PLogicalVolume
diff --git a/source/persistency/geometry/management/include/G4PPVParameterised.ddl b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
index dab7ad3f09..c0966c4af9 100644
--- a/source/persistency/geometry/management/include/G4PPVParameterised.ddl
+++ b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVParameterised.ddl,v 1.3.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVParameterised.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PPVParameterised
 //
diff --git a/source/persistency/geometry/management/include/G4PPVPlacement.ddl b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
index 658fe8b4ae..b9040659cf 100644
--- a/source/persistency/geometry/management/include/G4PPVPlacement.ddl
+++ b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVPlacement.ddl,v 1.3.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVPlacement.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //          P-versieon of G4PVPlacement      Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/include/G4PPVReplica.ddl b/source/persistency/geometry/management/include/G4PPVReplica.ddl
index c3411f0d50..a9b44bfca5 100644
--- a/source/persistency/geometry/management/include/G4PPVReplica.ddl
+++ b/source/persistency/geometry/management/include/G4PPVReplica.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVReplica.ddl,v 1.3.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVReplica.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PPVReplica
diff --git a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
index 4ee368800d..f42379340c 100644
--- a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVPhysicalVolume.ddl,v 1.3.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVPhysicalVolume.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PVPhysicalVolume
diff --git a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
index d58b423555..7afcee7e87 100644
--- a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+++ b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PersistentGeomMan.hh,v 1.7.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PersistentGeomMan.hh,v 1.8 1999/12/15 14:51:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentGeomMan 
 //
diff --git a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
index 7f01e500f6..aeb2ea81ba 100644
--- a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+++ b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PGeometryObjectMap.cc,v 1.3.2.1 1999/12/07 20:50:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PGeometryObjectMap.cc,v 1.5 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PGeometryObjectMap 
 //
@@ -91,7 +91,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume)  inGeomObj,
       transPhysVolPtrs[i] = outGeomObj;
       break;
     }
-    cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
+    G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
   }
 }
 
@@ -147,7 +147,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume)  inGeomObj,
       transLogVolPtrs[i] = outGeomObj;
       break;
     }
-    cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
+    G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
   }
 }
 
@@ -157,8 +157,8 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
 
 #ifdef G4PERSISTENCY_DEBUG
   cout << "G4PGeometryObjectMap::LookUp(G4VSolid) -- noSolids is "
-       << noSolids << endl;
-  cout << "  G4VSolid info: " << inGeomObj << endl;
+       << noSolids << G4endl;
+  cout << "  G4VSolid info: " << inGeomObj << G4endl;
 #endif
 
   assert(inGeomObj != NULL);
@@ -166,7 +166,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
   {
 #ifdef G4PERSISTENCY_DEBUG
     G4VSolid* tmpSolid = transSolidPtrs[i];
-    cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<endl;
+    cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<G4endl;
     cout             << "   persSolidPtrs[i]=";
     HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
     tmpPSolid.print();
@@ -202,7 +202,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
 
 #ifdef G4PERSISTENCY_DEBUG
   cout << "G4PGeometryObjectMap::LookUp(G4PVSolid) -- noSolids is "
-       << noSolids << endl;
+       << noSolids << G4endl;
   cout << "  G4PVSolid info:";
   inGeomObj.print(stdout);
 #endif
@@ -215,7 +215,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
     HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
     tmpPSolid.print();
     G4VSolid* tmpSolid = transSolidPtrs[i];
-    cout              << " transSolidPtrs[i]=" << tmpSolid <<endl;
+    cout              << " transSolidPtrs[i]=" << tmpSolid <<G4endl;
 #endif
     if( persSolidPtrs[i] == inGeomObj )
       return transSolidPtrs[i];
@@ -235,7 +235,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVSolid)  inGeomObj,
       transSolidPtrs[i] = outGeomObj;
       break;
     }
-    cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
+    G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
   }
 }
 
@@ -264,17 +264,18 @@ void G4PGeometryObjectMap::InitTransientMap()
   transSolidPtrs.resize(noSolids);
 
 #ifdef G4PERSISTENCY_DEBUG
-  cout << "G4PGeometryObjectMap::InitTransientMap()" << endl;
-  cout << " -- noPhysVol: " << noPhysVol << endl;
-  cout << " -- transPhysVolPtrs.length: " << transPhysVolPtrs.length() << endl;
-  cout << " -- transLogVolPtrs.length: "  << transLogVolPtrs.length()  << endl;
-  cout << " -- transSolidPtrs.length: "   << transSolidPtrs.length()   << endl;
+  cout << "G4PGeometryObjectMap::InitTransientMap()" << G4endl;
+  cout << " -- noPhysVol: " << noPhysVol << G4endl;
+  cout << " -- transPhysVolPtrs.length: " << transPhysVolPtrs.length() << G4endl;
+  cout << " -- transLogVolPtrs.length: "  << transLogVolPtrs.length()  << G4endl;
+  cout << " -- transSolidPtrs.length: "   << transSolidPtrs.length()   << G4endl;
 #endif
 
-  for(G4int i=0;i<noPhysVol;i++)
+  G4int i;
+  for(i=0;i<noPhysVol;i++)
     transPhysVolPtrs[i] = NULL;
-  for(G4int i=0;i<noLogVol;i++)
+  for(i=0;i<noLogVol;i++)
     transLogVolPtrs[i] = NULL;
-  for(G4int i=0;i<noSolids;i++)
+  for(i=0;i<noSolids;i++)
     transSolidPtrs[i] = NULL;
 }
diff --git a/source/persistency/geometry/management/src/G4PLogicalVolume.cc b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
index 20c9c3eb60..46f70175d7 100644
--- a/source/persistency/geometry/management/src/G4PLogicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PLogicalVolume.cc,v 1.3.2.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PLogicalVolume.cc,v 1.4 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //                                      Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/src/G4PPVParameterised.cc b/source/persistency/geometry/management/src/G4PPVParameterised.cc
index de927d5bb1..e9d4857f12 100644
--- a/source/persistency/geometry/management/src/G4PPVParameterised.cc
+++ b/source/persistency/geometry/management/src/G4PPVParameterised.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVParameterised.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PPVPlacement.cc b/source/persistency/geometry/management/src/G4PPVPlacement.cc
index e9896f407c..48cc60dca1 100644
--- a/source/persistency/geometry/management/src/G4PPVPlacement.cc
+++ b/source/persistency/geometry/management/src/G4PPVPlacement.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVPlacement.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PPVReplica.cc b/source/persistency/geometry/management/src/G4PPVReplica.cc
index 3692ad04c9..e799673f31 100644
--- a/source/persistency/geometry/management/src/G4PPVReplica.cc
+++ b/source/persistency/geometry/management/src/G4PPVReplica.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPVReplica.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
index aea3eb3b76..86edb149d8 100644
--- a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PVPhysicalVolume.cc,v 1.2.4.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //                         Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
index f4726f5cdd..a27080b55e 100644
--- a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+++ b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PersistentGeomMan.cc,v 1.9.2.1 1999/12/07 20:50:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PersistentGeomMan.cc,v 1.11 2000/02/23 13:10:36 morita Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentGeomMan 
 //
@@ -87,7 +87,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
     {
       G4cerr << "G4PersistentGeomMan::Store"
              << " -- error in naming the geometry object map: "
-             << f_GeomMapScopeName << endl;
+             << f_GeomMapScopeName << G4endl;
       return false;
     }
 
@@ -95,8 +95,8 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
   else
   {
     G4cerr << "G4PersistentGeomMan: Geometry alreday stored in the"
-           << "geometry database." << endl
-           << "  Geometry not stored." << endl;
+           << "geometry database." << G4endl
+           << "  Geometry not stored." << G4endl;
     return false;
   }
   // ----------------------- Objectivity Feature ----------------------- //
@@ -113,7 +113,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
   }
   else
   {
-    G4cerr << "G4PersistentGeomMan: Error in storing geometry." << endl;
+    G4cerr << "G4PersistentGeomMan: Error in storing geometry." << G4endl;
     return false;
   }
 
@@ -130,7 +130,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   {
     G4cerr << "G4PersistentGeomMan::Retrieve"
            << " -- error in looking up the geometry object map: "
-           << f_GeomMapScopeName << endl;
+           << f_GeomMapScopeName << G4endl;
     return false;
   }
   // ----------------------- Objectivity Feature ----------------------- //
@@ -139,20 +139,20 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   {
     G4cerr << "G4PersistentGeomMan::Retrieve()"
            << " -- error in searching the geometry object map: "
-           << f_GeomMapScopeName << endl;
+           << f_GeomMapScopeName << G4endl;
     return false;
   }
 
   if(f_verboseLevel>2)
     G4cout << "G4PersistentGeomMan::Retrieve()"
-           << " -- f_GeomMap is loaded." << endl;
+           << " -- f_GeomMap is loaded." << G4endl;
 
   // initialize the transient part of the geometry object map
   f_GeomMap->InitTransientMap();
 
   if(f_verboseLevel>2)
     G4cout << "G4PersistentGeomMan::Retrieve(G4VPhysicalVolume*)"
-           << " -- f_GeomMap is initialized." << endl;
+           << " -- f_GeomMap is initialized." << G4endl;
 
   // loop through the number of solids in the database
   G4int nSolids = f_GeomMap->GetNoSolids();
@@ -168,7 +168,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   if(f_verboseLevel>2)
     G4cout << "G4PersistentGeomMan::Retrieve(G4VPhysicalVolume*)"
            << " -- Transient Solid is created for nSolids:" 
-           << nSolids << endl;
+           << nSolids << G4endl;
 
   // Locate the persistent world physics volume
   HepRef(G4PVPhysicalVolume) persWorld = f_GeomMap->GetWorldVolume();
@@ -177,7 +177,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   {
     G4cerr << "G4PersistentGeomMan::Retrieve"
            << " -- geometry object map does not have world volume."
-           << endl;
+           << G4endl;
     return false;
   }
 
@@ -191,7 +191,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   {
     G4cerr << "G4PersistentGeomMan::Retrieve"
            << " -- transient world volume is empty."
-           << endl;
+           << G4endl;
     return false;
   }
 
@@ -207,14 +207,14 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
   {
      G4cerr << "G4PersistentGeomMan::MakePersistentObject" <<
       " -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
-       << endl;
+       << G4endl;
     return NULL;
   }
 
   if( f_verboseLevel>2 && f_nRecursive % 1000 == 0 )
     G4cout << "G4PersistentGeomMan: "
            << "Physical Volume recursive depth is "
-           << f_nRecursive << endl;
+           << f_nRecursive << G4endl;
 
   // check if the persistent version of thePhysVol exists
   HepRef(G4PVPhysicalVolume) persPhysVol = f_GeomMap->LookUp(thePhysVol);
@@ -315,7 +315,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
 
     if(f_verboseLevel>3)
       G4cout << "G4PersistentGeomMan::MakePersistentObject (G4VSolid) "
-             << "-- theSolidType is " << theSolidType << endl;
+             << "-- theSolidType is " << theSolidType << G4endl;
 
     // Construct persistent and concrete solid object
     // according to the entity type of theSolid
@@ -393,7 +393,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
     else
     {
       G4cerr << " Warning (G4PersistentGeomMan): The solid type ("
-             << theSolidType << ") is not supported yet." << endl
+             << theSolidType << ") is not supported yet." << G4endl;
     }
 #endif
 
@@ -417,14 +417,14 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
   {
      G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
       " -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
-       << endl;
+       << G4endl;
     return NULL;
   }
 
   if( f_verboseLevel>2 && f_tRecursive % 1000 == 0 )
     G4cout << "G4PersistentGeomMan: "
            << "Physical Volume recursive depth is "
-           << f_tRecursive << endl;
+           << f_tRecursive << G4endl;
 
   // check if the transient version of persPhysVol exists
   G4VPhysicalVolume* thePhysVol = f_GeomMap->LookUp(persPhysVol);
@@ -476,7 +476,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
     if ( theSolid == NULL )
     {
       G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
-       " -- transient Solid not found for the persistent Solid" << endl;
+       " -- transient Solid not found for the persistent Solid" << G4endl;
     }
 
     // Construct the persistent version of theLogVol with theSolid
diff --git a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
index 00ee1c43b6..8f6b02c873 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PBox.ddl,v 1.2.2.1 1999/12/07 20:50:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PBox.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PBox
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
index c25c36864d..1d63e07169 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PCSGSolid.ddl,v 1.2.2.1 1999/12/07 20:50:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PCSGSolid.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 // class G4CSGSolid
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
index ae9f2695e2..2532c87d6c 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PCons.ddl,v 1.2.2.1 1999/12/07 20:50:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PCons.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4Cons
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PHype.ddl b/source/persistency/geometry/solids/CSG/include/G4PHype.ddl
index e1f4c76b11..39b3409c5e 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PHype.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PHype.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PHype.ddl,v 1.2.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PHype.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PHype
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
index 441194ad7f..d5cc96a43d 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PPara.ddl,v 1.3.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PPara.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PPara
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
index 7bcf648b08..f803bc4abb 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PSphere.ddl,v 1.3.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PSphere.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PSphere
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
index 0cd0b3c326..7e2a7c454f 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTorus.ddl,v 1.2.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTorus.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
index 424042ed18..6c1a537136 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTrap.ddl,v 1.3.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTrap.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PTrap
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
index 2746810ae4..4bd29096ae 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTrd.ddl,v 1.2.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTrd.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PTrd
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
index dc49915754..893bd2f485 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTubs.ddl,v 1.2.2.1 1999/12/07 20:50:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTubs.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/geometry/solids/CSG/src/G4PBox.cc b/source/persistency/geometry/solids/CSG/src/G4PBox.cc
index 0711722e47..71f73a641c 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PBox.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PBox.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PBox.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc b/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
index 71a46b8896..36dd72a7e7 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PCSGSolid.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // History:
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCons.cc b/source/persistency/geometry/solids/CSG/src/G4PCons.cc
index e836f0d838..a6b53ad230 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PCons.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PCons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PCons.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PCons
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PHype.cc b/source/persistency/geometry/solids/CSG/src/G4PHype.cc
index f5cd0e07ca..e34f9d1283 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PHype.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PHype.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PHype.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PHype
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PPara.cc b/source/persistency/geometry/solids/CSG/src/G4PPara.cc
index b8a9886b1d..ce0073eb14 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PPara.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PPara.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPara.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PPara
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PSphere.cc b/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
index a1e2f48b0c..058805ad49 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PSphere.cc,v 1.3 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PSphere
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
index f9fbcac8b4..fab682bf04 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTorus.cc,v 1.2.2.1 1999/12/07 20:50:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTorus.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrap.cc b/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
index e931317a67..c2ddf74652 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTrap.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PTrap
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
index 7db7804723..bc9ae81461 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PTrd.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PTrd.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Implementation for G4Trd class
@@ -54,11 +54,11 @@ G4PTrd::CheckAndSetAllParameters (G4double pdx1,  G4double pdx2,
           // G4double  Minimum_length= (1+per_thousand) * kCarTolerance/2.;
           //  FIX-ME : temporary solution for ZERO or very-small parameters.
           G4double  Minimum_length= kCarTolerance/2.;
-          fDx1=max(pdx1,Minimum_length); 
-          fDx2=max(pdx2,Minimum_length); 
-          fDy1=max(pdy1,Minimum_length); 
-          fDy2=max(pdy2,Minimum_length); 
-          fDz=max(pdz,Minimum_length);
+          fDx1=G4std::max(pdx1,Minimum_length); 
+          fDx2=G4std::max(pdx2,Minimum_length); 
+          fDy1=G4std::max(pdy1,Minimum_length); 
+          fDy2=G4std::max(pdy2,Minimum_length); 
+          fDz=G4std::max(pdz,Minimum_length);
         }
       else
         G4Exception("Error in G4PTrd::G4PTrd - One or more parameters are < 0");
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTubs.cc b/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
index 74df698cc0..856ac6b93d 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTubs.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/global/include/G4DatabaseTypes.hh b/source/persistency/global/include/G4DatabaseTypes.hh
index 84b9fa3cdb..1ece63426f 100644
--- a/source/persistency/global/include/G4DatabaseTypes.hh
+++ b/source/persistency/global/include/G4DatabaseTypes.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DatabaseTypes.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // file description:
diff --git a/source/persistency/global/include/G4PersistentSchema.hh b/source/persistency/global/include/G4PersistentSchema.hh
index f0f04bf058..2b290416b8 100644
--- a/source/persistency/global/include/G4PersistentSchema.hh
+++ b/source/persistency/global/include/G4PersistentSchema.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentSchema.hh,v 1.5 1999/12/05 22:32:26 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Persistent-capable schema definitions required for ooddlx processor
 //
diff --git a/source/persistency/global/include/G4PersistentTypes.hh b/source/persistency/global/include/G4PersistentTypes.hh
index e973d6b0d5..1a4fa9db2b 100644
--- a/source/persistency/global/include/G4PersistentTypes.hh
+++ b/source/persistency/global/include/G4PersistentTypes.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PersistentTypes.hh,v 1.1.4.1 1999/12/07 20:50:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PersistentTypes.hh,v 1.2 1999/12/15 14:51:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Persistent-capable typedefs for Geant4/Persistency category
diff --git a/source/persistency/global/include/G4VPersistentSubDbMan.hh b/source/persistency/global/include/G4VPersistentSubDbMan.hh
index 211c9e8e50..b83a8a69d9 100644
--- a/source/persistency/global/include/G4VPersistentSubDbMan.hh
+++ b/source/persistency/global/include/G4VPersistentSubDbMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistentSubDbMan.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VPersistentSubDbMan 
 //
diff --git a/source/persistency/global/include/G4VPersistentSubMan.hh b/source/persistency/global/include/G4VPersistentSubMan.hh
index 57c8ab4ac1..e22a36682c 100644
--- a/source/persistency/global/include/G4VPersistentSubMan.hh
+++ b/source/persistency/global/include/G4VPersistentSubMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistentSubMan.hh,v 1.2 1999/11/25 11:33:07 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VPersistentSubMan 
 //
diff --git a/source/persistency/global/src/G4VPersistentSubDbMan.cc b/source/persistency/global/src/G4VPersistentSubDbMan.cc
index 6622bab0e5..98bdbbf5f2 100644
--- a/source/persistency/global/src/G4VPersistentSubDbMan.cc
+++ b/source/persistency/global/src/G4VPersistentSubDbMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistentSubDbMan.cc,v 1.2 1999/11/26 20:37:00 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VPersistentSubDbMan 
 //
diff --git a/source/persistency/global/src/G4VPersistentSubMan.cc b/source/persistency/global/src/G4VPersistentSubMan.cc
index e5ae735e01..1559d3c595 100644
--- a/source/persistency/global/src/G4VPersistentSubMan.cc
+++ b/source/persistency/global/src/G4VPersistentSubMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistentSubMan.cc,v 1.2 1999/11/25 11:33:08 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4VPersistentSubMan 
 //
diff --git a/source/persistency/management/include/G4PersistencyManager.hh b/source/persistency/management/include/G4PersistencyManager.hh
index 2bbfa7e5b4..7ac36d1df9 100644
--- a/source/persistency/management/include/G4PersistencyManager.hh
+++ b/source/persistency/management/include/G4PersistencyManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PersistencyManager.hh,v 1.14.2.1 1999/12/07 20:50:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PersistencyManager.hh,v 1.15 1999/12/15 14:51:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // History:
 // 98.01.08 Y.Morita  Initial version
diff --git a/source/persistency/management/include/G4PersistencyMessenger.hh b/source/persistency/management/include/G4PersistencyMessenger.hh
index f5e4c2dbcc..9278bbefb0 100644
--- a/source/persistency/management/include/G4PersistencyMessenger.hh
+++ b/source/persistency/management/include/G4PersistencyMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistencyMessenger.hh,v 1.4 1999/11/26 11:19:39 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/persistency/management/include/G4TransactionManager.hh b/source/persistency/management/include/G4TransactionManager.hh
index 377c5b97c8..ee4b7b3466 100644
--- a/source/persistency/management/include/G4TransactionManager.hh
+++ b/source/persistency/management/include/G4TransactionManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransactionManager.hh,v 1.5.2.1 1999/12/07 20:50:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TransactionManager.hh,v 1.6 1999/12/15 14:51:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // class description:
diff --git a/source/persistency/management/src/G4PersistencyManager.cc b/source/persistency/management/src/G4PersistencyManager.cc
index e26cfe5166..a623c44dbf 100644
--- a/source/persistency/management/src/G4PersistencyManager.cc
+++ b/source/persistency/management/src/G4PersistencyManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PersistencyManager.cc,v 1.15.2.1 1999/12/07 20:50:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PersistencyManager.cc,v 1.16 1999/12/15 14:51:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistencyManager 
 //
@@ -76,7 +76,7 @@ G4PersistencyManager::~G4PersistencyManager()
   // they are "persistent"!
 
   if(f_verboseLevel>0)
-    G4cout << "PersistencyManager is deleting." << endl;
+    G4cout << "PersistencyManager is deleting." << G4endl;
 }
 
 //----------------------------------------------------------------------------
@@ -92,9 +92,9 @@ G4bool G4PersistencyManager::Store(const G4Event* anEvent)
       G4cout << " -- G4PEvent " << f_pEventMan->CurrentEventID() << " stored in "
              << DBContainerName(kEventDB);
       if( f_transactionMan->SustainedMode() )
-        G4cout << " (sustained)" << endl;
+        G4cout << " (sustained)" << G4endl;
       else
-        G4cout << endl;
+        G4cout << G4endl;
     }
     f_transactionMan->Commit(kEventDB, false);
     return true;
@@ -103,7 +103,7 @@ G4bool G4PersistencyManager::Store(const G4Event* anEvent)
   {
     f_transactionMan->Abort(kEventDB, false);
     G4cerr << "G4PersistencyManager: Failed to store G4PEvent in "
-           << DBContainerName(kEventDB) << endl;
+           << DBContainerName(kEventDB) << G4endl;
     return false;
   }
 }
@@ -116,7 +116,7 @@ G4bool G4PersistencyManager::Store(const G4Run* aRun)
   {
     if( f_verboseLevel>0 )
       G4cout << " -- G4PRun " << f_pRunMan->CurrentRunID() << " stored in "
-             << DBContainerName(kRunDB) << endl;
+             << DBContainerName(kRunDB) << G4endl;
     f_transactionMan->Commit(kRunDB, false);
     return true;
   }
@@ -124,7 +124,7 @@ G4bool G4PersistencyManager::Store(const G4Run* aRun)
   {
     f_transactionMan->Abort(kRunDB, false);
     G4cerr << "G4PersistencyManager: Failed to store G4PRun in "
-           << DBContainerName(kRunDB) << endl;
+           << DBContainerName(kRunDB) << G4endl;
     return false;
   }
 }
@@ -137,7 +137,7 @@ G4bool G4PersistencyManager::Store(const G4VPhysicalVolume* aWorld)
   {
     if( f_verboseLevel>0 )
       G4cout << " -- Geometry stored in "
-             << DBContainerName(kGeomDB) << endl;
+             << DBContainerName(kGeomDB) << G4endl;
     f_transactionMan->Commit(kGeomDB, false);
     return true;
   }
@@ -145,7 +145,7 @@ G4bool G4PersistencyManager::Store(const G4VPhysicalVolume* aWorld)
   {
     f_transactionMan->Abort(kGeomDB, false);
     G4cerr << "G4PersistencyManager: Failed to store Geometry in "
-           << DBContainerName(kGeomDB) << endl;
+           << DBContainerName(kGeomDB) << G4endl;
     return false;
   }
 }
@@ -161,11 +161,11 @@ G4bool G4PersistencyManager::Retrieve(G4Event*& anEvent)
       if( anEvent )
         G4cout << " -- G4Event " << f_pEventMan->CurrentEventID()
                << " retrieved from "
-               << DBContainerName(kEventDB) << endl;
+               << DBContainerName(kEventDB) << G4endl;
       else
         G4cout << " -- scan of G4Event from "
                << DBContainerName(kEventDB)
-               << " is completed." << endl;
+               << " is completed." << G4endl;
     }
     f_transactionMan->Commit(kEventDB, false);
     return true;
@@ -174,7 +174,7 @@ G4bool G4PersistencyManager::Retrieve(G4Event*& anEvent)
   {
     f_transactionMan->Abort(kEventDB, false);
     G4cerr << "G4PersistencyManager: Failed to retrieve G4Event from "
-           << DBContainerName(kEventDB) << endl;
+           << DBContainerName(kEventDB) << G4endl;
     return false;
   }
 }
@@ -190,11 +190,11 @@ G4bool G4PersistencyManager::Retrieve(G4Run*& aRun)
       if( aRun )
         G4cout << " -- G4Run " << f_pRunMan->CurrentRunID()
                << " retrieved from "
-               << DBContainerName(kRunDB) << "." << endl;
+               << DBContainerName(kRunDB) << "." << G4endl;
       else
         G4cout << " -- scan of G4Run from "
                << DBContainerName(kRunDB)
-               << " is completed." << endl;
+               << " is completed." << G4endl;
     }
     f_transactionMan->Commit(kRunDB, false);
     return true;
@@ -203,7 +203,7 @@ G4bool G4PersistencyManager::Retrieve(G4Run*& aRun)
   {
     f_transactionMan->Abort(kRunDB, false);
     G4cerr << "G4PersistencyManager: Failed to retrieve G4Run from "
-           << DBContainerName(kRunDB) << endl;
+           << DBContainerName(kRunDB) << G4endl;
     return false;
   }
 }
@@ -218,7 +218,7 @@ G4bool G4PersistencyManager::Retrieve(G4VPhysicalVolume*& theWorld)
     {
       if( theWorld )
         G4cout << " -- Geometry retrieved from "
-               << DBContainerName(kGeomDB) << endl;
+               << DBContainerName(kGeomDB) << G4endl;
     }
     f_transactionMan->Commit(kGeomDB, false);
     return true;
@@ -227,7 +227,7 @@ G4bool G4PersistencyManager::Retrieve(G4VPhysicalVolume*& theWorld)
   {
     f_transactionMan->Abort(kGeomDB, false);
     G4cerr << "G4PersistencyManager: Failed to retrieve Geometry from "
-           << DBContainerName(kGeomDB) << endl;
+           << DBContainerName(kGeomDB) << G4endl;
     return false;
   }
 }
diff --git a/source/persistency/management/src/G4PersistencyMessenger.cc b/source/persistency/management/src/G4PersistencyMessenger.cc
index 44b775db3b..1e1dcf77bc 100644
--- a/source/persistency/management/src/G4PersistencyMessenger.cc
+++ b/source/persistency/management/src/G4PersistencyMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistencyMessenger.cc,v 1.7 1999/11/26 16:50:21 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PersistencyMessenger.hh"
diff --git a/source/persistency/management/src/G4TransactionManager.cc b/source/persistency/management/src/G4TransactionManager.cc
index 593cda9fbb..ad2247bd7a 100644
--- a/source/persistency/management/src/G4TransactionManager.cc
+++ b/source/persistency/management/src/G4TransactionManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransactionManager.cc,v 1.5.2.1 1999/12/07 20:50:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TransactionManager.cc,v 1.6 1999/12/15 14:51:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4TransactionManager 
 //
@@ -44,7 +44,7 @@ G4TransactionManager::G4TransactionManager(
   f_dbApp = new HepDbApplication(applicationName);
 
   // Open and Initialize a database
-  G4cout << "Opening federated database OO_FD_BOOT." << endl;
+  G4cout << "Opening federated database OO_FD_BOOT." << G4endl;
   f_dbApp->init();
 
   // Locate or create run,event,geometry databases and containers
@@ -72,11 +72,11 @@ G4bool G4TransactionManager::StartTransaction(
     case kAlreadySelected:
       if(f_verboseLevel>2)
         G4cout << "G4TransactionManager: Sustained transaction for /"
-               << DBName(f_whichDB) << "/ already in progress." << endl;
+               << DBName(f_whichDB) << "/ already in progress." << G4endl;
       break;
     case kCannotOverride:
       G4cerr << "G4TransactionManager: Cannot override the existing "
-             << "transaction for /" << DBName(f_whichDB) << "/" << endl;
+             << "transaction for /" << DBName(f_whichDB) << "/" << G4endl;
       return false;
       break;
     case kStartNewSustained:
@@ -89,7 +89,7 @@ G4bool G4TransactionManager::StartTransaction(
       f_dbApp->commit();
       if(f_verboseLevel>1)
         G4cout << "Sustained transaction for /" << DBName(f_whichDB)
-               << "/ is paused." << endl;
+               << "/ is paused." << G4endl;
       DoStart(dbtype, dbmode, false);
       break;
     case kStartNonSustained:
@@ -139,7 +139,7 @@ G4bool G4TransactionManager::DoStart(ETypeOfDB dbtype,
   if( aDBref == NULL )
   {
     G4cerr << "G4TransactionManager: Could not create or find /"
-           << DBName(dbtype) << "/ database." << endl;
+           << DBName(dbtype) << "/ database." << G4endl;
     return false;
   }
   SetDB( dbtype, aDBref );
@@ -148,7 +148,7 @@ G4bool G4TransactionManager::DoStart(ETypeOfDB dbtype,
   if( aContRef == NULL )
   {
     G4cerr << "G4TransactionManager: Could not create or find /"
-           << ContainerName(dbtype) << "/ container." << endl;
+           << ContainerName(dbtype) << "/ container." << G4endl;
     return false;
   }
   SetContainer( dbtype, aContRef );
@@ -160,9 +160,9 @@ G4bool G4TransactionManager::DoStart(ETypeOfDB dbtype,
     G4cout << "Transaction started for /" << DBName(dbtype) << "/"
            << ContainerName(dbtype) << "/ with ";
     if(isSustained)
-      G4cout << "sustained mode." << endl;
+      G4cout << "sustained mode." << G4endl;
     else
-      G4cout << "non-sustained mode." << endl;
+      G4cout << "non-sustained mode." << G4endl;
   }
 
   return true;
@@ -178,14 +178,14 @@ G4bool G4TransactionManager::Commit(ETypeOfDB dbtype, G4bool isSustained)
 
       if(f_verboseLevel>1)
         G4cout << "Transaction is committed on /" << DBName(dbtype)
-               << "/" << ContainerName(dbtype) << "/" << endl;
+               << "/" << ContainerName(dbtype) << "/" << G4endl;
 
       if( f_isSustained && dbtype != f_whichDB )
       {
         StartTransaction( f_whichDB, f_transactionMode, true );
         if(f_verboseLevel>1)
           G4cout << "Resumeing transaction on /" << DBName(f_whichDB)
-                 << "/" << ContainerName(f_whichDB) << "/" << endl;
+                 << "/" << ContainerName(f_whichDB) << "/" << G4endl;
       }
       else
       {
@@ -198,9 +198,9 @@ G4bool G4TransactionManager::Commit(ETypeOfDB dbtype, G4bool isSustained)
   else
   {
     G4cerr << "Error: Commit() received on /" << DBName(dbtype)
-           << "/" << ContainerName(dbtype) << "/" << endl
+           << "/" << ContainerName(dbtype) << "/" << G4endl
            << "       Current transaction is on /" << DBName(f_currentDB)
-           << "/" << ContainerName(f_currentDB) << "/" << endl;
+           << "/" << ContainerName(f_currentDB) << "/" << G4endl;
     return false;
   }
 }
@@ -215,14 +215,14 @@ G4bool G4TransactionManager::Abort(ETypeOfDB dbtype, G4bool isSustained)
 
       if(f_verboseLevel>1)
         G4cout << "Transaction is aborted on /" << DBName(dbtype)
-               << "/" << ContainerName(dbtype) << "/" << endl;
+               << "/" << ContainerName(dbtype) << "/" << G4endl;
 
       if( f_isSustained && dbtype != f_whichDB )
       {
         StartTransaction( f_whichDB, f_transactionMode, true );
         if(f_verboseLevel>1)
           G4cout << "Resumeing transaction on /" << DBName(f_whichDB)
-                 << "/" << ContainerName(f_whichDB) << "/" << endl;
+                 << "/" << ContainerName(f_whichDB) << "/" << G4endl;
       }
       else
       {
@@ -235,9 +235,9 @@ G4bool G4TransactionManager::Abort(ETypeOfDB dbtype, G4bool isSustained)
   else
   {
     G4cerr << "Error: Abort() received on /" << DBName(dbtype)
-           << "/" << ContainerName(dbtype) << "/" << endl
+           << "/" << ContainerName(dbtype) << "/" << G4endl
            << "       Current transaction is on /" << DBName(f_currentDB)
-           << "/" << ContainerName(f_currentDB) << "/" << endl;
+           << "/" << ContainerName(f_currentDB) << "/" << G4endl;
     return false;
   }
 }
@@ -262,14 +262,14 @@ G4bool G4TransactionManager::SelectDB( ETypeOfDB dbtype,
 
     if(f_verboseLevel>0)
       G4cout << "Set database to /"
-             << DBName(dbtype) << "/." << endl;
+             << DBName(dbtype) << "/." << G4endl;
   }
   else
   {
     Abort( dbtype, false );
     SetDBName(dbtype, oldDBname);
     G4cerr << "G4TransactionManager: Failed to set database /"
-             << DBName(dbtype) << "/." << endl;
+             << DBName(dbtype) << "/." << G4endl;
     theStatus = false;
   }
 
diff --git a/source/persistency/run/include/G4PRun.ddl b/source/persistency/run/include/G4PRun.ddl
index 0a3af93855..deea40b1ba 100644
--- a/source/persistency/run/include/G4PRun.ddl
+++ b/source/persistency/run/include/G4PRun.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PRun.ddl,v 1.5.2.1 1999/12/07 20:50:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PRun.ddl,v 1.6 1999/12/15 14:51:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4PRun_h
diff --git a/source/persistency/run/include/G4PersistentRunMan.hh b/source/persistency/run/include/G4PersistentRunMan.hh
index a4f6c8f9fe..f6932e3935 100644
--- a/source/persistency/run/include/G4PersistentRunMan.hh
+++ b/source/persistency/run/include/G4PersistentRunMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentRunMan.hh,v 1.8 1999/11/28 21:54:21 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentRunMan 
 //
diff --git a/source/persistency/run/src/G4PRun.cc b/source/persistency/run/src/G4PRun.cc
index 62a7a3858d..bc53307cac 100644
--- a/source/persistency/run/src/G4PRun.cc
+++ b/source/persistency/run/src/G4PRun.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PRun.cc,v 1.4.2.1 1999/12/07 20:50:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PRun.cc,v 1.5 1999/12/15 14:51:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4Run.hh"
diff --git a/source/persistency/run/src/G4PersistentRunMan.cc b/source/persistency/run/src/G4PersistentRunMan.cc
index 048a390c36..30d5cd2e30 100644
--- a/source/persistency/run/src/G4PersistentRunMan.cc
+++ b/source/persistency/run/src/G4PersistentRunMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentRunMan.cc,v 1.8 1999/11/28 21:54:22 morita Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // class G4PersistentRunMan 
 //
diff --git a/source/processes/decay/include/G4Decay.hh b/source/processes/decay/include/G4Decay.hh
index 820e12254e..e4b6ff7f4f 100644
--- a/source/processes/decay/include/G4Decay.hh
+++ b/source/processes/decay/include/G4Decay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Decay.hh,v 1.2.8.1 1999/12/07 20:50:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/processes/decay/src/G4Decay.cc b/source/processes/decay/src/G4Decay.cc
index 943e790a3e..5281146b95 100644
--- a/source/processes/decay/src/G4Decay.cc
+++ b/source/processes/decay/src/G4Decay.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Decay.cc,v 1.3.8.1 1999/12/07 20:50:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Decay.cc,v 1.3.8.1.2.1 1999/12/08 17:34:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -44,7 +44,7 @@ G4Decay::G4Decay(const G4String& processName)
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
-    G4cerr << "G4Decay  constructor " << "  Name:" << processName << endl;
+    G4cerr << "G4Decay  constructor " << "  Name:" << processName << G4endl;
   }
 #endif
   aPhysicsTable = NULL;
@@ -87,10 +87,10 @@ G4double G4Decay::GetMeanLifeTime(const G4Track&    aTrack,
 
 #ifdef G4VERBOSE
    if (GetVerboseLevel()>1) {
-     G4cerr << "G4Decay::GetMeanLifeTime() "<< endl;
+     G4cerr << "G4Decay::GetMeanLifeTime() "<< G4endl;
      G4cerr << "KineticEnergy:" << aParticle->GetKineticEnergy()/GeV <<"[GeV]";
      G4cerr << "Mass:" << aParticle->GetMass()/GeV <<"[GeV]"; 
-     G4cerr << "Life time: "<< aLife/ns << "[ns]" << endl;
+     G4cerr << "Life time: "<< aLife/ns << "[ns]" << G4endl;
    }
 #endif
 
@@ -107,7 +107,7 @@ G4double G4Decay::GetMeanLifeTime(const G4Track&    aTrack,
 
 #ifdef G4VERBOSE
    if (GetVerboseLevel()>1) {
-     G4cerr << "mean life time: "<< meanlife/ns << "[ns]" << endl;
+     G4cerr << "mean life time: "<< meanlife/ns << "[ns]" << G4endl;
    }
 #endif
 
@@ -130,10 +130,10 @@ G4double G4Decay::GetMeanFreePath(const G4Track& aTrack,G4double, G4ForceConditi
 
 #ifdef G4VERBOSE
    if (GetVerboseLevel()>1) {
-     G4cerr << "G4Decay::GetMeanFreePath() "<< endl;
+     G4cerr << "G4Decay::GetMeanFreePath() "<< G4endl;
      G4cerr << "KineticEnergy:" << aParticle->GetKineticEnergy()/GeV <<"[GeV]";
      G4cerr << "Mass:" << aMass/GeV <<"[GeV]"; 
-     G4cerr << "c*Tau:" << aCtau/m <<"[m]" <<endl; 
+     G4cerr << "c*Tau:" << aCtau/m <<"[m]" <<G4endl; 
    }
 #endif
 
@@ -153,7 +153,7 @@ G4double G4Decay::GetMeanFreePath(const G4Track& aTrack,G4double, G4ForceConditi
      pathlength =  DBL_MAX;
 #ifdef G4VERBOSE
      if (GetVerboseLevel()>1) {
-       G4cerr << " Zero Mass particle " << endl;
+       G4cerr << " Zero Mass particle " << G4endl;
      }
 #endif
    } else {
@@ -174,7 +174,7 @@ G4double G4Decay::GetMeanFreePath(const G4Track& aTrack,G4double, G4ForceConditi
 #ifdef G4VERBOSE
        if (GetVerboseLevel()>1) {
 	 G4cerr << "G4Decay::GetMeanFreePath()   !!particle stops!!";
-         G4cerr << aParticleDef->GetParticleName() << endl;
+         G4cerr << aParticleDef->GetParticleName() << G4endl;
 	 G4cerr << "KineticEnergy:" << aParticle->GetKineticEnergy()/GeV <<"[GeV]";
        }
 #endif
@@ -186,7 +186,7 @@ G4double G4Decay::GetMeanFreePath(const G4Track& aTrack,G4double, G4ForceConditi
    }
 #ifdef G4VERBOSE
    if (GetVerboseLevel()>1) {
-     G4cerr << "mean free path: "<< pathlength/m << "[m]" << endl;
+     G4cerr << "mean free path: "<< pathlength/m << "[m]" << G4endl;
    }
 #endif
    return  pathlength;
@@ -198,7 +198,7 @@ void G4Decay::BuildPhysicsTable(const G4ParticleDefinition&)
   if (aPhysicsTable != NULL) return;
 
   // create  aPhysicsTable
-  if (GetVerboseLevel()>1) G4cerr <<" G4Decay::BuildPhysicsTable() "<< endl;
+  if (GetVerboseLevel()>1) G4cerr <<" G4Decay::BuildPhysicsTable() "<< G4endl;
   aPhysicsTable = new G4PhysicsTable(1);
  
   //create physics vector 
@@ -243,7 +243,7 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
 #ifdef G4VERBOSE
       if (GetVerboseLevel()>0) {
 	G4cerr <<  "G4Decay::DoIt  : decay table not defined  for";
-        G4cerr << aParticle->GetDefinition()->GetParticleName()<< endl;
+        G4cerr << aParticle->GetDefinition()->GetParticleName()<< G4endl;
       }
 #endif
       fParticleChangeForDecay.SetNumberOfSecondaries(0);
@@ -260,7 +260,7 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
 	// decay channel not found
 #ifdef G4VERBOSE
 	if (GetVerboseLevel()>0) {
-	  G4cerr <<  "G4Decay::DoIt  : can not determine decay channel " <<endl;
+	  G4cerr <<  "G4Decay::DoIt  : can not determine decay channel " <<G4endl;
 	  decaytable ->DumpInfo();
 	}
 #endif
@@ -269,7 +269,7 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
 	// execute DecayIt() 
 #ifdef G4VERBOSE
 	if (GetVerboseLevel()>1) {
-	  G4cerr << "G4Decay::DoIt  : selected decay channel  addr:" << decaychannel <<endl;
+	  G4cerr << "G4Decay::DoIt  : selected decay channel  addr:" << decaychannel <<G4endl;
 	  temp = decaychannel->GetVerboseLevel();
 	  decaychannel->SetVerboseLevel(GetVerboseLevel());
 	}
@@ -314,8 +314,8 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
     G4cerr << " X:" << (aTrack.GetPosition()).x() /cm << "[cm]";
     G4cerr << " Y:" << (aTrack.GetPosition()).y() /cm << "[cm]";
     G4cerr << " Z:" << (aTrack.GetPosition()).z() /cm << "[cm]";
-    G4cerr << endl;
-    G4cerr << "G4Decay::DoIt  : decay products in Lab. Frame" << endl;
+    G4cerr << G4endl;
+    G4cerr << "G4Decay::DoIt  : decay products in Lab. Frame" << G4endl;
     products->DumpInfo();
   }
 #endif
diff --git a/source/processes/electromagnetic/lowenergy/History b/source/processes/electromagnetic/lowenergy/History
new file mode 100644
index 0000000000..38753e4601
--- /dev/null
+++ b/source/processes/electromagnetic/lowenergy/History
@@ -0,0 +1,28 @@
+$Id: History,v 1.2 2000/01/21 13:36:11 vnivanch Exp $
+-------------------------------------------------------------------
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                      Category History file
+                      ---------------------
+This file should be used by G4 developers and category coordinators
+to briefly summarize all major modifications introduced in the code
+and keep track of all category-tags.
+It DOES NOT substitute the  CVS log-message one should put at every
+committal in the CVS repository !
+
+     ----------------------------------------------------------
+     * Reverse chronological order (last date on top), please *
+     ----------------------------------------------------------
+
+21.01.2000 - Vladimir Ivanchenko update 
+             1) G4hLowEnergyIonisation.cc Barkas effect calculation
+                and inicialisation 
+             2) G4ionLowEnergyIonisation.cc remove double deleting of
+                MeanFreePath Table
+
+21.01.2000 - create by Michel Maire
+
+
diff --git a/source/processes/electromagnetic/lowenergy/include/G4Epdl89File.hh b/source/processes/electromagnetic/lowenergy/include/G4Epdl89File.hh
deleted file mode 100644
index 924f914533..0000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4Epdl89File.hh
+++ /dev/null
@@ -1,69 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4Epdl89File
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-#ifndef G4Epdl89File_hh
-#define G4Epdl89File_hh
-
-// Other Class Headers
-#include "globals.hh"
-#include "G4VDataFile.hh"
-#include "G4Data.hh"
-
-// C++ Headers
-#include <fstream.h>
-
-// Class Declarations
-
-class G4Epdl89File: public G4VDataFile{
-
-public:
-  
-  // Constructors
-  G4Epdl89File(const G4String&, G4int*);
-  
-  // Destructor 
-  ~G4Epdl89File();
-
-  virtual G4bool FindTheProcess(); 
-  virtual G4bool FindTheElement(G4int);
-  virtual G4bool FindOneElemProc(G4int&);
-
-protected:
-
-  // Member Functions
-
-  void GetDataValues(G4Data& valList);
-
-  G4double GetOneData(const char*);
-
-private:
-
-  G4int* _flags;                     // data flags
-};
-
-#endif // G4Epdl89File
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4Epdl97File.hh b/source/processes/electromagnetic/lowenergy/include/G4Epdl97File.hh
deleted file mode 100644
index 9ba74a66fb..0000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4Epdl97File.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4Epdl97File.hh
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-#ifndef G4Epdl97File_hh
-#define G4Epdl97File_hh
-
-// Other Class Headers
-#include "globals.hh"
-#include "G4VDataFile.hh"
-#include "G4Data.hh"
-
-// C++ Headers
-#include <fstream.h>
-
-// Class Declarations
-
-class G4Epdl97File: public G4VDataFile{
-
-public:
-  
-  // Constructors
-  G4Epdl97File(const G4String&, G4int*);
-  
-  // Destructor 
-  ~G4Epdl97File();
-
-  virtual G4bool FindTheProcess(); 
-  virtual G4bool FindTheElement(G4int);
-  virtual G4bool FindOneElemProc(G4int&);
-  G4int* GetTheProcFlags();
-
-protected:
-
-  // Member Functions
-  void GetDataValues(G4Data& valList);
-  G4double GetOneData(const char*);
-
-private:
-
-  G4int* _flags;                     // data flags
-};
-
-#endif // G4Epdl97File
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4EpdlTables.hh b/source/processes/electromagnetic/lowenergy/include/G4EpdlTables.hh
deleted file mode 100644
index 5c9db86e36..0000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4EpdlTables.hh
+++ /dev/null
@@ -1,89 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4EpdlTables
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-#ifndef G4EpdlTables_hh
-#define G4EpdlTables_hh
-
-// Base Class Header
-#include "G4VTables.hh"
-
-// Other Class Headers
-#include "globals.hh"
-#include "G4PhysicsTable.hh"
-#include "G4Data.hh"
-#include "G4FirstLevel.hh"
-#include "G4SecondLevel.hh"
-
-// C++ Headers
-
-// Class Declarations
-class G4VDataFile;
-
-class G4EpdlTables: public G4VTables{
-
-public:
-  
-  // Constructors
-  G4EpdlTables(G4VDataFile& DFile);
-  
-  // Destructor 
-  ~G4EpdlTables();
-
-  // Member Functions
-
-  // search the data table in the file
-  void FillDataTable();
-  G4SecondLevel* FillTheTable(G4int nemEl = 0);
-
-  // inline member functions
-
-  inline G4PhysicsTable* GetFstDataTable(){return theDataTable1;};
-  inline G4PhysicsTable* GetSndDataTable(){return theDataTable2;};
-  inline G4PhysicsTable* GetTrdDataTable(){return theDataTable3;};
-
-  //G4SecondLevel* GetGlobalList();
-
-protected:
-
-
-private:
-
-  G4PhysicsTable* theDataTable1;
-  G4PhysicsTable* theDataTable2;
-  G4PhysicsTable* theDataTable3;
-  //  G4SecondLevel* allElementList;
-
-  G4VDataFile& datfile;
-
-};
-
-#endif // G4EpdlTables
-
-
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
index a9be8c7b7c..4d9184393d 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyBremsstrahlung.hh,v 1.7.8.1 1999/12/07 20:50:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyBremsstrahlung.hh,v 1.9 2000/01/26 09:32:06 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,15 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyBremsstrahlung physics process ------
-//                     by Michel Maire, 24 July 1996
+//                     by A.Forti  1999/03/27 19:18:13
 // ************************************************************
-// 1-10-96 : new type G4OrderedTable;  ComputePartialSumSigma()
-// 20/03/97: new energy loss+ionisation+brems scheme, L.Urban
-// 01-09-98, new methods SetBining()  and PrintInfo() 
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyBremsstrahlung_h
 #define G4LowEnergyBremsstrahlung_h 1
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
index ed1a3c0f1a..fb7c86a421 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyBremsstrahlung.icc,v 1.9.8.1 1999/12/07 20:50:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyBremsstrahlung.icc,v 1.12 2000/02/18 12:34:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -14,13 +14,8 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyBremsstrahlung physics process ---------
-//                     by Michel Maire, 27 July 1996
-// ***************************************************************
-// 13-12-96 : Sign corrected in the ScreenFunctions, L.Urban
-// 20/03/97 : new energy loss+ionisation+brems scheme, L.Urban
+//                     by A.Forti 1999/03/27
 // ***************************************************************
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -29,7 +24,8 @@ inline G4bool G4LowEnergyBremsstrahlung::IsApplicable(
                             const G4ParticleDefinition& particle)
 {
    return(  (&particle == G4Electron::Electron())
-          ||(&particle == G4Positron::Positron()) );
+          /////////////||(&particle == G4Positron::Positron())
+	   );
 }
 
 inline G4double G4LowEnergyBremsstrahlung::GetMeanFreePath(const G4Track& track,
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
index 5a9c3aff7f..de500ef43f 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyCompton.hh,v 1.3.8.1 1999/12/07 20:50:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyCompton.hh,v 1.5 2000/01/26 09:43:16 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,18 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyCompton physics process ------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/03/02
 // ************************************************************
-// 01-02-96, First implementation A.Forti 
-// 21-06-96, SetCuts implementation, M.Maire
-// 06-01-97, crossection table + meanfreepath table, M.Maire
-// 17-02-97, New Physics scheme
-// 25-02-97, GetMeanFreePath() now is public function
-// 12-03-97, new physics scheme again
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyCompton_h
 #define G4LowEnergyCompton_h 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
index 20ad937985..d68ebf3b3f 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyCompton.icc,v 1.8.8.1 1999/12/07 20:50:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyCompton.icc,v 1.10 2000/01/26 09:43:16 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -14,10 +14,8 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyCompton physics process ---------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/03/02
 // ***************************************************************
 
 inline G4bool 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
index 4d6643565b..12f9e49801 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyGammaConversion.hh,v 1.2.8.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyGammaConversion.hh,v 1.4 2000/01/26 09:43:16 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,19 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyGammaConversion physics process ------
-//                   by Michel Maire, 24 May 1996
+//                   by A.Forti 1999/03/02
 // ************************************************************
-// 11-06-96, Added GetRandomAtom() method and new data member
-//           for cumulative total cross section, by M.Maire
-// 21-06-96, SetCuts inplementation, M.Maire
-// 16-09-96, Dynamical array PartialSumSigma, M.Maire
-// 14-01-97, crossection table + meanfreepath table.
-//           PartialSumSigma removed, M.Maire
-// 14-03-97, new physics scheme for geant4alpha, M.Maire
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyGammaConversion_h
 #define G4LowEnergyGammaConversion_h 1
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
index be5b7e8883..1885c3dd2e 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyGammaConversion.icc,v 1.6.8.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyGammaConversion.icc,v 1.8 2000/01/26 09:43:16 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -14,18 +14,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyGammaConversion physics process ---------
-//                   by Michel Maire, 24 May 1996
+//                   by A.Forti 1999/03/02
 // ***************************************************************
-// 11-06-96, in GetMeanFreePath() the partial sum is stored, by M.Maire
-// 16-09-96, dynamical array PartialSumSigma, by M.Maire
-// 13-12-96, Sign corrected in the ScreenFunctions, by L.Urban
-// 14-01-97, crossection table + meanfreepath table.
-//           PartialSumSigma removed, by M.Maire
-// 14-01-97, new physics scheme for geant4alpha, M.Maire
-// ---------------------------------------------------------------
 
 inline G4bool G4LowEnergyGammaConversion::IsApplicable(const G4ParticleDefinition& particle)
 {
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
index a691f976c2..282dc43562 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyIonisation.hh,v 1.11.6.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyIonisation.hh,v 1.12 1999/12/15 14:51:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
index a5d775a634..7e04655b9e 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyIonisation.icc,v 1.7.8.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyIonisation.icc,v 1.9 2000/02/18 12:34:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -28,7 +28,8 @@ inline G4bool G4LowEnergyIonisation::IsApplicable(
                             const G4ParticleDefinition& particle)
 {
    return(  (&particle == G4Electron::Electron())
-          ||(&particle == G4Positron::Positron()) );
+        /////////////////||(&particle == G4Positron::Positron()) 
+	  );
 }
          
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
index 4532aaad9d..1bd897ba60 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyPhotoElectric.hh,v 1.10.6.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyPhotoElectric.hh,v 1.12 2000/01/26 09:43:16 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,19 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyPhotoElectric physics process ------
-//                   by Michel Maire, April 1996
+//                   by A.Forti  1999/03/02
 // ************************************************************
-// 12-06-96, Added SelectRandomAtom() method and new data member
-//           for cumulative total cross section, by M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 17-09-96, Dynamic array PartialSumSigma
-//           split ComputeBindingEnergy(), M.Maire
-// 08-01-97, crossection table + meanfreepath table, M.Maire
-// 13-03-97, adapted for the new physics scheme, M.Maire
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyPhotoElectric_h
 #define G4LowEnergyPhotoElectric_h 1
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
index 910793e0d3..6f30eaaaf1 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyPhotoElectric.icc,v 1.11.6.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyPhotoElectric.icc,v 1.13 2000/01/26 09:43:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -14,18 +14,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyPhotoElectric physics process ---------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/03/02
 // ***************************************************************
-// 12-06-96, update by M.Maire
-// 17-09-96, PartialSumSigma(i)
-//           split ComputeBinbingEnergy(), M.Maire
-// 08-01-97, crossection table + meanfreepath table , M.Maire
-// 13-03-97, adapted for the new physics scheme, M.Maire
-// 20-11-97, change for lowest energy limit default action
-// ---------------------------------------------------------------
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
index c862e0ea73..6bfe6241d7 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyRayleigh.hh,v 1.3.8.1 1999/12/07 20:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyRayleigh.hh,v 1.5 2000/01/26 09:43:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,18 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyRayleigh physics process ------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/03/02
 // ************************************************************
-// 10-06-96, updated by M.Maire 
-// 21-06-96, SetCuts implementation, M.Maire
-// 06-01-97, crossection table + meanfreepath table, M.Maire
-// 17-02-97, New Physics scheme
-// 25-02-97, GetMeanFreePath() now is public function
-// 12-03-97, new physics scheme again
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyRayleigh_h
 #define G4LowEnergyRayleigh_h 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
index d8d0e46488..eea7f81d83 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyRayleigh.icc,v 1.7.8.1 1999/12/07 20:50:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyRayleigh.icc,v 1.9 2000/01/26 09:43:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -14,16 +14,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyRayleigh physics process ---------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/03/02
 // ***************************************************************
-// 10-06-96, updated by M.Maire
-// 06-01-97, crossection table + meanfreepath table, M.Maire
-// 12-03-97, new Physics scheme
-// 21-11-97, change for lowest energy limit default action
-// ---------------------------------------------------------------
 
 inline G4bool G4LowEnergyRayleigh::IsApplicable(const G4ParticleDefinition& particle){
    return ( &particle == G4Gamma::Gamma() ); 	
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
index 70192cba9f..b1c343a6e3 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyUtilities.hh,v 1.1.8.1 1999/12/07 20:50:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyUtilities.hh,v 1.4 2000/01/26 09:43:17 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -15,19 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyPhotoElectric physics process ------
-//                   by Michel Maire, April 1996
+//                   by A.Forti 1999/06/28
 // ************************************************************
-// 12-06-96, Added SelectRandomAtom() method and new data member
-//           for cumulative total cross section, by M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 17-09-96, Dynamic array PartialSumSigma
-//           split ComputeBindingEnergy(), M.Maire
-// 08-01-97, crossection table + meanfreepath table, M.Maire
-// 13-03-97, adapted for the new physics scheme, M.Maire
-// ------------------------------------------------------------
 
 #ifndef G4LowEnergyUtilities_h
 #define G4LowEnergyUtilities_h 1
@@ -92,7 +82,7 @@ inline G4int G4LowEnergyUtilities::FindBinLocation(const G4double arg, const G4D
   } while (lowerBound <= upperBound); 
 
   return upperBound;
-};
+}
 
 
 inline G4double G4LowEnergyUtilities::DataLogInterpolation(const G4double Argument, 
@@ -116,7 +106,7 @@ inline G4double G4LowEnergyUtilities::DataLogInterpolation(const G4double Argume
   theVal = pow(10,theVal);
 
   return theVal;
-};
+}
 
 inline G4int G4LowEnergyUtilities::FindBinLocation(const G4double arg, 
 						   const G4PhysicsVector* vec){
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VDataFile.hh b/source/processes/electromagnetic/lowenergy/include/G4VDataFile.hh
deleted file mode 100644
index a99f22234c..0000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4VDataFile.hh
+++ /dev/null
@@ -1,95 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4VDataFile
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-#ifndef G4VDataFile_hh
-#define G4VDataFile_hh
-
-// Other Class Headers
-#include "globals.hh"
-#include "G4Data.hh"
-
-// C++ Headers
-#include <fstream.h>
-
-class G4VDataFile{
-
-public:
-  
-  // Constructors
-  G4VDataFile(const G4String& file);
-  
-  // Destructor 
-  ~G4VDataFile();
-
-  // Member Functions
-  void OpenFile();
-  void CloseFile();
-  void Eof();
-  G4bool IsOpen();
-  void SeekPos(streampos);
-  streampos TellPos();
-
-  void GetLine();
-  G4int LineLength();
-  char* GetBuf();
-
-  virtual G4bool FindTheProcess() = 0;
-  virtual G4bool FindTheElement(G4int) = 0;
-  virtual G4bool FindOneElemProc(G4int& subsh) = 0;
-  virtual void GetDataValues(G4Data& valList) = 0;
-
-protected:
-
-  // Member Functions
-  void SetBufferSize(G4int);
-
-private:
-
-  const G4String& _filename;             // data file name
-  ifstream _istr;
-  G4int _bufSize;
-  char* buf;
-};
-
-#endif // G4VDataFile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VTables.hh b/source/processes/electromagnetic/lowenergy/include/G4VTables.hh
deleted file mode 100644
index 9eb0d893fd..0000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4VTables.hh
+++ /dev/null
@@ -1,61 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4VTables
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-#ifndef G4VTables_hh
-#define G4VTables_hh
-
-#include "globals.hh"
-#include "G4SecondLevel.hh"
-class G4VTables{
-
-public:
-  
-  // Constructors
-  G4VTables();
-  
-  // Destructor 
-  ~G4VTables();
-
-  // Member Functions
-
-  // search the data table in the file
-  virtual void FillDataTable() = 0;
-  virtual G4SecondLevel* FillTheTable(G4int nemEl = 0) = 0;
-
-protected:
-
-
-private:
-
-};
-
-#endif // G4VTables
-
-
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
index 47c158d2ec..5cf6841c80 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
@@ -78,15 +78,7 @@ protected:
 						  const G4ParticleDefinition& aParticleType,
 						  G4double KineticEnergy,
 						  G4double AtomicNumber);
-  
-  //--------------------------------------------------------start
-    virtual G4double ComputeBarkasTerm(
-    				       const G4Material* material,
-  				       const G4double KinEnergy,
-				       const G4double PartMass);
-  //Function to compute the Barkas term						  
-  //---------------------------------------------------------end
-    
+      
 public: // With description
   
   void SetStoppingPowerTableName(const G4String& dedxTable);
@@ -99,22 +91,28 @@ public: // With description
   // This method switch off calculation of the nuclear stopping power.
   
   void SetAntiProtonStoppingOn();
-  // This method switch on calculation of the loss table for antiproton
-  // using antiproron formulation (down to 100 keV).
+  // This method switch on calculation of the Barkas Effect for antiproton
   
   void SetAntiProtonStoppingOff();
-  // This method switch off calculation of the loss table for antiproton
-  // using antiproron formulation (down to 100 keV).
+  // This method switch on calculation of the Barkas Effect for antiproton
   
-  G4double GetParametrisedLoss(const G4Material* material,
-  			       const G4double KinEnergy,
-			       const G4double DeltaRayCutNow,
-			       const G4double PartMass,
-			       const G4double PartCharge);
+  virtual G4double GetParametrisedLoss(G4Material* aMaterial,
+  		        	       const G4double KinEnergy,
+			               const G4double DeltaRayCutNow);
   // This method returns parametrised energy loss.
-  // NEW**** modified totake account of the Barkas correction 
+
+  G4double GetPreciseDEDX(G4Material* aMaterial,
+  			  const G4double KinEnergy,
+		          const G4ParticleDefinition* aParticleType);
+  // This method returns electron ionisation energy loss for any energy.
+
+  G4double GetNuclearDEDX(G4Material* aMaterial,
+  			  const G4double KinEnergy,
+		          const G4ParticleDefinition* aParticleType);
+  // This method returns nuclear energy loss.
   
-  G4double GetBetheBlochLoss(const G4Material* material, const G4double KinEnergy,
+  G4double GetBetheBlochLoss(const G4Material* material, 
+                             const G4double KinEnergy,
 			     const G4double DeltaRayCutNow);
   // This method returns energy loss calculated via Bethe-Bloch formula.
   
@@ -205,6 +203,17 @@ public: // With description
   // The Stopping and Range of Ions in Matter,
   // Vol.1, Pergamon Press, 1985
 
+  G4double ComputeBarkasTerm(const G4Material* material, const G4double KinEnergy);
+  // Function to compute the Barkas term						  
+
+  G4double GetConstraints(const G4DynamicParticle *aParticle,
+                          G4Material *aMaterial);
+  // Function to determine StepLimit
+                                       
+  G4VParticleChange* AlongStepDoIt(const G4Track& trackData , 
+                                   const G4Step& stepData );
+  // Function to determine total energy deposition on the step
+
 private:
   
   // hide assignment operator 
@@ -234,8 +243,9 @@ protected:
   const G4double Factor;
   const G4double bg2lim;
   const G4double taulim;          // energy to start to switch off shell corrections
-  G4double RateMass;
-  G4double MassRatio;
+  G4double RateMass;              // m_e/M
+  G4double MassRatio;             // m_p/M
+  G4ParticleDefinition* theParticle;
   
   // particles , cuts in kinetic energy ........
   const G4Electron* theElectron;
diff --git a/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
index 7386ff2873..3a87ebac48 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
@@ -37,14 +37,14 @@ public: // Without description
   
   ~G4ionLowEnergyIonisation();
     
-  G4double GetIonParametrisedLoss(const G4Material* material, const G4double KinEnergy, 
-			       const G4double DeltaRayCutNow);
-
-  G4double GetIonBetheBlochLoss(const G4Material* material, const G4double KinEnergy,
-			     const G4double DeltaRayCutNow);
+  //  G4double GetIonParametrisedLoss(const G4Material* material, const G4double KinEnergy, 
+  //		       const G4double DeltaRayCutNow);
 
+  //  G4double GetIonBetheBlochLoss(const G4Material* material, const G4double KinEnergy,
+  //		     const G4double DeltaRayCutNow);
+			     
   G4double GetLowEnergyForParametrisation(const G4Material* material);
-
+  
   void PrintInfoDefinition();
 
 public: // With description
@@ -60,26 +60,20 @@ private:
   
   //  private data members ...............................
 
-  G4double GetConstraints(const G4DynamicParticle *aParticle,
-                          G4Material *aMaterial);
+  //  G4double GetConstraints(const G4DynamicParticle *aParticle,
+  //                      G4Material *aMaterial);
                                        
   G4double GetIonLossWithFluct(const G4DynamicParticle *aParticle,
                             G4Material *aMaterial,
                             G4double MeanLoss) ;
 
-  G4VParticleChange* AlongStepDoIt(const G4Track& track ,const G4Step& Step);
-
-  G4ParticleDefinition* theIon;
+  //  G4VParticleChange* AlongStepDoIt(const G4Track& track ,const G4Step& Step);
 
 protected:
   //  protected data members ...............................
-
-
     
 };
 
-//#include "G4ionLowEnergyIonisation.icc"
-
 #endif
  
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4Epdl89File.cc b/source/processes/electromagnetic/lowenergy/src/G4Epdl89File.cc
deleted file mode 100644
index 1f12a4a9b8..0000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4Epdl89File.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4Epdl89File
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-// This Class Header
-#include "G4Epdl89File.hh"
-
-//C++ Headers
-#include "CLHEP/String/Strings.h"
-
-// Constructors
-G4Epdl89File::G4Epdl89File(const G4String& filename, G4int* paramVec):
-  G4VDataFile(filename),
-  _flags(paramVec)
-{   
-  SetBufferSize(80);
-}
-
-// Destructor  
-G4Epdl89File::~G4Epdl89File()
-{
-}
-
-G4bool G4Epdl89File::FindTheElement(G4int numZ){
-
-  G4double llength = LineLength();
-  G4bool elementFound = FALSE;
-  HepString flag(GetBuf());
-
-  if(numZ){
-    if(llength == 70){
-      
-    }
-  }
-  return elementFound;
-}
-
-G4bool G4Epdl89File::FindTheProcess(){
-  
-  G4double llength = LineLength();
-  G4bool tableFound = FALSE;
-  
-  if(llength == 68){
-    
-    HepString flag(GetBuf());
-
-    if(_flags[0] == flag(0,2).toInt()){
-      
-      if(_flags[1] == flag(2,3).toInt()){
-	
-	if(_flags[2] == flag(5,3).toInt()){
-	  
-	  G4int subsh;
-	  G4int Xi3 = flag(31,1).toInt();
-	  
-	  if(Xi3 == 0){
-	    
-	    subsh = flag(22,1).toInt();
-	  }
-	  else if(Xi3 == 1){
-	    
-	    subsh = (flag(22,1) + flag(24,1)).toInt();
-	  }
-	  
-	  if(_flags[3] == subsh){
-	    
-	    tableFound = TRUE;
-	  }
-	}
-      }
-    }
-  }
-
-  return tableFound;
-}
-
-G4bool G4Epdl89File::FindOneElemProc(G4int& subsh){
-  
-  G4double llength = LineLength();
-  G4bool tableFound = FALSE;
-  
-  if(llength == 68){
-    
-    HepString flag(GetBuf());
-
-    if(_flags[0] == flag(0,2).toInt()){
-      
-      if(_flags[1] == flag(2,3).toInt()){
-
-	if(_flags[2] == flag(5,3).toInt()){
-	  
-	  G4int Xi3 = flag(31,1).toInt();
-	  
-	  if(Xi3 == 0){
-	    
-	    subsh = flag(22,1).toInt();
-	  }
-	  else if(Xi3 == 1){
-	    
-	    subsh = (flag(22,1) + flag(24,1)).toInt();
-	      
-	  }
-	  tableFound = TRUE;
-	}
-      }
-    }
-  }
-
-  return tableFound;
-}
-void G4Epdl89File::GetDataValues(G4Data& valList){
-  
-  char* token = 0;
-  G4int i = 0;
-
-  do{
-
-   if(i == 0){
-
-     token = strtok(GetBuf()," ");
-   }
-
-   else{
-
-     token = strtok(NULL," ");
-   }
-
-   if(token) {
-
-     valList.append(GetOneData(token));
-   }
-
-   i++;
-  }while(token);
-}
-
-
-G4double G4Epdl89File::GetOneData(const char* token){
-
-  HepString parts;
-  G4double floatTok = 0;
-  
-  if(token){  
-
-    parts = token;
-    
-    floatTok = parts.toFloat();
-  }
-
-  return floatTok;
-}
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4Epdl97File.cc b/source/processes/electromagnetic/lowenergy/src/G4Epdl97File.cc
deleted file mode 100644
index 0841b827b1..0000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4Epdl97File.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4Epdl97File
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-// This Class Header
-#include "G4Epdl97File.hh"
-
-//C++ Headers
-#include "CLHEP/String/Strings.h"
-
-// Constructors
-G4Epdl97File::G4Epdl97File(const G4String& filename, G4int* paramVec):
-  G4VDataFile(filename),
-  _flags(paramVec)
-{   
-  SetBufferSize(74);
-}
-
-// Destructor  
-G4Epdl97File::~G4Epdl97File()
-{
-}
-
-G4bool G4Epdl97File::FindTheElement(G4int numZ){
-
-  G4double llength = LineLength();
-  G4bool elementFound = FALSE;
-  HepString flag(GetBuf());
-
-  if(numZ){
-    if(llength == 70){
-      
-    }
-  }
-  return elementFound;
-}
-
-G4bool G4Epdl97File::FindTheProcess(){
-  
-  G4double llength = LineLength();
-  G4bool tableFound = FALSE;
-  HepString flag(GetBuf());
-
-  if(llength == 68 || llength == 69){
-
-    if(_flags[0] == flag(0,2).toInt()){
-
-      if(_flags[1] == flag(2,3).toInt()){
-
-	if(_flags[2] == flag(5,3).toInt()){
-	  
-	  G4int subsh;
-	  G4int Xi3 = flag(31,1).toInt();
-	  
-	  if(Xi3 == 0){
-	    
-	    subsh = flag(22,1).toInt();
-	  }
-	  else if(Xi3 == 1){
-	    
-	    subsh = (flag(22,1) + flag(24,1)).toInt();
-	  }
-	  
-	  if(_flags[3] == subsh){
-	    
-	    tableFound = TRUE;
-	  }
-	}
-      }
-    }
-  }
-
-  return tableFound;
-}
-
-G4bool G4Epdl97File::FindOneElemProc(G4int& subsh){
-  
-  G4double llength = LineLength();
-  G4bool tableFound = FALSE;
-  
-  if(llength == 68){
-    
-    HepString flag(GetBuf());
-    
-    if(_flags[0] == flag(0,2).toInt()){
-      
-      if(_flags[1] == flag(2,3).toInt()){
-	
-	if(_flags[2] == flag(5,3).toInt()){
-	  
-	  G4int Xi3 = flag(31,1).toInt(); 
-	  
-	  if(Xi3 == 0){
-	    
-	    subsh = flag(22,1).toInt();
-	  }
-	  else if(Xi3 == 1){
-	    
-	    subsh = (flag(22,1) + flag(24,1)).toInt();
-	  }
-	  
-	  tableFound = TRUE;
-	}
-      }
-    }
-  }
-
-  return tableFound;
-}
-
-G4int* G4Epdl97File::GetTheProcFlags(){ return _flags; }
-
-void G4Epdl97File::GetDataValues(G4Data& valList){
-
-  char* token = 0;
-  G4int i = 0;
-
-  do{
-
-   if(i == 0){
-
-     token = strtok(GetBuf()," ");
-   }
-   else{
-
-     token = strtok(NULL," ");
-   }
-
-   if(token) {
-
-     valList.append(GetOneData(token));
-   }
-
-   i++;
-  }while(token);
-}
-
-G4double G4Epdl97File::GetOneData(const char* token){
-
-  HepString parts, tot;
-  G4double floatTok = 0;
-  
-  if(token){
-
-    parts = token;
-
-    if(parts(8,1) == "-" || parts(8,1) == "+"){
-
-      tot = parts(0,8) + "E" + parts(8,2);
-    }
-    else{
-
-      tot = parts(0,7) + "E" + parts(7,3);
-    }
-
-    floatTok = tot.toFloat();
-  }
-
-  return floatTok;
-}
-
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4EpdlTables.cc b/source/processes/electromagnetic/lowenergy/src/G4EpdlTables.cc
deleted file mode 100644
index f24f250d40..0000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4EpdlTables.cc
+++ /dev/null
@@ -1,337 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4EpdlTables
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-// This class header
-#include "G4EpdlTables.hh"
-
-// Other Class Headers
-#include "G4VDataFile.hh"
-#include "G4DataVector.hh"
-#include "G4PhysicsFreeVector.hh"
-#include "CLHEP/String/Strings.h"
-
-// C++ Headers
-#include <iostream.h>
-#include <fstream.h>
-
-// Constructors
-G4EpdlTables::G4EpdlTables(G4VDataFile& DFile):
-  G4VTables(), 
-  datfile(DFile)
-{   
-  theDataTable1 = 0;
-  theDataTable2 = 0;
-  theDataTable3 = 0;
-  //  allElementList = 0;
-}
-
-// Destructor  
-G4EpdlTables::~G4EpdlTables()
-{
-
-}
-
-// Member Functions
-void G4EpdlTables::FillDataTable() {
-
-  // line counters
-  G4int numTable = 0;
-
-  // variables to flag 68 characters lines
-  G4bool lineMatch = FALSE;
-
-  // list of data vectors to be filled
-  G4FirstLevel vecList; 
-
-  G4int numBin = 100;
-
-  if(theDataTable1){    
-    
-    theDataTable1->clearAndDestroy(); delete theDataTable1;
-  }
-
-  if(theDataTable2){    
-    
-    theDataTable2->clearAndDestroy(); delete theDataTable2;
-  }
-
-  if(theDataTable3){    
-    
-    theDataTable3->clearAndDestroy(); delete theDataTable3;
-  }
-
-  theDataTable1 = new G4PhysicsTable(numBin);
-  theDataTable2 = new G4PhysicsTable(numBin);
-  theDataTable3 = new G4PhysicsTable(numBin);
-
-  //open input file
-  datfile.OpenFile();
-
-  // loop on the stream
-  for(;;){
-
-    datfile.Eof();
-
-    datfile.GetLine();
-
-    // lines counters
-    G4int llength = datfile.LineLength();
-    if(llength == 0) break;
-  
-    if(llength == 70){
-
-      HepString AtomicNum(datfile.GetBuf());
-      G4int numAtom = AtomicNum(0,3).toInt();
-    }
-
-    // search for the process flags line
-    if(llength == 68 || llength == 69) {
-
-	lineMatch = datfile.FindTheProcess();
-	continue;
-    }
-
-    G4double lvl;
-
-    if(llength < 68){
-
-      if(lineMatch == TRUE){
-
-	 //list of values in one line
-	G4Data values; 
-	
-	datfile.GetDataValues(values); 
-	lvl = values.length(); 
-
-	if(!vecList.entries()){
-	  
-	  for(G4int k = 0; k < lvl; k++){
-	  
-	    vecList.insert(new G4Data);
-	  }
-	}
-
-	for(G4int h = 0; h < lvl; h++){
-
-	  vecList[h]->append(values[h]);
-	}
-
-
-	// Clear the temporary list
-	values.clear();
-      }
-    }
-
-    if(llength == 72 || llength == 73){
-
-      // build the G4PhysicsTables
-
-      if(lineMatch == TRUE){
-
-	if(lvl >= 1){
-
-	  G4PhysicsFreeVector* freevec;
-
-	  freevec = new G4PhysicsFreeVector(*vecList[0],*vecList[1]);
-	  theDataTable1->insertAt(numTable, freevec);
-
-          if(lvl == 3){
-	    
-	    freevec = new G4PhysicsFreeVector(*vecList[0],*vecList[2]);
-            theDataTable2->insertAt(numTable, freevec);
-          }
-	  
-          if(lvl == 4){
-
-	    freevec = new G4PhysicsFreeVector(*vecList[0],*vecList[2]);
-            theDataTable2->insertAt(numTable, freevec);
-
-	    freevec = new G4PhysicsFreeVector(*vecList[0],*vecList[3]);
-            theDataTable3->insertAt(numTable, freevec);
-
-	  }
-	  
-	}
-
-	numTable++;
-	lineMatch = FALSE;
-	vecList.clearAndDestroy();
-
-	if(numTable == 99){
-	  
-	  break;
-	}
-      }
-    }
-  }// end for(;;)
-
-  if(theDataTable1->length() == 0){
-    delete theDataTable1;
-  }
-  
-  if(theDataTable2->length() == 0){
-    delete theDataTable2;
-  }
-  
-  if(theDataTable3->length() == 0){
-    delete theDataTable3;
-  }
-  
-} // end FillDataTable
-
-
-//G4SecondLevel* G4EpdlTables::GetGlobalList(){
-  
-//return new G4SecondLevel((*allElementList));
-//////}
-
-G4SecondLevel* G4EpdlTables::FillTheTable(G4int numEl) {
-
-  // line counters
-  G4int numTable = 0;
-
-  // variables to flag 68 characters lines
-  G4bool lineMatch = FALSE;
-
-  // list of data vectors to be filled
-  G4FirstLevel* vecList = new G4FirstLevel();
-
-  //  if(allElementList){ 
-    
-  //delete allElementList;
-  //}
-
-  G4SecondLevel* allElementList = new G4SecondLevel();
-
-  //open input file
-  datfile.OpenFile();
-
-  // loop on the stream
-  G4int subSh = 0;
-
-  for(;;){
-
-    datfile.Eof();
-
-    datfile.GetLine();
-
-    // lines counters
-    G4int llength = datfile.LineLength();
-
-    if(llength == 0) break;
-
-    G4int numAtom;
-
-    if(llength == 70){
-      
-      HepString AtomicNum(datfile.GetBuf());
-      numAtom = AtomicNum(0,3).toInt();
-      
-    }
-
-    // search for the process flags line
-    if(llength == 68 || llength == 69) {
-
-      if(numEl){
-	
-	if(numEl != numAtom){ 
-
-	  continue;
-	}
-
-	else{
-
-	  lineMatch = datfile.FindOneElemProc(subSh);
-	}
-      }
-      else{
-
-	lineMatch = datfile.FindTheProcess();
-      }
-      continue;
-    }
-
-    G4double lvl;
-
-    if(llength < 68){
-
-      if(lineMatch == TRUE){
-
-	 //list of values in one line
-	G4Data values; 
-	
-	datfile.GetDataValues(values); 
-
-	lvl = values.length(); 
-
-	if(!vecList->entries()){
-	
-	  for(G4int k = 0; k < lvl; k++){
-		
-	    vecList->insert(new G4Data);
-
-	  }
-	}
-
-	for(G4int h = 0; h < lvl; h++){
-
-	  (*vecList)[h]->insert(values[h]);
-	}
-
-	// Clear the temporary list
-	values.clear();
-      }
-    }
-
-    if(llength == 72 || llength == 73){
-
-      // build the G4PhysicsTables
-      if(lineMatch == TRUE){
-
-	allElementList->insert(vecList);
-	numTable++;
-	lineMatch = FALSE;
-	vecList = new G4FirstLevel();
-
-	if(numTable == 99){
-	  break;
-	}
-      }
-    }
-  }// end for(;;)
-  return allElementList;
-} // end FillDataTable
-
-
-
-
-
-
-     
-
-   
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
index 8a01754068..395181a994 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
@@ -5,8 +5,9 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyBremsstrahlung.cc,v 1.17.2.1 1999/12/07 20:50:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyBremsstrahlung.cc,v 1.21 2000/02/18 12:34:30 lefebure Exp $
+// $Id: G4LowEnergyBremsstrahlung.cc,v 1.21 2000/02/18 12:34:30 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,22 +16,14 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4LowEnergyBremsstrahlung physics process --------
-//                     by Michel Maire, 24 July 1996
 //      ------------ G4LowEnergyBremsstrahlung: low energy modifications --------
 //                   by Alessandra Forti, March 1999
 //
 // **************************************************************
-// 26-09-96 : extension of the total crosssection above 100 GeV, M.Maire
-//  1-10-96 : new type G4OrderedTable; ComputePartialSumSigma(), M.Maire
-// 16-10-96 : DoIt() call to the non static GetEnergyCuts(), L.Urban
-// 13-12-96 : Sign corrected in grejmax and greject
-//            error definition of screenvar, L.Urban
-// 20-03-97 : new energy loss+ionisation+brems scheme, L.Urban
-// 07-04-98 : remove 'tracking cut' of the diffracted particle, MMa
-// 13-08-98 : new methods SetBining() PrintInfo()
+// 17.02.2000 Veronique Lefebure
+//  - correct bug : the gamma energy was not deposited when the gamma was 
+//    not produced when its energy was < CutForLowEnergySecondaryPhotons
+//
 // Added Livermore data table construction methods A. Forti
 // Modified BuildMeanFreePath to read new data tables A. Forti
 // Modified PostStepDoIt to insert sampling with with EEDL data A. Forti
@@ -356,7 +349,7 @@ void G4LowEnergyBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aPart
 
            if(LPMGammaEnergyLimit > klim)
            {
-             G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
+             G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
 
              G4double floss = 0. ;
              G4int nmax = 1000 ;
@@ -844,12 +837,13 @@ G4VParticleChange* G4LowEnergyBremsstrahlung::PostStepDoIt(const G4Track& trackD
   else{
 
     aParticleChange.SetNumberOfSecondaries(0);
+    aParticleChange.SetLocalEnergyDeposit(GammaEnergy); 
   }
     
 #ifdef G4VERBOSE
   if(verboseLevel > 15){
 
-    G4cout<<"LE Bremsstrahlung PostStepDoIt"<<endl;
+    G4cout<<"LE Bremsstrahlung PostStepDoIt"<<G4endl;
   }
 #endif
   return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
@@ -877,10 +871,11 @@ G4Element* G4LowEnergyBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) co
 void G4LowEnergyBremsstrahlung::PrintInfoDefinition()
 {
   G4String comments = "Total cross sections from EEDL database";
-           comments += "Good description from 1 eV to 100 GeV.\n";
+           comments += "\n At present it can be used for electrons only ";
+           comments += "Good description from 250 eV to 100 GeV.\n";
            comments += "Gamma energy sampled from a parametrised formula.";
                      
-	   G4cout << endl << GetProcessName() << ":  " << comments<<endl;
+	   G4cout << G4endl << GetProcessName() << ":  " << comments<<G4endl;
 
 }         
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
index 0ef0952f6c..c1d3d8d54e 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyCompton.cc,v 1.15.6.1 1999/12/07 20:50:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyCompton.cc,v 1.17 2000/01/26 09:50:00 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,23 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4LowEnergyCompton physics process --------
-//                   by Michel Maire, April 1996
-
 //      ------------ G4LowEnergyCompton low energy modifications --------
 //                   by Alessandra Forti, October 1998
 // **************************************************************
-// 28-05-96, DoIt() small change in ElecDirection, by M.Maire
-// 10-06-96, simplification in ComputeMicroscopicCrossSection(), by M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 13-09-96, small changes in DoIt for better efficiency. Thanks to P.Urban
-// 06-01-97, crossection table + meanfreepath table, M.Maire
-// 05-03-97, new Physics scheme, M.Maire
-// 28-03-97, protection in BuildPhysicsTable, M.Maire
-// 07-04-98, remove 'tracking cut' of the scattered gamma, MMa
-// 04-06-98, in DoIt, secondary production condition: range>min(threshold,safety)
 // Added Livermore data table construction methods A. Forti
 // Modified BuildMeanFreePath to read new data tables A. Forti
 // Modified PostStepDoIt to insert sampling with EPDL97 data A. Forti
@@ -59,9 +45,9 @@ G4LowEnergyCompton::G4LowEnergyCompton(const G4String& processName)
     NumbBinTable(200)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
      G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << endl;
+     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
    }
 }
  
@@ -294,7 +280,7 @@ G4VParticleChange* G4LowEnergyCompton::PostStepDoIt(const G4Track& aTrack, const
   G4double ElecKineEnergy = GammaEnergy0 - GammaEnergy1 ;
   
   if (G4EnergyLossTables::GetRange(G4Electron::Electron(), ElecKineEnergy, aMaterial)
-      >= min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety())){
+      >= G4std::min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety())){
 
     G4double ElecMomentum = sqrt(ElecKineEnergy*(ElecKineEnergy+2.*electron_mass_c2));
     G4ThreeVector ElecDirection((GammaEnergy0*GammaDirection0 - 
@@ -314,7 +300,7 @@ G4VParticleChange* G4LowEnergyCompton::PostStepDoIt(const G4Track& aTrack, const
    }
 #ifdef G4VERBOSE
   if(verboseLevel > 0){
-    G4cout<<"LE Compton Effect PostStepDoIt"<<endl;
+    G4cout<<"LE Compton Effect PostStepDoIt"<<G4endl;
   }
 #endif  
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
index b06ede1cf2..2b6e5f256a 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyGammaConversion.cc,v 1.9.8.1 1999/12/07 20:50:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyGammaConversion.cc,v 1.11 2000/01/26 09:50:00 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,28 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyGammaConversion physics process --------
-//                   by Michel Maire, 24 May 1996
+//                   by A.Forti 1999/03/02
 // **************************************************************
-// 11-06-96, Added SelectRandomAtom() method, M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 24-06-96, simplification in ComputeMicroscopicCrossSection, M.Maire
-// 24-06-96, in DoIt : change the particleType stuff, M.Maire
-// 25-06-96, modification in the generation of the teta angle, M.Maire
-// 16-09-96, minors optimisations in DoIt. Thanks to P.Urban
-//           dynamical array PartialSumSigma
-// 13-12-96, fast sampling of epsil below 2 MeV, L.Urban
-// 14-01-97, crossection table + meanfreepath table.
-//           PartialSumSigma removed, M.Maire
-// 14-01-97, in DoIt the positron is always created, even with Ekine=0,
-//           for further annihilation, M.Maire
-// 14-03-97, new Physics scheme for geant4alpha, M.Maire
-// 28-03-97, protection in BuildPhysicsTable, M.Maire
-// 19-06-97, correction in ComputeMicroscopicCrossSection, L.Urban
-// 04-06-98, in DoIt, secondary production condition: range>min(threshold,safety)
-// --------------------------------------------------------------
 
 // This Class Header
 #include "G4LowEnergyGammaConversion.hh"
@@ -58,9 +39,9 @@ G4LowEnergyGammaConversion::G4LowEnergyGammaConversion(const G4String& processNa
     NumbBinTable(200)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
      G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/GeV << "GeV " << endl;
+     G4cout << "HighestEnergy: " << HighestEnergyLimit/GeV << "GeV " << G4endl;
    }
 }
  
@@ -196,11 +177,11 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
     // limits of the screening variable
     G4double screenfac = 136.*epsil0/(anElement->GetIonisation()->GetZ3()) ;
     G4double screenmax = exp ((42.24 - FZ)/8.368) - 0.952 ;
-    G4double screenmin = min(4.*screenfac,screenmax) ;
+    G4double screenmin = G4std::min(4.*screenfac,screenmax) ;
     
     // limits of the energy sampling
     G4double epsil1 = 0.5 - 0.5*sqrt(1. - screenmin/screenmax) ;
-    G4double epsilmin = max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
+    G4double epsilmin = G4std::max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
     
     //
     // sample the energy rate of the created electron (or positron) 
@@ -209,7 +190,7 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
     G4double  screenvar, greject ;
     
     G4double F10 = ScreenFunction1(screenmin) - FZ , F20 = ScreenFunction2(screenmin) - FZ;
-    G4double NormF1 = max(F10*epsilrange*epsilrange,0.) ,  NormF2 = max(1.5*F20,0.);
+    G4double NormF1 = G4std::max(F10*epsilrange*epsilrange,0.) ,  NormF2 = G4std::max(1.5*F20,0.);
     
     do {
       if ( NormF1/(NormF1+NormF2) > G4UniformRand() ){ 
@@ -272,10 +253,10 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
   G4double LocalEnerDeposit = 0. ;
   aParticleChange.SetNumberOfSecondaries(2) ; 
   
-  G4double ElectKineEnergy = max(0.,ElectTotEnergy - electron_mass_c2) ;
+  G4double ElectKineEnergy = G4std::max(0.,ElectTotEnergy - electron_mass_c2) ;
 
   if (G4EnergyLossTables::GetRange(G4Electron::Electron(), ElectKineEnergy, aMaterial)
-      >= min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
+      >= G4std::min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
 
     G4ThreeVector ElectDirection ( dirx, diry, dirz );
     ElectDirection.rotateUz(GammaDirection);   
@@ -292,10 +273,10 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
 
 // the e+ is always created (even with Ekine=0) for further annihilation.
 
-  G4double PositKineEnergy = max(0.,PositTotEnergy - electron_mass_c2) ;
+  G4double PositKineEnergy = G4std::max(0.,PositTotEnergy - electron_mass_c2) ;
 
   if (G4EnergyLossTables::GetRange(G4Positron::Positron(),PositKineEnergy,aMaterial)
-        < min(G4Positron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
+        < G4std::min(G4Positron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
 
     LocalEnerDeposit += PositKineEnergy ;
     PositKineEnergy = 0. ;
@@ -320,7 +301,7 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
   aParticleChange.SetStatusChange( fStopAndKill ) ;
 #ifdef G4VERBOSE
   if(verboseLevel > 15){
-    G4cout<<"LE Gamma Conversion PostStepDoIt"<<endl;
+    G4cout<<"LE Gamma Conversion PostStepDoIt"<<G4endl;
   }
 #endif
   //  Reset NbOfInteractionLengthLeft and return aParticleChange
@@ -417,7 +398,7 @@ G4Element* G4LowEnergyGammaConversion::SelectRandomAtom(const G4DynamicParticle*
     if(rval <= PartialSumSigma) return ((*theElementVector)(i));
   }
   //  G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-  //   << "' has no elements" << endl;
+  //   << "' has no elements" << G4endl;
   return (*theElementVector)(0);
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
index 7ba212d3ed..11a1bb0cdf 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyIonisation.cc,v 1.25.2.1 1999/12/07 20:50:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyIonisation.cc,v 1.29 2000/02/18 12:39:18 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -------------------------------------------------------------
@@ -14,13 +14,21 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4LowEnergyIonisation physics process --------
-//                   by Michel Maire, April 1996
 //      ---------- G4LowEnergyIonisation low energy modifications -----------
 //                by Alessandra Forti May 1999  
 // **************************************************************
+//   17.02.2000 Veronique Lefebure
+// - 5 bugs corrected: 
+//   *in Fluorescence, 2 bugs affecting 
+//   . localEnergyDeposition and
+//   . number of emitted photons that was then always 1 less
+//   *in EnergySampling method: 
+//   . expon = Parms[13]+1; (instead of uncorrect -1)
+//   . rejection /= Parms[6];(instead of uncorrect Parms[7])
+//   . Parms[6] is apparently corrupted in the data file (often = 0)  
+//     -->Compute normalisation into local variable rejectionMax
+//     and use rejectionMax  in stead of Parms[6]
+//
 // Added Livermore data table construction methods A. Forti
 // Modified BuildMeanFreePath to read new data tables A. Forti
 // Added EnergySampling method A. Forti
@@ -37,7 +45,7 @@
 #include "G4EnergyLossTables.hh"
 #include "G4Gamma.hh"
 #include "G4UnitsTable.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 typedef G4RWTPtrOrderedVector<G4DynamicParticle> G4ParticleVector;
 
@@ -210,7 +218,7 @@ void G4LowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticle
           if (&aParticleType==G4Electron::Electron())
             {
               Tmax = LowEdgeEnergy/2.;
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2
                        + log((tau-d)*d)+tau/(tau-d)
                        + (0.5*d*d+(2.*tau+1.)*log(1.-d/tau))/gamma2;
@@ -218,7 +226,7 @@ void G4LowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticle
           else        //positron
             {
               Tmax = LowEdgeEnergy ;
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               d2=d*d/2.; d3=d*d*d/3.; d4=d*d*d*d/4.;
               y=1./(1.+gamma);
               ionloss = log(2.*(tau+2.)/Eexcm2)+log(tau*d)
@@ -434,7 +442,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
     aParticleChange.SetEnergyChange(0.);
     
  if(KineticEnergy < 0.)
-   G4cout << " 1. negative deposit:" << KineticEnergy/eV << endl; 
+   G4cout << " 1. negative deposit:" << KineticEnergy/eV << G4endl; 
     aParticleChange.SetLocalEnergyDeposit(KineticEnergy);
 
     return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
@@ -459,7 +467,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
   if(KineticEnergy <= BindingEn)
   {
     G4cout << " Tkin=" << KineticEnergy/eV << "  Ebind=" << BindingEn/eV
-           << "   selection of subshell ???????" << endl;
+           << "   selection of subshell ???????" << G4endl;
     return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
   }
 
@@ -485,7 +493,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
   if(finalKineticEnergy < 0.){
 
     G4cout << "Tkin=" << KineticEnergy/eV << "  Tdel=" << DeltaKineticEnergy/eV
-	   << "  BindingEn=" << BindingEn/eV << "  ***********" << endl;
+	   << "  BindingEn=" << BindingEn/eV << "  ***********" << G4endl;
   }
 
   // deposit energy if delta energy is below cut
@@ -497,7 +505,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 
       if((DeltaKineticEnergy+BindingEn) < 0.){
 
-	G4cout << " 2. negative deposit:" << (DeltaKineticEnergy+BindingEn)/eV << endl; 
+	G4cout << " 2. negative deposit:" << (DeltaKineticEnergy+BindingEn)/eV << G4endl; 
       }
 
       aParticleChange.SetLocalEnergyDeposit(DeltaKineticEnergy+BindingEn);
@@ -509,7 +517,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 
       if(KineticEnergy < 0.){
 
-	G4cout << " 3. negative deposit:" << KineticEnergy/eV << endl; 
+	G4cout << " 3. negative deposit:" << KineticEnergy/eV << G4endl; 
       }
 
       aParticleChange.SetLocalEnergyDeposit(KineticEnergy);
@@ -636,10 +644,10 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 	if(ThereAreShells != FALSE){
 	  
 	  thePrimaryShell = (G4int) fluorPar[0];
-	  theEnergyDeposit -= fluorPar[2]*MeV;
 	  
 	  if(fluorPar[2] >= CutForLowEnergySecondaryPhotons){
 	    
+	    theEnergyDeposit -= fluorPar[2]*MeV;
 	    newPart = new G4DynamicParticle (G4Gamma::Gamma(), 
 					     newPartDirection, 
 					     fluorPar[2]);
@@ -658,7 +666,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 	  G4double lastTransEnergy = (*(*theBindEnVec)[1])[k];
 	  thePrimaryShell = (G4int) fluorPar[0];
 	  
-	  if(fluorPar[2] >= CutForLowEnergySecondaryPhotons){
+	  if(lastTransEnergy >= CutForLowEnergySecondaryPhotons){
 	    
 	    theEnergyDeposit -= lastTransEnergy*MeV;
 	    
@@ -703,7 +711,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
       aParticleChange.SetMomentumChange(finalPx,finalPy,finalPz);
       aParticleChange.SetEnergyChange(finalKineticEnergy);
  if(theEnergyDeposit < 0.)
-   G4cout << " 4. negative deposit:" << theEnergyDeposit/eV << endl; 
+   G4cout << " 4. negative deposit:" << theEnergyDeposit/eV << G4endl; 
       aParticleChange.SetLocalEnergyDeposit (theEnergyDeposit);
     }
     else
@@ -711,8 +719,8 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
       theEnergyDeposit += finalKineticEnergy ;
  if(theEnergyDeposit < 0.)
  {
-   G4cout << " 5. negative deposit:" << theEnergyDeposit/eV << endl; 
-   G4cout << " finalKineticEnergy=" << finalKineticEnergy/eV << endl;
+   G4cout << " 5. negative deposit:" << theEnergyDeposit/eV << G4endl; 
+   G4cout << " finalKineticEnergy=" << finalKineticEnergy/eV << G4endl;
  }
 
       aParticleChange.SetLocalEnergyDeposit (theEnergyDeposit);
@@ -982,8 +990,8 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
   G4double aa=1./low ;
   G4double bb=1./high ;
   G4double saa = aa, sbb = bb;
-  G4double llow = low*low;
-  G4double s1 = 0. ;
+  G4double llow = low;
+  G4double rejectionMax = 0. ;
   
   for (G4int ii = 1; ii < 7; ii++){
 
@@ -997,7 +1005,7 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
     //
     //function itself at the minimum value (0.1*eV)
     //
-    s1 += Parms[ii-1]/llow;
+    rejectionMax += Parms[ii-1]/llow;
     llow *= low ;
   }
   
@@ -1014,7 +1022,7 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
 
     // Second Function: B1*energy**B2
     //
-    G4double expon = Parms[13]-1;
+    G4double expon = Parms[13]+1;
     
     // area2: integral of the normalized second function
     area2 = (Parms[12]/expon)*(pow(sndCut,expon)-pow(fstCut,expon));
@@ -1103,7 +1111,8 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
       rejection = Parms[0]/arg+Parms[1]/pow(arg,2)+Parms[2]/pow(arg,3)+
 	Parms[3]/pow(arg,4)+Parms[4]/pow(arg,5)+Parms[5]/pow(arg,6);
       
-      rejection /= Parms[7];
+      //rejection /= Parms[6];
+      rejection /= rejectionMax;
       
     }while(rejection < G4UniformRand()); 
   }
@@ -1111,7 +1120,7 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
   else if(rand1 > area1 && rand1 <= areaDue){
     
     //Sampling from the second function only 9 subshells
-    G4double expon = Parms[13]-1;
+    G4double expon = Parms[13]+1;
     G4double norm = (pow(sndCut,expon)-pow(fstCut,expon));
     G4double sum = norm*G4UniformRand()+pow(fstCut,expon);
     G4double exponInv = 1/expon;
@@ -1152,8 +1161,9 @@ void G4LowEnergyIonisation::PrintInfoDefinition()
 {
   G4String comments = "First version of low energy ionisation code,";
            comments += "\n At present it can be used for electrons only ";
+	   comments += "\n To be used as a **PURE DISCRETE** process for now";
            comments += " in the energy range [250 eV,100 GeV]";
-  G4cout << endl << GetProcessName() << ":  " << comments << endl;
+  G4cout << G4endl << GetProcessName() << ":  " << comments << G4endl;
 
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
index 88867242f7..939acc6f94 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyPhotoElectric.cc,v 1.21.2.1 1999/12/07 20:50:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyPhotoElectric.cc,v 1.24 2000/02/18 10:27:53 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,21 +15,15 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4LowEnergyPhotoElectric physics process --------
-//                   by Michel Maire, April 1996
 //      ------------ G4LowEnergyPhotoelctric: low energy modifications --------
 //                   by Alessandra Forti, October 1998
 // **************************************************************
-// 12-06-96, Added SelectRandomAtom() method, by M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 17-09-96, PartialSumSigma(i)
-//           split of ComputeBindingEnergy, M.Maire
-// 08-01-97, crossection table + meanfreepath table, M.Maire
-// 13-03-97, adapted for the new physics scheme, M.Maire
-// 28-03-97, protection in BuildPhysicsTable, M.Maire
-// 04-06-98, in DoIt, secondary production condition: range>min(threshold,safety)
+// 17.02.2000 Veronique Lefebure
+// - bugs corrected in fluorescence simulation: 
+//   . when final use of binding energy: no photon was ever created
+//   . no Fluorescence was simulated when the photo-electron energy
+//     was below production threshold.
+//
 // Added Livermore data table construction methods A. Forti
 // Modified BuildMeanFreePath to read new data tables A. Forti
 // Added EnergySampling method A. Forti
@@ -68,9 +62,9 @@ G4LowEnergyPhotoElectric::G4LowEnergyPhotoElectric(const G4String& processName)
     NumbBinTable(200)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
      G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/MeV << "MeV " << endl;
+     G4cout << "HighestEnergy: " << HighestEnergyLimit/MeV << "MeV " << G4endl;
    }
 }
 
@@ -434,13 +428,18 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
   G4double theEnergyDeposit = BindingEn;
 
   if (G4EnergyLossTables::GetRange(G4Electron::Electron(),ElecKineEnergy,aMaterial)
-      >= min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety())){
+      >= G4std::min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety())){
 
     // the electron is created in the direction of the incident photon ...  
     
     G4DynamicParticle* aElectron = new G4DynamicParticle (G4Electron::Electron(), 
 							  PhotonDirection, ElecKineEnergy) ;
     elecvec.append(aElectron);
+  } // END OF CUTS
+  
+  else{
+    theEnergyDeposit += ElecKineEnergy;    
+  }
 
     // load the transition probability table for the element
     // theTable[i][j][k] 
@@ -503,7 +502,7 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 	  G4double lastTransEnergy = ((*(*theBindEnVec)[1])[k])*MeV;
 	  thePrimaryShell = (G4int) fluorPar[0];
 
-	  if(fluorPar[2]*MeV >= CutForLowEnergySecondaryPhotons){
+	  if(lastTransEnergy >= CutForLowEnergySecondaryPhotons){
 
 	    theEnergyDeposit -= lastTransEnergy;
 	
@@ -542,12 +541,6 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
       theEnergyDeposit = 0;
     }
     
-  } // END OF CUTS
-  
-  else{
-    theEnergyDeposit = PhotonEnergy;    
-    aParticleChange.SetNumberOfSecondaries(0) ;
-  }
 
   // Kill the incident photon 
   aParticleChange.SetMomentumChange( 0., 0., 0. );
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
index 2f41709f89..eccd525eed 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyRayleigh.cc,v 1.13.6.1 1999/12/07 20:50:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyRayleigh.cc,v 1.15 2000/01/26 09:50:01 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,8 +15,6 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyRayleigh physics process --------
 //                   by Alessandra Forti, November 1998
 // **************************************************************
@@ -47,9 +45,9 @@ G4LowEnergyRayleigh::G4LowEnergyRayleigh(const G4String& processName)
     NumbBinTable(200)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
      G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << endl;
+     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
    }
 }
  
@@ -257,7 +255,7 @@ G4VParticleChange* G4LowEnergyRayleigh::PostStepDoIt(const G4Track& aTrack, cons
 
   if(verboseLevel > 15){
 
-    G4cout<<"LE Rayleigh PostStepDoIt"<<endl;
+    G4cout<<"LE Rayleigh PostStepDoIt"<<G4endl;
   }
 #endif
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
index b8f137021a..fd276aca6c 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyUtilities.cc,v 1.2.6.1 1999/12/07 20:50:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LowEnergyUtilities.cc,v 1.4 2000/01/26 09:50:01 lefebure Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -15,20 +15,9 @@
 //
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
 //      ------------ G4LowEnergyUtilities physics process --------
-//                   by Michel Maire, April 1996
+//                   by A.Forti  1999/03/02
 // **************************************************************
-// 12-06-96, Added SelectRandomAtom() method, by M.Maire
-// 21-06-96, SetCuts implementation, M.Maire
-// 17-09-96, PartialSumSigma(i)
-//           split of ComputeBindingEnergy, M.Maire
-// 08-01-97, crossection table + meanfreepath table, M.Maire
-// 13-03-97, adapted for the new physics scheme, M.Maire
-// 28-03-97, protection in BuildPhysicsTable, M.Maire
-// 04-06-98, in DoIt, secondary production condition: range>min(threshold,safety)
-// --------------------------------------------------------------
 // This Class Header
 #include "G4LowEnergyUtilities.hh"
 
@@ -37,7 +26,7 @@
 #include "G4DynamicParticle.hh"
 #include "G4Material.hh"
 #include "CLHEP/String/Strings.h"
-#include <fstream.h>
+#include "g4std/fstream"
 
 G4LowEnergyUtilities::G4LowEnergyUtilities()
 {}
@@ -69,8 +58,8 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
   
   HepString path_string(path);
   HepString dir_file = path_string + "/" + name;
-  ifstream file(dir_file);
-  filebuf* lsdp = file.rdbuf();
+  G4std::ifstream file(dir_file);
+  G4std::filebuf* lsdp = file.rdbuf();
 
   if(!lsdp->is_open()){
     
@@ -164,8 +153,8 @@ G4FirstLevel* G4LowEnergyUtilities::BuildFirstLevelTables(const G4int TableInd,
   
   HepString path_string(path);
   HepString dir_file = path_string + "/" + name;
-  ifstream file(dir_file);
-  filebuf* lsdp = file.rdbuf();
+  G4std::ifstream file(dir_file);
+  G4std::filebuf* lsdp = file.rdbuf();
 
   if(!lsdp->is_open()){
     
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VDataFile.cc b/source/processes/electromagnetic/lowenergy/src/G4VDataFile.cc
deleted file mode 100644
index 8125349c94..0000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4VDataFile.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4VDataFile
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-// This Class Header
-#include "G4VDataFile.hh"
-
-// Other Class Headers
-
-// C++ Headers
-#include <iostream.h>
-#include <fstream.h>
-#include <string.h>
-
-// Constructors
-G4VDataFile::G4VDataFile(const G4String& dataFile):
-  _filename(dataFile)
-{   
-}
-
-// Destructor  
-G4VDataFile::~G4VDataFile()
-{
-  if(buf){
-    delete [] buf;
-  }
-}
-// Member Functions
-void G4VDataFile::OpenFile(){
-  
- // open the stream
-  char* path = getenv("G4LEDATA");
-  if(!path){ 
-
-    G4Exception("G4LEDATA environment variable not set");
-  }
-
-  G4String path_string(path);
-  G4String dir_file = path_string + "/" + _filename;
-  _istr.open(dir_file.data(), ios::in | ios::nocreate);
-  filebuf* lsdp = _istr.rdbuf();
-
-  if(!lsdp->is_open()){
-
-    G4String excep = "Error!!!! data file: " + dir_file + " NOT found";
-    G4Exception(excep);
-  }
-}
-
-void G4VDataFile::CloseFile(){
-
-  _istr.close();
-}
-
-void G4VDataFile::Eof(){
-  
-  if(_istr.eof()) {
-    
-    _istr.close();
-  
-  }
-}
-
-streampos G4VDataFile::TellPos(){
-
-  return _istr.tellg();
-}
-
-G4bool G4VDataFile::IsOpen(){
-
-  return TRUE;//_istr.is_open();
-}
-
-void G4VDataFile::SeekPos(streampos pos){
-
-  _istr.seekg(pos);
-}
-
-void G4VDataFile::SetBufferSize(G4int sz){
-
-  _bufSize = sz;
-  buf = new char[_bufSize+1];
-  
-}
-
-void G4VDataFile::GetLine(){
-  
-  _istr.getline(buf, _bufSize);
-
-  if(strlen(buf) >= _bufSize){
-
-    G4String excep = "Error!!!! G4VDataFile::GetLine() buffer out of boundaries";
-    G4Exception(excep);
-  }
-}
-
-G4int G4VDataFile::LineLength(){
-
-  return strlen(buf);
-
-}
-
-char* G4VDataFile::GetBuf(){
-
-  return buf;
-}
-
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VTables.cc b/source/processes/electromagnetic/lowenergy/src/G4VTables.cc
deleted file mode 100644
index e12990c4b1..0000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4VTables.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// -------------------------------------------------------------------
-//      GEANT 4 class file 
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      CERN, Geneva, Switzerland
-//
-//      File name:     G4VTables
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 2 February 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-// This Class Header
-#include "G4VTables.hh"
-
-// Constructors
-G4VTables::G4VTables()
-{   
-}
-
-// Destructor  
-G4VTables::~G4VTables()
-{
-
-}
-
-
-     
-
-   
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
index c200f5b700..7ce4ae621c 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
@@ -22,16 +22,17 @@
 // ************************************************************
 // 28 July   1999 V.Ivanchenko cleen up
 // 17 August 1999 G.Mancinelli added ICRU parametrisations for protons  
-// 20 August 1999 G.Mancinelli added ICRU tables for alpha (not functional
-// yet)  
+// 20 August 1999 G.Mancinelli added ICRU tables for alpha 
 // 31 August 1999 V.Ivanchenko update and cleen up 
 // 30 Sept.  1999 V.Ivanchenko minor upgrade 
+// 19 Jan.   2000 V.Ivanchenko minor changing in Barkas corrections
 // --------------------------------------------------------------
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "G4hLowEnergyIonisation.hh"
 #include "G4UnitsTable.hh"
+#include "G4EnergyLossTables.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -78,15 +79,15 @@ void G4hLowEnergyIonisation::SetStoppingPowerTableName(const G4String& dedxTable
 {
   if(dedxTable == "Ziegler1977H") { 
     DEDXtable = "Ziegler1977H";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
   } else if(dedxTable == "Ziegler1977He") {
     DEDXtable = "Ziegler1977He";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
   } else if(dedxTable == "ICRU_R49p") {
     DEDXtable = "ICRU_R49p";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
     // set at 2 MeV. The ICRU report affirm their parametrisations are
     // valid up to 1 MeV for protons. They have used Ziegler-like
@@ -98,23 +99,23 @@ void G4hLowEnergyIonisation::SetStoppingPowerTableName(const G4String& dedxTable
     // up to 2 MeV (better boundary conditions there wrt 1 MeV) and
     // Bethe-Bloch for higher values (applying continuity constraint) 
     
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
   } else if(dedxTable == "ICRU_R49He") {
     DEDXtable = "ICRU_R49He";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
 
   } else if(dedxTable == "ICRU_R49PowersHe") {
     DEDXtable = "ICRU_R49PowersHe";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
   } else if(dedxTable == "UrbanModel") {
     DEDXtable = "UrbanModel";
-    ParamHighEnergy = 2.*MeV;
+    ParamHighEnergy = 2.0*MeV;
     
   } else {
   G4cout << "G4hLowEnergyIonisation Warning: There is no table with the name ="
-         << dedxTable; 
+         << dedxTable << G4endl; 
   }  
 }
 
@@ -137,7 +138,6 @@ void G4hLowEnergyIonisation::SetNuclearStoppingOff()
 void G4hLowEnergyIonisation::SetAntiProtonStoppingOn()
 {
   pbarStop = true ;
-  LowestKineticEnergy = 500.*keV;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -153,7 +153,7 @@ void G4hLowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticl
 {
   // Tables for different hadrons will be different because of
   // small difference in Tmax connected with RateMass
-  RateMass = electron_mass_c2 / (aParticleType.GetPDGMass()) ;
+  // RateMass = electron_mass_c2 / (aParticleType.GetPDGMass()) ;
 
   // cuts for  electron ....................
   DeltaCutInKineticEnergy = theElectron->GetCutsInEnergy() ;
@@ -186,29 +186,20 @@ void G4hLowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticl
       
       // get material parameters needed for the energy loss calculation
       
-      const G4Material* material= (*theMaterialTable)[J];
+      G4Material* material= (*theMaterialTable)[J];
         
       // get  electron cut in kin. energy for the material
       
       DeltaCutInKineticEnergyNow = DeltaCutInKineticEnergy[J] ;
-      
-      // get particle mass
-      
-      const G4double PartMass = aParticleType.GetPDGMass()/MeV;
-      
-      // get particle charge
-      
-      const G4double PartCharge = aParticleType.GetPDGCharge();
-      
+            
       // define constants A and B for this material  
       
       paramA  = GetParametrisedLoss(material, ParamLowEnergy, 
-                                   DeltaCutInKineticEnergyNow,
-				   PartMass, PartCharge)/sqrt(ParamLowEnergy) ; 
+                                   DeltaCutInKineticEnergyNow)
+				   /sqrt(ParamLowEnergy) ; 
 
       ionloss = GetParametrisedLoss(material, ParamHighEnergy, 
-                                    DeltaCutInKineticEnergyNow,
-				    PartMass, PartCharge) ; 
+                                    DeltaCutInKineticEnergyNow) ;
 
       ionlossBB = GetBetheBlochLoss(material, ParamHighEnergy, 
                                     DeltaCutInKineticEnergyNow) ; 
@@ -220,6 +211,9 @@ void G4hLowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticl
       for (G4int i = 0 ; i < TotBin ; i++)
 	{
 	  LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
+	      ionloss = GetParametrisedLoss(material, LowEdgeEnergy, 
+                                            DeltaCutInKineticEnergyNow) ;
+
 	  
 	  if ( LowEdgeEnergy < ParamHighEnergy ) {
 	    //  low energy part , parametrised energy loss formulae
@@ -232,8 +226,7 @@ void G4hLowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticl
 	    } else {
 	      // Parametrisation for intermediate energy range
 	      ionloss = GetParametrisedLoss(material, LowEdgeEnergy, 
-                                            DeltaCutInKineticEnergyNow,
-					    PartMass, PartCharge) ; 
+                                            DeltaCutInKineticEnergyNow) ;
 	    }
 	  } else {
 	    
@@ -251,6 +244,62 @@ void G4hLowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticl
     }
 }
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4hLowEnergyIonisation::GetPreciseDEDX  (G4Material* aMaterial, 
+                                 const G4double KinEnergy,
+                                 const G4ParticleDefinition* aParticleType)
+{
+  // Calculation for different hadrons will be different because of
+  // small difference in Tmax connected with RateMass
+  //  RateMass = electron_mass_c2 / (aParticleType.GetPDGMass()) ;
+
+  G4double ionloss, ionlossBB ;
+  G4double paramA, paramB, dedx ;
+
+  ParticleMass = aParticleType->GetPDGMass() ;
+  Charge       = aParticleType->GetPDGCharge()/eplus ;
+  MassRatio    = proton_mass_c2/ParticleMass ;
+
+  G4double Tscaled = KinEnergy*MassRatio ; 
+  G4double ChargeSquare = GetIonEffChargeSquare(aMaterial,KinEnergy,Charge) ;
+
+  if(Tscaled > ParamHighEnergy) {
+    if(Charge>0.) {
+
+      dedx = G4EnergyLossTables::GetPreciseDEDX( theProton,Tscaled,aMaterial) 
+           * ChargeSquare ;
+
+    } else {
+
+      dedx = G4EnergyLossTables::GetPreciseDEDX( theAntiProton,Tscaled,aMaterial) 
+           * ChargeSquare ;
+    }
+  } else {
+
+              
+    DeltaCutInKineticEnergyNow = DeltaCutInKineticEnergy[(aMaterial->GetIndex())] ;   
+    if ( Tscaled < ParamLowEnergy ) {
+      
+      // define constants A for this material  
+      paramA  = GetParametrisedLoss(aMaterial, ParamLowEnergy, 
+                                    DeltaCutInKineticEnergyNow)/sqrt(ParamLowEnergy) ; 
+	      
+      // The model of free electron gas
+      ionloss = GetFreeElectronGasLoss(paramA, Tscaled) ;
+	      
+    } else {
+
+      // Parametrisation for intermediate energy range
+      ionloss = GetParametrisedLoss(aMaterial, Tscaled, 
+                                    DeltaCutInKineticEnergyNow) ;
+    }
+    ionloss *= ChargeSquare ;
+
+  }
+
+  return ionloss ;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -264,6 +313,7 @@ void G4hLowEnergyIonisation::SetPhysicsTableBining(G4double lowE, G4double highE
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void G4hLowEnergyIonisation::BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
+
   //  just call BuildLossTable+BuildLambdaTable
 {
   ParticleMass = aParticleType.GetPDGMass() ;
@@ -316,7 +366,10 @@ void G4hLowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aParti
   const G4MaterialTable* theMaterialTable=
     G4Material::GetMaterialTable();
 
-  ParticleMass = aParticleType.GetPDGMass() ;
+  //Particle properties
+
+  //ParticleMass = aParticleType.GetPDGMass() ;
+  //G4double Charge = aParticle.GetPDGCharge()/eplus ;
   
   //create table
   
@@ -364,12 +417,13 @@ void G4hLowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aParti
       for ( G4int i = 0 ; i < TotBin ; i++ )
         {
 	  LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
+          G4double ChargeSquare = GetIonEffChargeSquare(material,LowEdgeEnergy,Charge) ;
 	  
-	  sigma = 0. ;
+	  sigma = 0.0 ;
 	  
 	  for (G4int iel=0; iel<NumberOfElements; iel++ )
 	    {
-	      sigma +=  theAtomicNumDensityVector[iel]*
+	      sigma +=  theAtomicNumDensityVector[iel]*ChargeSquare*
 		ComputeMicroscopicCrossSection(aParticleType,
 					       LowEdgeEnergy,
 					       (*theElementVector)(iel)->GetZ() ) ;
@@ -439,13 +493,211 @@ G4double G4hLowEnergyIonisation::ComputeMicroscopicCrossSection(
 	*TotalCrossSection/betasquare;
     }
   else
-    TotalCrossSection= 0. ;
+    TotalCrossSection= 0.0 ;
   
   return TotalCrossSection ;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+G4double G4hLowEnergyIonisation::GetConstraints(const G4DynamicParticle *aParticle,
+                                                  G4Material *aMaterial)
+{
+  // returns the Step limit
+  // it calculates dEdx and the range as well 
+  // based on Effective charge approach
+
+  G4double KineticEnergy,StepLimit ;
+  G4bool isOut ;
+
+  theParticle = aParticle->GetDefinition() ;
+  MassRatio = proton_mass_c2/(theParticle->GetPDGMass()) ;
+  Charge    = (theParticle->GetPDGCharge())/eplus ;
+
+  KineticEnergy = aParticle->GetKineticEnergy() ;
+
+  // Scale the kinetic energy
+
+  G4double Tscaled= KineticEnergy*MassRatio ; 
+  G4double ChargeSquare = GetIonEffChargeSquare(aMaterial,KineticEnergy,Charge) ;
+  G4double dx, s ;
+
+  if(Charge>0.) {
+
+    fdEdx = G4EnergyLossTables::GetDEDX( theProton, Tscaled, aMaterial) 
+          * ChargeSquare ;
+
+    fRangeNow = G4EnergyLossTables::GetRange( theProton, Tscaled, aMaterial) ;
+    s = fRangeNow ;
+
+    if(Tscaled < ParamHighEnergy) {
+      // For Bragg's peak the limit in range is estimated 
+      // in order to be inside linLossLimit on each step
+      fdEdx = GetPreciseDEDX (aMaterial, KineticEnergy, theParticle) ;
+
+      dx = G4EnergyLossTables::GetRange( theProton,
+                                 ParamHighEnergy, aMaterial) * linLossLimit ;
+      fRangeNow = G4std::min (fRangeNow, dx) ;
+    }
+
+    // Antiprotons and negative hadrons 
+  } else {
+
+    fdEdx = G4EnergyLossTables::GetDEDX( theAntiProton, Tscaled, aMaterial) 
+          * ChargeSquare ;
+
+    fRangeNow = G4EnergyLossTables::GetRange( theAntiProton, Tscaled, aMaterial) ;
+
+    if(Tscaled < ParamHighEnergy) {
+      // For Bragg's peak the limit in range is estimated 
+      // in order to be inside linLossLimit on each step
+      fdEdx = GetPreciseDEDX (aMaterial, KineticEnergy, theParticle) ;
+      dx = G4EnergyLossTables::GetRange( theAntiProton,
+                                 ParamHighEnergy, aMaterial) * linLossLimit ;
+      fRangeNow = G4std::min (fRangeNow, dx) ;
+    }
+  }
+
+  //
+  fRangeNow /= (ChargeSquare*MassRatio) ;
+  StepLimit  = fRangeNow ;
+
+  // compute the (random) Step limit ..............
+  if(fRangeNow > finalRange) {
+    if(Tscaled > ParamHighEnergy ) {
+      StepLimit = (c1lim*fRangeNow+c2lim+c3lim/fRangeNow) ;
+
+      //  randomise this value
+      if(rndmStepFlag) StepLimit = 
+                finalRange+(StepLimit-finalRange)*G4UniformRand() ;
+      if(StepLimit > fRangeNow) StepLimit = fRangeNow ;
+    }
+  }
+
+  return StepLimit ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4VParticleChange* G4hLowEnergyIonisation::AlongStepDoIt( 
+                              const G4Track& trackData, const G4Step& stepData) 
+
+{
+  // compute the energy loss after a step 
+  const G4DynamicParticle* aParticle;
+  G4Material* aMaterial;
+  G4double finalT = 0.0 ;
+
+  aParticleChange.Initialize(trackData) ;
+  aMaterial = trackData.GetMaterial() ;
+  
+  // get the actual (true) Step length from stepData 
+  const G4double Step = stepData.GetStepLength() ;
+
+  aParticle = trackData.GetDynamicParticle() ;
+
+  G4int index = aMaterial->GetIndex() ;
+  G4double E = aParticle->GetKineticEnergy() ;
+
+  if( (aParticle->GetDefinition()) != theParticle ) {
+
+    theParticle = aParticle->GetDefinition() ;
+    MassRatio = proton_mass_c2/(theParticle->GetPDGMass()) ;
+    Charge    = (theParticle->GetPDGCharge())/eplus ;
+  }
+
+  G4double Tscaled= E*MassRatio ; 
+  G4double ChargeSquare = Charge*Charge ;
+  G4double Eloss = 0.0 ;
+  G4double Nloss = 0.0 ;
+
+    if(E < MinKineticEnergy) Eloss = E ;
+  
+    else if(( E > HighestKineticEnergy)||( E <= LowestKineticEnergy))
+              Eloss = Step*fdEdx ; 
+
+    else if(Tscaled < ParamHighEnergy) {
+
+      // Nuclear Stopping Power
+      if(nStopping) {
+        Nloss = GetNuclearDEDX(aMaterial, E, theParticle) ;
+      }
+
+      G4double E1 = E - Step*(fdEdx + Nloss) ;
+
+      if(0.0 < E1) {
+        Eloss = (fdEdx + GetPreciseDEDX (aMaterial, E1, theParticle))*Step*0.5 ;
+        if(nStopping) {
+          Nloss = (Nloss + GetNuclearDEDX (aMaterial, E1, theParticle))*Step*0.5 ;
+	}
+      } else Eloss = E ;
+
+    } else if(Step >= fRangeNow ) Eloss = E ;
+    
+    else {
+
+      if(Step>linLossLimit*fRangeNow) {
+
+        G4double rscaled= fRangeNow*MassRatio*ChargeSquare ;
+        G4double sscaled=   Step   *MassRatio*ChargeSquare ;
+
+        if(Charge>0.)
+        {
+          Eloss = G4EnergyLossTables::GetPreciseEnergyFromRange(
+                                         theProton,
+                                         rscaled        ,aMaterial) -
+                     G4EnergyLossTables::GetPreciseEnergyFromRange(
+                                         theProton,
+                                         rscaled-sscaled,aMaterial) ;
+        }
+        else
+        {
+          Eloss = G4EnergyLossTables::GetPreciseEnergyFromRange(
+                                         theAntiProton,
+                                         rscaled        ,aMaterial) -
+                     G4EnergyLossTables::GetPreciseEnergyFromRange(
+                                         theAntiProton,
+                                         rscaled-sscaled,aMaterial) ;
+        }
+        Eloss /= (MassRatio*ChargeSquare) ;
+
+      } else Eloss = Step*fdEdx ;
+    }
+ 
+  finalT = E - Eloss - Nloss;
+
+  if(finalT > MinKineticEnergy) {
+
+    //  now the electron loss with fluctuation
+    if((EnlossFlucFlag) && (finalT < E) && (E > LowestKineticEnergy)) {
+ 
+      Eloss = GetLossWithFluct(aParticle,aMaterial,Eloss/ChargeSquare)
+               * ChargeSquare ;
+      //        if(nStopping) {
+      //      Nloss = GetNuclearLossWithFluct(theParticle,aMaterial,Nloss) ;
+      // }
+      finalT = E - Eloss - Nloss ;
+    }    
+  }
+
+  //  kill the particle if the kinetic energy <= 0  
+  if (finalT <= 0.0 )
+  {
+    finalT = 0.0 ;
+    if(theParticle->GetParticleName() == "proton")
+      aParticleChange.SetStatusChange(fStopAndKill);
+    else  
+      aParticleChange.SetStatusChange(fStopButAlive); 
+  } 
+
+  aParticleChange.SetEnergyChange( finalT ) ;
+  aParticleChange.SetLocalEnergyDeposit(E-finalT) ;
+
+  return &aParticleChange ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
 G4VParticleChange* G4hLowEnergyIonisation::PostStepDoIt(const G4Track& trackData,   
 							const G4Step& stepData)
 {
@@ -586,11 +838,10 @@ G4VParticleChange* G4hLowEnergyIonisation::PostStepDoIt(const G4Track& trackData
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material, 
+G4double G4hLowEnergyIonisation::GetParametrisedLoss(G4Material* material, 
                                                      const G4double KinEnergy,
-						     const G4double DeltaRayCutNow,
-						     const G4double PartMass,
-						     const G4double PartCharge)
+						     const G4double DeltaRayCutNow)
+
 {
 
   G4double ionloss, ion, ionloss125, ion125;
@@ -600,7 +851,7 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
   // First of all check tables for specific materials for ICRU_49 parametrisation
 
   // Ziegler parametrisation in ICRU49
-  if ( DEDXtable == "ICRU_R49p" && PartCharge > 0) {
+  if ( DEDXtable == "ICRU_R49p" ) {
 
     molecIndex = (MolecIsInICRU_R49p(material))+1; 
 
@@ -612,7 +863,7 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
   }
 
   // Powers parametrisation in ICRU49
-  if ( DEDXtable == "ICRU_R49PowersHe"&& PartCharge > 0 ) {
+  if ( DEDXtable == "ICRU_R49PowersHe" ) {
 
     molecIndex = (MolecIsInICRU_R49PowersHe(material))+1;  
     if ( molecIndex > 0 ) {
@@ -643,9 +894,7 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
   for (G4int iel=0; iel<NumberOfElements; iel++)
     {
       const G4Element* element = (*theElementVector)(iel) ;
-      G4double A1 = ProtonMassAMU ;
       G4double Z2 = element->GetZ() ;
-      G4double A2 = element->GetA()*mole/g ;
       G4int iz = int(Z2) ;
       if( iz <= 0 ) iz = 1 ;
       if( iz > 92 ) iz = 92 ; 
@@ -664,12 +913,6 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
           ion125 *= theAtomicNumDensityVector[iel]*ZieglerFactor ;
 	}
 
-	// Nuclear Stopping Power
-        if(nStopping) {
-          G4double ionn = GetStoppingPower1977n(1.0, Z2, A1, A2, KinEnergy) 
-                        * (theAtomicNumDensityVector[iel])*ZieglerFactor ;
-          ion += ionn ;
-	}
   // The "Ziegler1977He" table
       } else if(DEDXtable == "Ziegler1977He") {
 	G4double HeKinEnergy = KinEnergy*HeMassAMU/ProtonMassAMU ;
@@ -682,12 +925,6 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
           ion125  = GetStoppingPower1977H(iz, 125.0*keV) ; 
           ion125 *= theAtomicNumDensityVector[iel]*ZieglerFactor ;
 	}
-
-	// Nuclear Stopping Power
-        if(nStopping) {
-          G4double ionn = GetStoppingPower1977n(1.0, Z2, A1, A2, KinEnergy) ;
-          ion += ionn*theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
       
   // The "ICRU_R49p" table
       } else if(DEDXtable == "ICRU_R49p") { 
@@ -700,12 +937,6 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
           ion125 *= theAtomicNumDensityVector[iel]*ZieglerFactor ;
 	}
 	
-	// Nuclear Stopping Power 
-        if(nStopping) {
-          G4double ionn = GetStoppingPowerMoliere(1.0, Z2, A1, A2, KinEnergy) ;
-          ion += ionn*theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-
   // The "ICRU_R49He" table
       } else if(DEDXtable == "ICRU_R49He") {
 	G4double HeKinEnergy = KinEnergy*HeMassAMU/ProtonMassAMU ;
@@ -718,12 +949,6 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
           ion125  = GetStoppingPowerICRU_R49p(iz, 125.0*keV, "Ele") ; 
           ion125 *= theAtomicNumDensityVector[iel]*ZieglerFactor ;
 	}
-
-	// Nuclear Stopping Power
-        if(nStopping) {
-          G4double ionn = GetStoppingPower1985n(1.0, Z2, A1, A2, KinEnergy) ;
-          ion += ionn*theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
 		
   // The G4 beta version model
       } else if(DEDXtable == "UrbanModel") {
@@ -734,7 +959,7 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
           ion125  = theAtomicNumDensityVector[iel]*GetUrbanModel(element, 125.0*keV) ;
 	}
       }
-      
+            
       ionloss    += ion ;
       ionloss125 += ion125 ;
 
@@ -754,21 +979,66 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
     ionloss    -= GetDeltaRaysEnergy(material, KinEnergy, DeltaRayCutNow) ;
   }
   
-    // Correction term for the Barkas effect applied if pbarStop = true
-    
-    G4double BarkasTerm=0;
-    
-    if(PartCharge == -1 && pbarStop) BarkasTerm = ComputeBarkasTerm( material, KinEnergy, PartMass);
-    
-    //if(PartCharge <= -2 && pbarStop) BarkasTerm = sqrt( GetIonEffChargeSquare( material, KinEnergy, PartCharge))
-	//		            * ComputeBarkasTerm ( material, KinEnergy, PartMass);
-    
-    ionloss += BarkasTerm;   
-   
-  if ( ionloss <= 0.) ionloss = 0. ;
+  // Correction term for the Barkas effect applied if pbarStop = true
+  // and only for negative charged particles
+  // Barkas term is taken into account in Ziegler/ICRU tables,
+  // so for antiprotons a correction term must be multiplied by factor 2 
+  if( (-0.5 > Charge) && pbarStop) {
+
+    ionloss += ComputeBarkasTerm( material, KinEnergy ) * (Charge - 1.0) ;
+
+  }  
+ 
+  if ( ionloss <= 0.0) ionloss = 0.0 ;
   
   return ionloss;
 }
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4hLowEnergyIonisation::GetNuclearDEDX(G4Material* material, 
+                                                const G4double KinEnergy,
+                        		        const G4ParticleDefinition* aParticleType)
+
+{
+
+  G4double ionloss = 0.0 ;
+ 
+  // Now cycle over elements - calculation based on Bragg's rule 
+
+  // get elements in the actual material,
+  const G4ElementVector* theElementVector = material->GetElementVector() ;
+  const G4double* theAtomicNumDensityVector = material->GetAtomicNumDensityVector() ;
+  const G4int NumberOfElements = material->GetNumberOfElements() ;
+
+  MassRatio = proton_mass_c2/(aParticleType->GetPDGMass()) ;
+  Charge    = (aParticleType->GetPDGCharge())/eplus ;
+
+  G4double A1 = ProtonMassAMU/MassRatio ;
+  
+  //  loop for the elements in the material
+  for (G4int iel=0; iel<NumberOfElements; iel++) {
+      const G4Element* element = (*theElementVector)(iel) ;
+      G4double Z2 = element->GetZ() ;
+      G4double A2 = element->GetA()*mole/g ;
+      G4int iz = int(Z2) ;
+      if( iz <= 0 ) iz = 1 ;
+      if( iz > 92 ) iz = 92 ; 
+  // Choose the parametrisation using the table name
+      
+  // The "Ziegler1977H" table
+      if(DEDXtable == "Ziegler1977H") { 
+	ionloss = GetStoppingPower1977n(Charge, Z2, A1, A2, KinEnergy) 
+	        * theAtomicNumDensityVector[iel]*ZieglerFactor ;
+    
+  // The "ICRU_R49p" table
+      //      } else if(DEDXtable == "ICRU_R49p") { 
+      } else { 
+	ionloss = GetStoppingPowerMoliere(Charge, Z2, A1, A2, KinEnergy)  
+	        * theAtomicNumDensityVector[iel]*ZieglerFactor ;
+      }
+    }
+  return ionloss;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //Function to compute the Barkas term from:
@@ -778,56 +1048,72 @@ G4double G4hLowEnergyIonisation::GetParametrisedLoss(const G4Material* material,
 //     Physical review B Vol.5 No.7 1 April 1972 pagg. 2393-2397 
 //
 G4double G4hLowEnergyIonisation::ComputeBarkasTerm(const G4Material* material,
-  				                   const G4double KinEnergy,
-						   const G4double PartMass )
+  				                   const G4double KinEnergy)
+
 {
   static double FTable[47][2]={ 0.02,21.5,   0.03,20.0,   0.04,18.0,   0.05,15.6,
                                 0.06,15.0,   0.07,14.0,   0.08,13.5,   0.09,13,
-                     0.1,12.2,  0.2,  9.25,  0.3,  7,     0.4,  6,     0.5,  4.5,
-                                0.6,  3.5,   0.7,  3,     0.8,  2.5,   0.9,  2, 
-                     1,   1.7,  1.2,  1.2,   1.3,  1,     1.4,  0.86,  1.5,  0.7,
+                     0.1,12.2,  0.2,  9.25,  0.3,  7.0,     0.4,  6.0,   0.5,  4.5,
+                                0.6,  3.5,   0.7,  3.0,     0.8,  2.5,   0.9,  2.0, 
+                     1.0, 1.7,  1.2,  1.2,   1.3,  1.0,     1.4,  0.86,  1.5,  0.7,
 		                    1.6,  0.61,  1.7,  0.52,  1.8,  0.5,   1.9,  0.43,
-		                    2,    0.42,  2.1,  0.3,   2.4,  0.2,   
-				        3,    0.13,  3.08, 0.1,   3.1,  0.09, 3.3, 0.08,
-				        3.5,  0.07,  3.8,  0.06,				
-				        4,    0.051, 4.1,  0.04,  4.8,  0.03, 
-				        5,    0.024, 5.1,  0.02,
-                                6,    0.013, 6.5,  0.01,
-				        7,    0.009, 7.1,  0.008,
-				        8,    0.006, 9,    0.0032, 
-	              10,   0.0025};
+		                    2.0,  0.42,  2.1,  0.3,   2.4,  0.2,   
+				        3.0,    0.13,  3.08, 0.1,   3.1,  0.09, 3.3, 0.08,
+				        3.5,    0.07,  3.8,  0.06,		
+				        4.0,    0.051, 4.1,  0.04,  4.8,  0.03, 
+				        5.0,    0.024, 5.1,  0.02,
+                                        6.0,    0.013, 6.5,  0.01,
+				        7.0,    0.009, 7.1,  0.008,
+				        8.0,    0.006, 9.0,    0.0032, 
+	              10.0,   0.0025};
+
+  // Internal variable for Kinetic Energy 
+  // in order to keep Barkas correction to be constant below 500 keV 
+
+  G4double KineticEnergy = KinEnergy;
+  if( 500*keV > KineticEnergy ) KineticEnergy = 500*keV;
 
   // Information on particle and material
   
-  G4double BarkasTerm=0;
-  G4double AMaterial=0;
-  G4double ZMaterial=0;
+  G4double BarkasTerm=0.0;
+  G4double AMaterial=0.0;
+  G4double ZMaterial=0.0;
   G4double RoMaterial = material->GetDensity()/6.2415063631e18;
   const G4ElementVector* theElementVector = material->GetElementVector();
   G4int i=0;
-  for (i = 0; i<material->GetNumberOfElements(); ++i)
-    {
+  for (i = 0; i<material->GetNumberOfElements(); ++i) {
+
     AMaterial = (*theElementVector)(i)->GetA()*mole/g;
     ZMaterial = (*theElementVector)(i)->GetZ();
     
-    G4double Beta = sqrt( (2*KinEnergy) / PartMass );
-    G4double X = ( (137*Beta) * (137*Beta) ) / ZMaterial;
+    G4double Beta = sqrt( 2.0*KineticEnergy / proton_mass_c2 );
+    G4double X = ( (137.0*Beta) * (137.0*Beta) ) / ZMaterial;
   
     // Variables to compute L_1
     G4double Eta0Chi = 0.8;
-    G4double EtaChi = Eta0Chi * ( 1 + 6.02*pow( ZMaterial,-1.19 ) );
-    G4double W = ( EtaChi * pow( ZMaterial,1./6 ) ) / sqrt(X); 
-    G4double FunctionOfW = 0;
-    for(int IndexOfFTable=0;IndexOfFTable<47;IndexOfFTable++){
-     if(W<FTable[IndexOfFTable][0]){
-     		FunctionOfW =( FTable[IndexOfFTable][1] + FTable[IndexOfFTable-1][1] ) /2;
-		break;}
-       }
-    G4double BarkasCoeffLbyARB = FunctionOfW / ( sqrt(ZMaterial) * pow(X,3./2) );
-    BarkasTerm += 2 * BarkasCoeffLbyARB * ( 0.030708 * ZMaterial * RoMaterial )
+    G4double EtaChi = Eta0Chi * ( 1.0 + 6.02*pow( ZMaterial,-1.19 ) );
+    G4double W = ( EtaChi * pow( ZMaterial,1.0/6.0 ) ) / sqrt(X); 
+    G4double FunctionOfW = 0.0;
+    for(int IndexOfFTable=0; IndexOfFTable<47; IndexOfFTable++) {
+      if(W<FTable[IndexOfFTable][0]) {
+        if(0 == IndexOfFTable) {
+     	  FunctionOfW = FTable[0][1] ;
+        }
+     	else if(46 == IndexOfFTable) {
+          FunctionOfW = FTable[46][1] ;
+        }
+        else {
+     	  FunctionOfW =( FTable[IndexOfFTable][1] + FTable[IndexOfFTable-1][1] ) /2.0;
+        }
+        break;
+      }
+    }
+    G4double BarkasCoeffLbyARB = FunctionOfW / ( sqrt(ZMaterial) * pow(X,1.5) );
+    BarkasTerm += BarkasCoeffLbyARB * ( 0.030708 * ZMaterial * RoMaterial )
                	          / ( AMaterial*Beta*Beta );
-     }
-  return -BarkasTerm;
+  }
+
+  return BarkasTerm;
 }
         
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -998,6 +1284,12 @@ G4double G4hLowEnergyIonisation::GetBetheBlochLoss(const G4Material* material,
     ionloss -= delta + sh ;
     ionloss *= Factor*ElectronDensity/beta2 ;
   }
+
+  // Barkas correction term is switch on 
+  if( pbarStop) {
+    ionloss += ComputeBarkasTerm( material, KinEnergy ) * Charge ;
+  }  
+
   if ( ionloss <= 0.) ionloss = 0. ;
   
   return ionloss;
@@ -2015,7 +2307,7 @@ G4double G4hLowEnergyIonisation::MolecIsInZiegler1988(const G4Material* material
 
   // If the meterial is in the table then the Stopping Power at 125 keV exist
   // In that case the return value ExpStopPower125 > 0
-  G4int ExpStopPower125 = -1.0;
+  G4double ExpStopPower125 = -1.0;
   
   const G4String chFormula = material->GetChemicalFormula() ;
   if (" " == chFormula ) return ExpStopPower125 ;
@@ -2141,7 +2433,7 @@ G4double G4hLowEnergyIonisation::GetHeEffChargeSquare(const G4int iz,
   static G4double C[6] = {0.2865,  0.1266, -0.001429,
                           0.02402,-0.01135, 0.001475} ;
 
-  G4double E = log( max( 1.0, HeKinEnergy/(keV*HeMassAMU) ) ) ; 
+  G4double E = log( G4std::max( 1.0, HeKinEnergy/(keV*HeMassAMU) ) ) ; 
   G4double x = C[0] ;
   G4double y = 1.0 ;
     for (G4int i=1; i<6; i++) {
@@ -2241,7 +2533,7 @@ G4double G4hLowEnergyIonisation::GetIonEffChargeSquare(const G4Material* aMateri
   // Helium ion case
   if( IonCharge < 2.5 ) {
 
-    G4double E = log( max( 1.0, KinEnergy / (keV*HeMassAMU) ) ) ; 
+    G4double E = log( G4std::max( 1.0, KinEnergy / (keV*HeMassAMU) ) ) ; 
     G4double x = C[0] ;
     G4double y = 1.0 ;
       for (G4int i=1; i<6; i++) {
@@ -2273,7 +2565,7 @@ G4double G4hLowEnergyIonisation::GetIonEffChargeSquare(const G4Material* aMateri
     G4double q = 1.0 - exp( 0.803*y3 - 1.3167*y3*y3 - 0.38157*y - 0.008983*y*y ) ;     
     if( q < 0.0 ) q = 0.0 ;
 
-    Q = 7.6 -  log(max(1.0, ReducedEnergy/keV)) ; 
+    Q = 7.6 -  log(G4std::max(1.0, ReducedEnergy/keV)) ; 
     Q = 1.0 + ( 0.18 + 0.0015 * Z ) * exp( -Q*Q )/ (IonCharge*IonCharge) ;
 
     // Screen length according to
@@ -2297,26 +2589,18 @@ void G4hLowEnergyIonisation::PrintInfoDefinition()
   comments += "\n         Good description above the mean excitation energy.\n";
   comments += "         delta ray energy sampled from  differential Xsection.";
   
+  G4cout << G4endl << GetProcessName() << ":  " << comments
+         << "\n        PhysicsTables from " << LowestKineticEnergy / eV << " eV " 
+         << " to " << HighestKineticEnergy / TeV << " TeV "
+         << " in " << TotBin << " bins."
+         << "\n        Low energy losses approximation is taken from  " << DEDXtable
+         << "\n        from " << ParamLowEnergy / keV << " keV "
+         << " to " << ParamHighEnergy / MeV << " MeV " << "." << G4endl ;
   if(pbarStop){
-  G4cout << endl << GetProcessName() << ":  " << comments
-         << "\n        PhysicsTables from " << LowestKineticEnergy / eV << " eV " 
-         << " to " << HighestKineticEnergy / TeV << " TeV "
-         << " in " << TotBin << " bins."
-         << "\n        Low energy losses approximation is taken from  " << DEDXtable
-         << "\n        from " << ParamLowEnergy / keV << " keV "
-         << " to " << ParamHighEnergy / MeV << " MeV " << "." << endl ;
-  } else {
-  G4cout << endl << GetProcessName() << ":  " << comments
-         << "\n        PhysicsTables from " << LowestKineticEnergy / eV << " eV " 
-         << " to " << HighestKineticEnergy / TeV << " TeV "
-         << " in " << TotBin << " bins."
-         << "\n        Low energy losses approximation is taken from  " << DEDXtable
-         << "\n        from " << ParamLowEnergy / keV << " keV "
-         << " to " << ParamHighEnergy / MeV << " MeV " << "." << endl
-  	 << "\n Energy loss for antiproton now available only from 100 keV.";
+    G4cout << "        Parametrization of the Barkas effect is switched on." << G4endl ;
   }
   if(nStopping) {
-    G4cout << "        Simulation of nuclear stopping is switched on.  \n" << endl ; 
+    G4cout << "        Simulation of nuclear stopping is switched on." << G4endl ; 
   }
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4ionLowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4ionLowEnergyIonisation.cc
index 4d259d658f..430ceb6a7b 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4ionLowEnergyIonisation.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4ionLowEnergyIonisation.cc
@@ -21,6 +21,7 @@
 // ************************************************************
 //  6 September 1999 V.Ivanchenko create
 // 30 September 1999 V.Ivanchenko minor upgrade
+// 20 January   2000 V.Ivanchenko minor bag fixed
 // ------------------------------------------------------------
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -34,8 +35,7 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 G4ionLowEnergyIonisation::G4ionLowEnergyIonisation(const G4String& processName)
-  : G4hLowEnergyIonisation(processName),
-  theIon (G4Proton::Proton())
+  : G4hLowEnergyIonisation(processName)
 { 
   LowestKineticEnergy = 10.*eV ;
   HighestKineticEnergy = 100.*TeV ;
@@ -47,20 +47,16 @@ G4ionLowEnergyIonisation::G4ionLowEnergyIonisation(const G4String& processName)
 
 G4ionLowEnergyIonisation::~G4ionLowEnergyIonisation() 
 {
-  if (theMeanFreePathTable) {
-    theMeanFreePathTable->clearAndDestroy();
-    delete theMeanFreePathTable;
-  }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void G4ionLowEnergyIonisation::SetIonDefinition(G4ParticleDefinition* theIonType)
 {
-  theIon    = theIonType ;
-  MassRatio = proton_mass_c2/(theIonType->GetPDGMass()) ;
-  Charge    = (theIonType->GetPDGCharge())/eplus ;
-  cout << "New ion with Q = " << Charge << "; MassR = " << MassRatio << endl;
+  theParticle  = theIonType ;
+  MassRatio = proton_mass_c2/(theParticle->GetPDGMass()) ;
+  Charge    = (theParticle->GetPDGCharge())/eplus ;
+  G4cout << "New ion with Q = " << Charge << "; MassR = " << MassRatio << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -105,418 +101,9 @@ G4double G4ionLowEnergyIonisation::GetLowEnergyForParametrisation(const G4Materi
   }
   G4double E1 = 3.25 * keV ;
   G4double E2 = 25.0 * keV / pow(Z, 0.667) ;
-  E1 = max (E1, E2) ;
-  return max(ParamLowEnergy, E1) / MassRatio ; 
-}
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4double G4ionLowEnergyIonisation::GetConstraints(const G4DynamicParticle *aParticle,
-                                              G4Material *aMaterial)
-{
-  // returns the Step limit
-  // dRoverRange is the max. allowed relative range loss in one step
-  // it calculates dEdx and the range as well....
-
-  G4double KineticEnergy,StepLimit;
-  G4bool isOut ;
-
-  Charge = aParticle->GetDefinition()->GetPDGCharge()/eplus ;
-
-  KineticEnergy = aParticle->GetKineticEnergy();
-
-  G4double massratio=proton_mass_c2/
-           aParticle->GetDefinition()->GetPDGMass() ;
-
-  G4double Tscaled= KineticEnergy*massratio ; 
-  G4double ChargeSquare = GetIonEffChargeSquare(aMaterial,KineticEnergy,Charge) ;
-
-     if(Charge>0.)
-     {
-       fRangeNow = G4EnergyLossTables::GetRange( theProton,
-                                            Tscaled,aMaterial) ;
-        fdEdx     = G4EnergyLossTables::GetDEDX( theProton,
-                                            Tscaled,aMaterial) ;
-     }
-     else
-     {
-       fRangeNow = G4EnergyLossTables::GetRange( theAntiProton,
-                                             Tscaled,aMaterial) ;
-       fdEdx     = G4EnergyLossTables::GetDEDX( theAntiProton,
-                                             Tscaled,aMaterial) ;
-     }
-     fdEdx     *= ChargeSquare ;
-     fRangeNow /= (ChargeSquare*massratio) ;
-
-  // compute the (random) Step limit ..............
-  if(fRangeNow > finalRange)
-  {
-    StepLimit = (c1lim*fRangeNow+c2lim+c3lim/fRangeNow) ;
-
-    //  randomise this value
-    if(rndmStepFlag) StepLimit = 
-                finalRange+(StepLimit-finalRange)*G4UniformRand() ;
-    if(StepLimit > fRangeNow) StepLimit = fRangeNow ;
-  }
-  else StepLimit = fRangeNow ;
-
-
-  return StepLimit ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4VParticleChange* G4ionLowEnergyIonisation::AlongStepDoIt( 
-                              const G4Track& trackData,const G4Step& stepData) 
- // compute the energy loss after a step 
-{
-  const G4DynamicParticle* aParticle;
-  G4Material* aMaterial;
-  G4double finalT,Step,MeanLoss ;
-
-  aParticleChange.Initialize(trackData) ;
-  aMaterial = trackData.GetMaterial() ;
-  
-  // get the actual (true) Step length from stepData 
-  Step = stepData.GetStepLength() ;
-
-  aParticle = trackData.GetDynamicParticle() ;
-
-  G4int index = aMaterial->GetIndex() ;
-  G4double E = aParticle->GetKineticEnergy() ;
-  G4double ParticleCharge = aParticle->GetDefinition()->GetPDGCharge() ;
-  G4double ChargeSquare = GetIonEffChargeSquare(aMaterial, E, ParticleCharge) ;
-
-  if(E < MinKineticEnergy) MeanLoss = E ;
-  else
-  {
-    if(Step >= fRangeNow ) MeanLoss = E ;
-
-    else if(( E > HighestKineticEnergy)||( E <= LowestKineticEnergy))
-              MeanLoss = Step*fdEdx ; 
-     
-    else
-    {
-      if(Step>linLossLimit*fRangeNow)
-      {
-        G4double massratio=proton_mass_c2/
-                 aParticle->GetDefinition()->GetPDGMass() ;
-
-        G4double rscaled= fRangeNow*massratio*ChargeSquare ;
-        G4double sscaled=   Step   *massratio*ChargeSquare ;
-
-        if(Charge>0.)
-        {
-          MeanLoss = G4EnergyLossTables::GetPreciseEnergyFromRange(
-                                         theProton,
-                                         rscaled        ,aMaterial) -
-                     G4EnergyLossTables::GetPreciseEnergyFromRange(
-                                         theProton,
-                                         rscaled-sscaled,aMaterial) ;
-        }
-        else
-        {
-          MeanLoss = G4EnergyLossTables::GetPreciseEnergyFromRange(
-                                         theAntiProton,
-                                         rscaled        ,aMaterial) -
-                     G4EnergyLossTables::GetPreciseEnergyFromRange(
-                                         theAntiProton,
-                                         rscaled-sscaled,aMaterial) ;
-        }
-        MeanLoss /= (massratio*ChargeSquare) ;
-      }
-      else MeanLoss = Step*fdEdx ;
-    }
-  } 
-  finalT = E - MeanLoss ;
-
-  if(finalT < MinKineticEnergy) finalT = 0. ;
-
-  //  now the loss with fluctuation
-  if((EnlossFlucFlag) && (finalT > 0.) && (finalT < E)&&(E > LowestKineticEnergy))
-  {
-    MeanLoss /= ChargeSquare ;
-    finalT = E-GetLossWithFluct(aParticle,aMaterial,MeanLoss)*ChargeSquare ;
-    if (finalT < 0.) finalT = E-MeanLoss ;
-  }
-
-  //  kill the particle if the kinetic energy <= 0  
-  if (finalT <= 0. )
-  {
-    finalT = 0.;
-    if(aParticle->GetDefinition()->GetParticleName() == "proton")
-      aParticleChange.SetStatusChange(fStopAndKill);
-    else  
-      aParticleChange.SetStatusChange(fStopButAlive); 
-  } 
-
-  aParticleChange.SetEnergyChange( finalT ) ;
-  aParticleChange.SetLocalEnergyDeposit(E-finalT) ;
-
-  return &aParticleChange ;
-}
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4double G4ionLowEnergyIonisation::GetIonParametrisedLoss(const G4Material* material, 
-                                                          const G4double KinEnergy, 
-                                                          const G4double DeltaRayCutNow)
-{
-  // Inicialisation
-  G4double               Se = 0.0 ;
-  G4double               Sn = 0.0 ;
-  G4double          ionloss = 0.0 ; 
-  G4double           ion125 = 0.0 ; 
-  G4double  ExpStopPower125 = 0.0 ;
-  G4double ReducedKinEnergy = KinEnergy * MassRatio ;
-  G4double     ChargeSquare = GetIonEffChargeSquare(material, KinEnergy, Charge) ;
-  G4double               Z1 = Charge ;
-  G4double               A1 = ProtonMassAMU / MassRatio ;
-
-  // First of all check tables for specific materials for ICRU_49 parametrisation
-  G4int molecIndex = (MolecIsInICRU_R49p(material))+1; 
- 
-  if ((molecIndex > 0) && (DEDXtable == "ICRU_R49p")) {
-
-    G4double NbOfAtomsPerVolume  = material->GetTotNbOfAtomsPerVolume();
-    ionloss = GetStoppingPowerICRU_R49p(molecIndex, ReducedKinEnergy, "Mol")  
-            * NbOfAtomsPerVolume * ZieglerFactor * ChargeSquare ;
-
-    // Second - check the table for chemical factors
-  } else {
-    G4double ExpStopPower125 = MolecIsInZiegler1988(material); 
-  }
-
-
-  // get elements in the actual material,
-  const G4ElementVector* theElementVector = material->GetElementVector() ;
-  const G4double* theAtomicNumDensityVector = material->GetAtomicNumDensityVector() ;
-  const G4int NumberOfElements = material->GetNumberOfElements() ;
-  
-  //  loop for the elements in the material
-  //  calculation based on Bragg's rule 
-  for (G4int iel=0; iel<NumberOfElements; iel++)
-    {
-      const G4Element* element = (*theElementVector)(iel) ;
-      G4double Z2 = element->GetZ() ;
-      G4double A2 = element->GetA()*mole/g ;
-      G4int iz = int(Z2) ;
-      if( iz <= 0 ) iz = 1 ;
-      if( iz > 92 ) iz = 92 ; 
-      
-  // Electronic Stopping Power 
-  // Choose the parametrisation using the table name
-      
-  // The "Ziegler1977H" table
-      if(DEDXtable == "Ziegler1977H") { 
-        Se = GetStoppingPower1977H(iz, ReducedKinEnergy)  
-           * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	
-        // Chemical factor calculation
-        if(ExpStopPower125 > 0.0){
-          ion125 += GetStoppingPower1977H(iz, 125.0*keV)  
-                  * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-
-	// Nuclear Stopping Power
-        if(nStopping) {
-          Sn += GetStoppingPower1977n(Z1, Z2, A1, A2, KinEnergy) 
-              * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-  // The "Ziegler1977He" table
-      } else if(DEDXtable == "Ziegler1977He") {
-	G4double HeKinEnergy = ReducedKinEnergy*HeMassAMU/ProtonMassAMU ;
-        Se = GetStoppingPower1977He(iz, HeKinEnergy) 
-           * theAtomicNumDensityVector[iel]*ZieglerFactor 
-           / GetHeEffChargeSquare(iz, HeKinEnergy) ;
-
-        // Chemical factor calculation
-        if(ExpStopPower125 > 0.0){
-          ion125 += GetStoppingPower1977H(iz, 125.0*keV) 
-                  * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-
-	// Nuclear Stopping Power
-        if(nStopping) {
-          Sn += GetStoppingPower1977n(Z1, Z2, A1, A2, KinEnergy) 
-              * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-      
-  // The "ICRU_R49p" table
-      } else if(DEDXtable == "ICRU_R49p") {
-
-        // The material is not in the list of materials
-        if(molecIndex < 0) { 
-          Se = GetStoppingPowerICRU_R49p(iz, ReducedKinEnergy, "Ele")  
-             * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-        } 
-
-        // Chemical factor calculation
-        if(ExpStopPower125 > 0.0){
-          ion125 += GetStoppingPowerICRU_R49p(iz, 125.0*keV, "Ele") 
-                  * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-	
-	// Nuclear Stopping Power 
-        if(nStopping) {
-          Sn += GetStoppingPowerMoliere(Z1, Z2, A1, A2, KinEnergy) 
-              * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-
-  // The "ICRU_R49He" table
-      } else if(DEDXtable == "ICRU_R49He") {
-	G4double HeKinEnergy = ReducedKinEnergy*HeMassAMU/ProtonMassAMU ;
-        Se = GetStoppingPowerICRU_R49He(iz, HeKinEnergy) 
-           * theAtomicNumDensityVector[iel]*ZieglerFactor 
-           / GetHeEffChargeSquare(iz, HeKinEnergy) ; 
-
-        // Chemical factor calculation
-        if(ExpStopPower125 > 0.0){
-          ion125 += GetStoppingPowerICRU_R49p(iz, 125.0*keV, "Ele")  
-                  * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-
-	// Nuclear Stopping Power
-        if(nStopping) {
-          Sn += GetStoppingPower1985n(Z1, Z2, A1, A2, KinEnergy) 
-              * theAtomicNumDensityVector[iel]*ZieglerFactor ;
-	}
-		
-  // The G4 beta version model
-      } else if(DEDXtable == "UrbanModel") {
-        Se = theAtomicNumDensityVector[iel]*GetUrbanModel(element, ReducedKinEnergy) ;
-
-        // Chemical factor calculation
-        if(ExpStopPower125 > 0.0){
-          ion125 += theAtomicNumDensityVector[iel]*GetUrbanModel(element, 125.0*keV) ;
-	}
-      }
-      
-      ionloss     += Se * ChargeSquare ;
-    }
-
-  // Chemical factor is taken into account
-  if(ExpStopPower125 > 0.0) {
-    ionloss *= GetChemicalFactor(ExpStopPower125, ReducedKinEnergy, ion125) ;
-  }
-
-  // Correction due to delta-electrons energy loss. 
-  // Bethe-Bloch formulae was used. 
-  if(DEDXtable != "UrbanModel") {
-    ionloss -= GetDeltaRaysEnergy(material, ReducedKinEnergy, DeltaRayCutNow) 
-             * ChargeSquare ;
-  }
-
-  // Nuclear Stopping Power
-  if(nStopping) ionloss += Sn ;
-    
-  if ( ionloss <= 0.) ionloss = 0. ;
-  
-  return ionloss;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4double G4ionLowEnergyIonisation::GetIonBetheBlochLoss(const G4Material* material, 
-                                                        const G4double KinEnergy,
-                                                        const G4double DeltaRayCutNow)
-{
-  G4double ionloss ;
-  G4double taul = material->GetIonisation()->GetTaul() ;
-  G4double tau  = MassRatio*KinEnergy/proton_mass_c2 ;    // tau is relative energy
-  G4double ChargeSquare = GetIonEffChargeSquare(material, KinEnergy, Charge) ;
-  
-  if ( tau < taul ) {
-    
-    //  low energy part , parametrised L.Urban energy loss formulae
-    
-    const G4ElementVector* theElementVector=
-      material->GetElementVector() ;
-    const G4double* theAtomicNumDensityVector=
-      material->GetAtomicNumDensityVector() ;
-    const G4int NumberOfElements=
-      material->GetNumberOfElements() ;
-    
-    ionloss = 0. ;
-    
-    //  loop for the elements in the material
-    for (G4int iel=0; iel<NumberOfElements; iel++)
-      {
-	const G4Element* element = (*theElementVector)(iel) ;
-	ionloss += GetUrbanModel(element, KinEnergy*MassRatio) * theAtomicNumDensityVector[iel] ;
-      }
-    
-  } else {
-    // Standard Bethe-Bloch formulae
-    
-    // some local variables 
-    
-    G4double gamma,bg2,beta2,Tmax,rcut,x,delta,sh ;
-    G4double ElectronDensity = material->GetElectronDensity();
-    G4double Eexc = material->GetIonisation()->GetMeanExcitationEnergy();
-    G4double Eexc2 = Eexc*Eexc ;
-    G4double Cden = material->GetIonisation()->GetCdensity();
-    G4double Mden = material->GetIonisation()->GetMdensity();
-    G4double Aden = material->GetIonisation()->GetAdensity();
-    G4double X0den = material->GetIonisation()->GetX0density();
-    G4double X1den = material->GetIonisation()->GetX1density();
-    G4double* ShellCorrectionVector;
-    ShellCorrectionVector = material->GetIonisation()->
-      GetShellCorrectionVector();
-    
-    gamma = tau + 1.0 ;
-    bg2 = tau*(tau+2.0) ;
-    beta2 = bg2/(gamma*gamma) ;
-    Tmax = 2.*electron_mass_c2*bg2/(1.+2.*gamma*RateMass+RateMass*RateMass) ;
-    
-    if ( DeltaRayCutNow < Tmax)
-      rcut = DeltaRayCutNow/Tmax ;
-    else
-      rcut = 1.;
-    
-    ionloss = log(2.*electron_mass_c2*bg2*Tmax/Eexc2)+log(rcut)-(1.+rcut)*beta2 ;
-    
-    // density correction 
-    
-    x = log(bg2)/twoln10 ;
-    if ( x < X0den )
-      delta = 0. ;
-    else 
-      {
-	delta = twoln10*x - Cden ;
-	if ( x < X1den )
-	  delta += Aden*pow((X1den-x),Mden) ;
-      } 
-    
-    // shell correction 
-    
-    if ( bg2 > bg2lim ) {
-      sh = 0. ;      
-      x = 1. ;
-      for (G4int k=0; k<=2; k++) {
-	x *= bg2 ;
-	sh += ShellCorrectionVector[k]/x;
-      }
-    } else {
-      sh = 0. ;      
-      x = 1. ;
-      for (G4int k=0; k<=2; k++) {
-	x *= bg2lim ;
-	sh += ShellCorrectionVector[k]/x;
-      }
-      sh *= log(tau/taul)/log(taulim/taul) ;     
-    }
-    
-    // now you can compute the total ionisation loss
-    
-    ionloss -= delta + sh ;
-    ionloss *= Factor*ElectronDensity*ChargeSquare/beta2 ;
-  }
-  if ( ionloss <= 0.) ionloss = 0. ;
-  
-  return ionloss;
+  E1 = G4std::max (E1, E2) ;
+  E1 = G4std::max(ParamLowEnergy, E1) / MassRatio ; 
+  return E1 ; 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -543,16 +130,16 @@ void G4ionLowEnergyIonisation::PrintInfoDefinition()
   comments += "\n         Good description above the mean excitation energy.\n";
   comments += "         delta ray energy sampled from  differential Xsection.";
   
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
 							  "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
          << " in " << TotBin << " bins."
          << "\n        Low energy losses approximation is taken from  " << DEDXtable
          << "\n        from " << G4BestUnit(ParamLowEnergy,"Energy")
-         << " to " << G4BestUnit(ParamHighEnergy,"Energy") << "." << endl ;
+         << " to " << G4BestUnit(ParamHighEnergy,"Energy") << "." << G4endl ;
   if(nStopping) {
-    G4cout << "        Simulation of nuclear stopping is switched on.  \n" << endl ; 
+    G4cout << "        Simulation of nuclear stopping is switched on.  \n" << G4endl ; 
   }
 }
 
diff --git a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh b/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh
index a2eaee0ae3..0437fbb7f7 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh
+++ b/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMuBremsstrahlung.hh,v 1.1.10.1 1999/12/07 20:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc b/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc
index 0b5528d509..db7ddfeb6c 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc
+++ b/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuBremsstrahlung.icc,v 1.1.10.1 1999/12/07 20:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuBremsstrahlung.icc,v 1.1.10.1.2.1 1999/12/08 17:34:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
@@ -71,10 +71,10 @@ inline G4double G4IMuBremsstrahlung::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IMuBremsstrahlung PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
-      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << endl
+              "  " << nl << G4endl;
+      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << G4endl
 ;
-      G4cout << " correction : Nlambda old=new ........." << endl;
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       //corr. of num errror
       nlold = nl ;
@@ -121,10 +121,10 @@ inline G4double G4IMuBremsstrahlung::PostStepGetPhysicalInteractionLength(
     {
     if(verboseLevel>2)
     {
-     G4cout << "G4IhIonisation PostStepGPIL: Step < 0.!, Step=" << value << endl
+     G4cout << "G4IhIonisation PostStepGPIL: Step < 0.!, Step=" << value << G4endl
 ;
-     G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-     G4cout << "correction : rangenext=range ....." << endl;
+     G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+     G4cout << "correction : rangenext=range ....." << G4endl;
     }
      //corr. of num error
      rangenext = range ;
diff --git a/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.hh b/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.hh
index 9562a04fa3..f53035ddde 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.hh
+++ b/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuEnergyLoss.hh,v 1.2.8.1 1999/12/07 20:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuEnergyLoss.hh,v 1.2.8.1.2.2 1999/12/14 07:08:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -------------------------------------------------------------------
@@ -36,8 +36,8 @@
 #define G4IMuEnergyLoss_h 1
  
 #include "G4ios.hh"
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 #include "globals.hh"
 #include "Randomize.hh"
 #include "G4IVContinuousDiscreteProcess.hh"
diff --git a/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.icc b/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.icc
index 24b508a91b..7ba6eacacb 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.icc
+++ b/source/processes/electromagnetic/muons/include/G4IMuEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMuEnergyLoss.icc,v 1.1.10.1 1999/12/07 20:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh b/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh
index 2f54dcf08d..de38bbc90f 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh
+++ b/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMuIonisation.hh,v 1.1.10.1 1999/12/07 20:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc b/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc
index 83e2e81907..6159b0c549 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc
+++ b/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuIonisation.icc,v 1.1.10.1 1999/12/07 20:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuIonisation.icc,v 1.1.10.1.2.1 1999/12/08 17:34:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
@@ -77,10 +77,10 @@ inline G4double G4IMuIonisation::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IMuIonisation PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
-      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << endl
+              "  " << nl << G4endl;
+      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << G4endl
 ;
-      G4cout << " correction : Nlambda old=new ........." << endl;
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       //corr. of num errror
       nlold = nl ;
@@ -127,10 +127,10 @@ inline G4double G4IMuIonisation::PostStepGetPhysicalInteractionLength(
     {
     if(verboseLevel>2)
     {
-     G4cout << "G4IMuIonisation PostStepGPIL: Step < 0.!, Step=" << value << endl
+     G4cout << "G4IMuIonisation PostStepGPIL: Step < 0.!, Step=" << value << G4endl
 ;
-     G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-     G4cout << "correction : rangenext=range ....." << endl;
+     G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+     G4cout << "correction : rangenext=range ....." << G4endl;
     }
      //corr. of num error
      rangenext = range ;
diff --git a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh b/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh
index ceb6770e9e..f5674bab41 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh
+++ b/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMuPairProduction.hh,v 1.1.10.1 1999/12/07 20:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc b/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc
index 3910d08095..458d520508 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc
+++ b/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuPairProduction.icc,v 1.1.10.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuPairProduction.icc,v 1.1.10.1.2.1 1999/12/08 17:34:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
@@ -79,10 +79,10 @@ inline G4double G4IMuPairProduction::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IMuPairProduction PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
-      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << endl
+              "  " << nl << G4endl;
+      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << G4endl
 ;
-      G4cout << " correction : Nlambda old=new ........." << endl;
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       //corr. of num errror
       nlold = nl ;
@@ -129,10 +129,10 @@ inline G4double G4IMuPairProduction::PostStepGetPhysicalInteractionLength(
     {
     if(verboseLevel>2)
     {
-     G4cout << "G4IMuPairProduction PostStepGPIL: Step < 0.!, Step=" << value << endl
+     G4cout << "G4IMuPairProduction PostStepGPIL: Step < 0.!, Step=" << value << G4endl
 ;
-     G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-     G4cout << "correction : rangenext=range ....." << endl;
+     G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+     G4cout << "correction : rangenext=range ....." << G4endl;
     }
      //corr. of num error
      rangenext = range ;
diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
index 0c5af7f544..66f840b596 100644
--- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuBremsstrahlung.hh,v 1.2.8.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
index d281d72d3d..c34081a765 100644
--- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuBremsstrahlung.icc,v 1.2.8.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.hh b/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.hh
index e46d5307b5..1d94b50521 100644
--- a/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuEnergyLoss.hh,v 1.3.8.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuEnergyLoss.hh,v 1.3.8.1.2.2 1999/12/14 07:08:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -------------------------------------------------------------------
@@ -37,8 +37,8 @@
 #define G4MuEnergyLoss_h 1
  
 #include "G4ios.hh"
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 #include "globals.hh"
 #include "Randomize.hh"
 #include "G4VContinuousDiscreteProcess.hh"
diff --git a/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.icc b/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.icc
index 188fc8bad1..d35a6f107e 100644
--- a/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuEnergyLoss.icc,v 1.1.10.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
index 28067bb08a..f2c2c39c69 100644
--- a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuIonisation.hh,v 1.3.8.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.icc b/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
index 416e8b3c88..9b6ab5a33d 100644
--- a/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuIonisation.icc,v 1.1.10.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
index ceb1e22d4b..447f708a6a 100644
--- a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuPairProduction.hh,v 1.2.8.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc b/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
index 816f0cd83f..2a6a5ee94d 100644
--- a/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuPairProduction.icc,v 1.1.10.1 1999/12/07 20:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc b/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc
index 95b82818fd..daa284ec8d 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc
+++ b/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuBremsstrahlung.cc,v 1.2.8.1 1999/12/07 20:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuBremsstrahlung.cc,v 1.2.8.1.2.2 1999/12/09 16:18:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //    
 // --------------------------------------------------------------
@@ -115,21 +115,21 @@ void G4IMuBremsstrahlung::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ;
+         << "         (Tprime-T)/T(%)" << G4endl ;
    }
 
     G4PhysicsLogVector* aVector ;
@@ -163,28 +163,28 @@ void G4IMuBremsstrahlung::TestOfInversion(
       }
      if(printflag>1)
      {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IMuBremsstrahlung::TestOfInversion (T->Nlambda->Tprime) " << endl ;
+    G4cout << G4endl;
+    G4cout << "G4IMuBremsstrahlung::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta
 ;
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
 
@@ -537,7 +537,7 @@ void G4IMuBremsstrahlung::BuildInverseNlambdaTable(
      // inverse can be built for "meaningful" cut value only!
       if(Smallest >= Biggest)
       {
-         G4cout << endl ;
+         G4cout << G4endl ;
          G4Exception(
         "Cut value is too big , smaller value should be used !");
       }
@@ -1185,6 +1185,6 @@ G4Element* G4IMuBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
diff --git a/source/processes/electromagnetic/muons/src/G4IMuEnergyLoss.cc b/source/processes/electromagnetic/muons/src/G4IMuEnergyLoss.cc
index 0906743336..2c0888278b 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuEnergyLoss.cc
+++ b/source/processes/electromagnetic/muons/src/G4IMuEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMuEnergyLoss.cc,v 1.3.6.1 1999/12/07 20:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc b/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc
index d7769d9bea..b2a4510f5f 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc
+++ b/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuIonisation.cc,v 1.2.8.1 1999/12/07 20:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuIonisation.cc,v 1.2.8.1.2.2 1999/12/09 16:18:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -121,21 +121,21 @@ void G4IMuIonisation::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ;
+         << "         (Tprime-T)/T(%)" << G4endl ;
    }
 
     G4PhysicsLogVector* aVector ;
@@ -169,28 +169,28 @@ void G4IMuIonisation::TestOfInversion(
       }
     if(printflag>1)
      {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IMuIonisation::TestOfInversion (T->Nlambda->Tprime) " << endl ;
+    G4cout << G4endl;
+    G4cout << "G4IMuIonisation::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta
 ;
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
 
@@ -542,7 +542,7 @@ void G4IMuIonisation::BuildInverseNlambdaTable(
      // inverse can be built for "meaningful" cut value only!
       if(Smallest >= Biggest)
       {
-         G4cout << endl ;
+         G4cout << G4endl ;
          G4Exception(
         "Cut value is too big , smaller value should be used !");
       }
diff --git a/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc b/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc
index 47cdc0d357..9d54590e5c 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc
+++ b/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuPairProduction.cc,v 1.2.8.1 1999/12/07 20:50:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMuPairProduction.cc,v 1.2.8.1.2.4 1999/12/12 12:31:20 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -53,22 +53,22 @@ G4IMuPairProduction::G4IMuPairProduction(const G4String& processName)
     theMuonPlus ( G4MuonPlus::MuonPlus() )
 {
 
-    theMeanFreePathTable = NULL ;
+  theMeanFreePathTable = NULL ;
 
-  cout << endl ;
-  cout << "****************************************************************" << endl;
-  cout << "****************************************************************" << endl;
-  cout << "**                                                            **" << endl; 
-  cout << "**   G4IMuPairProduction :                                     **" << endl;
-  cout << "**      cross section/energy loss is calculated using         **" << endl;
-  cout << "**      the accurate cross section formula of R.Kokoulin,     **" << endl;
-  cout << "**      ( building the tables takes a lot of time,            **" << endl;
-  cout << "**                   PLEASE BE PATIENT  ! )                   **" << endl;
-  cout << "**      sampling of the energy of the pair is generated       **" << endl;
-  cout << "**      according to the sampling tables.                     **" << endl;
-  cout << "**                                                            **" << endl;
-  cout << "****************************************************************" << endl;
-  cout << "****************************************************************" << endl;
+  G4cout << G4endl ;
+  G4cout << "****************************************************************" << G4endl;
+  G4cout << "****************************************************************" << G4endl;
+  G4cout << "**                                                            **" << G4endl; 
+  G4cout << "**   G4IMuPairProduction :                                    **" << G4endl;
+  G4cout << "**      cross section/energy loss is calculated using         **" << G4endl;
+  G4cout << "**      the accurate cross section formula of R.Kokoulin,     **" << G4endl;
+  G4cout << "**      ( building the tables takes a lot of time,            **" << G4endl;
+  G4cout << "**                   PLEASE BE PATIENT  ! )                   **" << G4endl;
+  G4cout << "**      sampling of the energy of the pair is generated       **" << G4endl;
+  G4cout << "**      according to the sampling tables.                     **" << G4endl;
+  G4cout << "**                                                            **" << G4endl;
+  G4cout << "****************************************************************" << G4endl;
+  G4cout << "****************************************************************" << G4endl;
 }
  
 // destructor
@@ -148,21 +148,21 @@ void G4IMuPairProduction::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ;
+         << "         (Tprime-T)/T(%)" << G4endl ;
    }
 
     G4PhysicsLogVector* aVector ;
@@ -196,28 +196,28 @@ void G4IMuPairProduction::TestOfInversion(
       }
     if(printflag>1)
      {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IMuPairProduction::TestOfInversion (T->Nlambda->Tprime) " << endl ;
+    G4cout << G4endl;
+    G4cout << "G4IMuPairProduction::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta
 ;
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
 
@@ -570,7 +570,7 @@ void G4IMuPairProduction::BuildInverseNlambdaTable(
      // inverse can be built for "meaningful" cut value only!
       if(Smallest >= Biggest)
       {
-         G4cout << endl ;
+         G4cout << G4endl ;
          G4Exception(
         "Cut value is too big , smaller value should be used !");
       }
@@ -1329,7 +1329,7 @@ G4VParticleChange* G4IMuPairProduction::PostStepDoIt(const G4Track& trackData,
    G4double ElectKineEnergy = ElectronEnergy - electron_mass_c2 ;
 
    if (G4EnergyLossTables::GetRange(G4Electron::Electron(),ElectKineEnergy,aMaterial)
-        >= min(G4Electron::GetCuts(),stepData.GetPostStepPoint()->GetSafety()) )         
+        >= G4std::min(G4Electron::GetCuts(),stepData.GetPostStepPoint()->GetSafety()) )         
       {
         numberofsecondaries += 1 ;
         flagelectron = 1 ;
@@ -1350,7 +1350,7 @@ G4VParticleChange* G4IMuPairProduction::PostStepDoIt(const G4Track& trackData,
    PositronMomentum = sqrt(PositKineEnergy*(PositronEnergy+electron_mass_c2));
 
    if (G4EnergyLossTables::GetRange(G4Positron::Positron(),PositKineEnergy,aMaterial)
-        < min(G4Positron::GetCuts(),stepData.GetPostStepPoint()->GetSafety()) )         
+        < G4std::min(G4Positron::GetCuts(),stepData.GetPostStepPoint()->GetSafety()) )         
       {
         LocalEnerDeposit += PositKineEnergy ;
         PositKineEnergy = 0. ;
@@ -1410,7 +1410,7 @@ G4Element* G4IMuPairProduction::SelectRandomAtom(G4Material* aMaterial) const
 
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   }
-  cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+  G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
+         << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
index 3c33fcca92..c6095e7487 100644
--- a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuBremsstrahlung.cc,v 1.5.8.1 1999/12/07 20:50:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuBremsstrahlung.cc,v 1.5.8.1.2.1 1999/12/08 17:34:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //    
 // --------------------------------------------------------------
@@ -568,7 +568,7 @@ G4Element* G4MuBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material " << aMaterial->GetName()
-       << " has no elements, NULL pointer returned." << endl;
+       << " has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 
@@ -577,7 +577,7 @@ void G4MuBremsstrahlung::PrintInfoDefinition()
   G4String comments = "theoretical cross section \n ";
            comments += "         Good description up to 1000 TeV.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n    PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                      "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/muons/src/G4MuEnergyLoss.cc b/source/processes/electromagnetic/muons/src/G4MuEnergyLoss.cc
index 19531f575c..d34c422515 100644
--- a/source/processes/electromagnetic/muons/src/G4MuEnergyLoss.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuEnergyLoss.cc,v 1.8.6.1 1999/12/07 20:50:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
index fa0969f2c9..8196a4683b 100644
--- a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuIonisation.cc,v 1.4.8.1 1999/12/07 20:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuIonisation.cc,v 1.4.8.1.2.1 1999/12/08 17:34:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -509,7 +509,7 @@ void G4MuIonisation::PrintInfoDefinition()
            comments += "         Good description above the mean excitation energy.\n";
            comments += "         delta ray energy sampled from  differential Xsection." ;
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n      PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
index 2566ae9223..906ef029be 100644
--- a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuPairProduction.cc,v 1.6.8.1 1999/12/07 20:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuPairProduction.cc,v 1.6.8.1.2.2 1999/12/09 16:18:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -786,8 +786,8 @@ G4Element* G4MuPairProduction::SelectRandomAtom(G4Material* aMaterial) const
   {
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   }
-  cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+  G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
+         << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 void G4MuPairProduction::PrintInfoDefinition()
@@ -795,7 +795,7 @@ void G4MuPairProduction::PrintInfoDefinition()
   G4String comments = "theoretical cross sections \n ";
            comments += "         Good description up to 1000 TeV.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n    PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                      "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
index 8cdc74bef3..3eac7be262 100644
--- a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ComptonScattering.hh,v 1.1.10.1 1999/12/07 20:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc b/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
index 720ab10e9b..26c70f1337 100644
--- a/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
+++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ComptonScattering.icc,v 1.1.10.1 1999/12/07 20:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4EnergyLossMessenger.hh b/source/processes/electromagnetic/standard/include/G4EnergyLossMessenger.hh
index 7324092a94..9422b84d28 100644
--- a/source/processes/electromagnetic/standard/include/G4EnergyLossMessenger.hh
+++ b/source/processes/electromagnetic/standard/include/G4EnergyLossMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossMessenger.hh,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
index d04fc27dbb..cd3331f8ea 100644
--- a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
+++ b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GammaConversion.hh,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.icc b/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
index 383bf762d5..6eabebc438 100644
--- a/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
+++ b/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GammaConversion.icc,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IMultipleScattering.hh b/source/processes/electromagnetic/standard/include/G4IMultipleScattering.hh
index fd478e615c..862b19f071 100644
--- a/source/processes/electromagnetic/standard/include/G4IMultipleScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4IMultipleScattering.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMultipleScattering.hh,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMultipleScattering.hh,v 1.1.10.1.2.2 1999/12/14 07:08:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // --------------------------------------------------------------
@@ -35,8 +35,8 @@
 #define G4IMultipleScattering_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 
 #include "globals.hh"
 #include "Randomize.hh"
diff --git a/source/processes/electromagnetic/standard/include/G4IMultipleScattering.icc b/source/processes/electromagnetic/standard/include/G4IMultipleScattering.icc
index e966d9a6c2..c5b9f358ed 100644
--- a/source/processes/electromagnetic/standard/include/G4IMultipleScattering.icc
+++ b/source/processes/electromagnetic/standard/include/G4IMultipleScattering.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IMultipleScattering.icc,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh b/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh
index 8fb44dd34b..2f390746b2 100644
--- a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh
+++ b/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IeBremsstrahlung.hh,v 1.2.8.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc b/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc
index 2a645c8164..357197f736 100644
--- a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc
+++ b/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeBremsstrahlung.icc,v 1.2.8.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeBremsstrahlung.icc,v 1.2.8.1.2.1 1999/12/08 17:34:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
@@ -82,10 +82,10 @@ inline G4double G4IeBremsstrahlung::PostStepGetPhysicalInteractionLength(
        {
          G4cout << "G4IeBremsstrahlung PostStepGPIL : Nlambda has been" <<
                  " increased at update.Nlambda old/new :" << nlold <<
-                 "  " << nl << endl;
+                 "  " << nl << G4endl;
          G4cout << "(theNumberOfInteractionLengthLeft has been increased!)"
-                << endl;
-         G4cout << " correction : Nlambda old=new ........." << endl;
+                << G4endl;
+         G4cout << " correction : Nlambda old=new ........." << G4endl;
        }
        nlold = nl ;
      }
@@ -128,9 +128,9 @@ inline G4double G4IeBremsstrahlung::PostStepGetPhysicalInteractionLength(
       if(verboseLevel>2)
       {
         G4cout << "G4IeBremsstrahlung PostStepGPIL: Step < 0.!, Step=" <<
-                  value << endl;
-        G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-        G4cout << "correction : rangenext=range ....." << endl;
+                  value << G4endl;
+        G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+        G4cout << "correction : rangenext=range ....." << G4endl;
       }
       rangenext = range ;
       value = range - rangenext ;
diff --git a/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.hh
index e95f5d2148..e561e5a07c 100644
--- a/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IeEnergyLoss.hh,v 1.1.10.1 1999/12/07 20:50:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.icc
index 19a3275143..abdce03224 100644
--- a/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4IeEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IeEnergyLoss.icc,v 1.1.10.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeIonisation.hh b/source/processes/electromagnetic/standard/include/G4IeIonisation.hh
index bcce36caa5..249dd478a9 100644
--- a/source/processes/electromagnetic/standard/include/G4IeIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4IeIonisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeIonisation.hh,v 1.2.8.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeIonisation.hh,v 1.2.8.1.2.2 1999/12/14 07:08:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
@@ -31,7 +31,7 @@
 #define G4IeIonisation_h 1
  
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "globals.hh"
 #include "Randomize.hh"
 #include "G4IeEnergyLoss.hh"
diff --git a/source/processes/electromagnetic/standard/include/G4IeIonisation.icc b/source/processes/electromagnetic/standard/include/G4IeIonisation.icc
index 470672d99c..89a5043910 100644
--- a/source/processes/electromagnetic/standard/include/G4IeIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4IeIonisation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeIonisation.icc,v 1.2.8.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeIonisation.icc,v 1.2.8.1.2.1 1999/12/08 17:34:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
@@ -78,10 +78,10 @@ inline G4double G4IeIonisation::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IeIonisation PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
+              "  " << nl << G4endl;
       G4cout << "(theNumberOfInteractionLengthLeft has been increased!)"
-                                                                     << endl; 
-      G4cout << " correction : Nlambda old=new ........." << endl;
+                                                                     << G4endl; 
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       nlold = nl ;
      }
@@ -126,9 +126,9 @@ inline G4double G4IeIonisation::PostStepGetPhysicalInteractionLength(
      if(verboseLevel>2)
      {
       G4cout << "G4IeIonisation PostStepGPIL: Step < 0.!, Step="
-                                                        << value << endl; 
-      G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-      G4cout << "correction : rangenext=range ....." << endl;
+                                                        << value << G4endl; 
+      G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+      G4cout << "correction : rangenext=range ....." << G4endl;
      }
      rangenext = range ;
      value = range - rangenext ;
diff --git a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh b/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh
index c687d47092..28037031a7 100644
--- a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh
+++ b/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IeplusAnnihilation.hh,v 1.1.10.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc b/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc
index 0e243e134f..b87412151b 100644
--- a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc
+++ b/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeplusAnnihilation.icc,v 1.1.10.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeplusAnnihilation.icc,v 1.1.10.1.2.1 1999/12/08 17:34:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
@@ -107,9 +107,9 @@ inline G4double G4IeplusAnnihilation::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IeplusAnnihilation PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
-      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << endl;
-      G4cout << " correction : Nlambda old=new ........." << endl;
+              "  " << nl << G4endl;
+      G4cout << "(theNumberOfInteractionLengthLeft has been increased!)" << G4endl;
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       nlold = nl ;
      }
@@ -155,9 +155,9 @@ inline G4double G4IeplusAnnihilation::PostStepGetPhysicalInteractionLength(
     if(verboseLevel>2)
     {
      G4cout << "G4IeplusAnnihilation PostStepGPIL: Step < 0.!, Step=" <<
-             value << endl;
-     G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-     G4cout << "correction : rangenext=range ....." << endl;
+             value << G4endl;
+     G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+     G4cout << "correction : rangenext=range ....." << G4endl;
     }
      rangenext = range ;
      value = range - rangenext ;
diff --git a/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.hh
index f688474c90..299cc004ba 100644
--- a/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IhEnergyLoss.hh,v 1.2.8.1 1999/12/07 20:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.icc
index 7c2246c31f..10a871574a 100644
--- a/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4IhEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IhEnergyLoss.icc,v 1.1.10.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IhIonisation.hh b/source/processes/electromagnetic/standard/include/G4IhIonisation.hh
index d23d87dda1..f9d8f71f6d 100644
--- a/source/processes/electromagnetic/standard/include/G4IhIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4IhIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IhIonisation.hh,v 1.2.8.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IhIonisation.icc b/source/processes/electromagnetic/standard/include/G4IhIonisation.icc
index 5cc874f4d9..e56b13a376 100644
--- a/source/processes/electromagnetic/standard/include/G4IhIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4IhIonisation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IhIonisation.icc,v 1.1.10.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IhIonisation.icc,v 1.1.10.1.2.1 1999/12/08 17:34:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -76,10 +76,10 @@ inline G4double G4IhIonisation::PostStepGetPhysicalInteractionLength(
      {
       G4cout << "G4IhIonisation PostStepGPIL : Nlambda has been" <<
               " increased at update.Nlambda old/new :" << nlold <<
-              "  " << nl << endl;
+              "  " << nl << G4endl;
       G4cout << "(theNumberOfInteractionLengthLeft has been increased!)"
-             << endl;
-      G4cout << " correction : Nlambda old=new ........." << endl;
+             << G4endl;
+      G4cout << " correction : Nlambda old=new ........." << G4endl;
      }
       nlold = nl ;
      }
@@ -125,9 +125,9 @@ inline G4double G4IhIonisation::PostStepGetPhysicalInteractionLength(
     if(verboseLevel>2)
     {
      G4cout << "G4IhIonisation PostStepGPIL: Step < 0.!, Step="
-            << value << endl;
-     G4cout << "range,rangenext:" << range << "  " << rangenext << endl ;
-     G4cout << "correction : rangenext=range ....." << endl;
+            << value << G4endl;
+     G4cout << "range,rangenext:" << range << "  " << rangenext << G4endl ;
+     G4cout << "correction : rangenext=range ....." << G4endl;
     }
      rangenext = range ;
      value = range - rangenext ;
diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh b/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh
index c95126ce78..addff1cb20 100644
--- a/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MultipleScattering.hh,v 1.6.6.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering.icc b/source/processes/electromagnetic/standard/include/G4MultipleScattering.icc
index 548442307b..95c3b56771 100644
--- a/source/processes/electromagnetic/standard/include/G4MultipleScattering.icc
+++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MultipleScattering.icc,v 1.5.6.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.hh b/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.hh
index 5f4a6edd63..6bed169760 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAIenergyLoss.hh,v 1.3.2.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAIenergyLoss.hh,v 1.3.2.1.2.2 1999/12/14 07:08:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
@@ -39,8 +39,8 @@
 #define G4PAIenergyLoss_h 1
  
 #include "G4ios.hh"
-#include <fstream.h>
-#include <iomanip.h>
+#include "g4std/fstream"
+#include "g4std/iomanip"
 #include "g4rw/tpordvec.h"
 
 #include "globals.hh"
diff --git a/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.icc b/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.icc
index 2f6d4dcb0c..44075cad4a 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4PAIenergyLoss.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAIenergyLoss.icc,v 1.3.8.1 1999/12/07 20:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAIenergyLoss.icc,v 1.3.8.1.2.1 1999/12/08 17:34:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
@@ -34,7 +34,7 @@ inline G4double
  G4PAIenergyLoss::GetConstraints(const G4DynamicParticle *aParticle,
                                               G4Material *aMaterial    ) 
 {
-  //  G4cout<<"G4PAIenergyLoss::GetConstraints is called"<<endl ; 
+  //  G4cout<<"G4PAIenergyLoss::GetConstraints is called"<<G4endl ; 
   return   2*mm ;
  
 }
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.hh b/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
index 08b5fc4db7..2c22625a84 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIonisation.hh,v 1.2.8.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
index 34da5c992d..3a6f863879 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAIonisation.icc,v 1.3.8.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAIonisation.icc,v 1.3.8.1.2.1 1999/12/08 17:34:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -34,7 +34,7 @@ inline G4double
 {  
   G4int index = aMaterial->GetIndex() ;
 
-//  G4cout<<"G4PAIonisation::GetConstraints is called"<<endl ;
+//  G4cout<<"G4PAIonisation::GetConstraints is called"<<G4endl ;
 
   if(index != fMatIndex)
   {
@@ -85,7 +85,7 @@ inline G4double G4PAIonisation::GetMeanFreePath(
                                                G4double previousStepSize,
                                                G4ForceCondition* condition) 
 {
-//   G4cout<<"G4PAIonisation::GetMeanFreePath is called"<<endl ;
+//   G4cout<<"G4PAIonisation::GetMeanFreePath is called"<<G4endl ;
  
    *condition = NotForced ;
    
diff --git a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
index deb5fadc62..f9ef6f09b4 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
+++ b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIxSection.hh,v 1.3.6.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4PAIxSection.hh -- header file
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
index 999114d75f..2bbef54b3f 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhotoElectricEffect.hh,v 1.3.8.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
index 95c3fd54af..ce3fddce05 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhotoElectricEffect.icc,v 1.2.8.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
index 906a771256..c83d034d14 100644
--- a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolarizedComptonScattering.hh,v 1.1.10.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1995
diff --git a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
index fa8b4a7343..e05404e61d 100644
--- a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
+++ b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SynchrotronRadiation.hh,v 1.1.10.1 1999/12/07 20:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
index 9c2ac52ff6..51a016cb38 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eBremsstrahlung.hh,v 1.1.10.1 1999/12/07 20:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
index 92d749a6a6..36941be14c 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eBremsstrahlung.icc,v 1.1.10.1 1999/12/07 20:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.hh
index 6a278cc65e..1237558f3b 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.hh
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eBremsstrahlungPlus.hh,v 1.1.10.1 1999/12/07 20:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.icc b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.icc
index c9cc8f9776..c6f2529a5f 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.icc
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungPlus.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eBremsstrahlungPlus.icc,v 1.1.10.1 1999/12/07 20:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4eEnergyLoss.hh
index 8d7b4fc5bc..a26180a193 100644
--- a/source/processes/electromagnetic/standard/include/G4eEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4eEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eEnergyLoss.hh,v 1.4.4.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4eEnergyLoss.icc
index bf202cfe1b..30b03092de 100644
--- a/source/processes/electromagnetic/standard/include/G4eEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4eEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eEnergyLoss.icc,v 1.4.8.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.hh b/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.hh
index c45459325a..775f3d2389 100644
--- a/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.hh
+++ b/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eEnergyLossPlus.hh,v 1.4.4.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.icc b/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.icc
index 7a97e52acc..97496d1814 100644
--- a/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.icc
+++ b/source/processes/electromagnetic/standard/include/G4eEnergyLossPlus.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eEnergyLossPlus.icc,v 1.3.8.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.hh b/source/processes/electromagnetic/standard/include/G4eIonisation.hh
index 10d8cba463..0a4d033285 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4eIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eIonisation.hh,v 1.2.8.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.icc b/source/processes/electromagnetic/standard/include/G4eIonisation.icc
index 875fd7559f..2a78ebb597 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4eIonisation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eIonisation.icc,v 1.2.8.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisationPlus.hh b/source/processes/electromagnetic/standard/include/G4eIonisationPlus.hh
index d24ab8e9f9..526cdaab40 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisationPlus.hh
+++ b/source/processes/electromagnetic/standard/include/G4eIonisationPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eIonisationPlus.hh,v 1.1.10.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisationPlus.icc b/source/processes/electromagnetic/standard/include/G4eIonisationPlus.icc
index 5d208cb40a..51cb6ac086 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisationPlus.icc
+++ b/source/processes/electromagnetic/standard/include/G4eIonisationPlus.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eIonisationPlus.icc,v 1.1.10.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
index 74a6e2010a..466a7f79b5 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eplusAnnihilation.hh,v 1.1.10.1 1999/12/07 20:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
index 1c0e903770..08de04c0cb 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eplusAnnihilation.icc,v 1.1.10.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4hEnergyLoss.hh
index 7ad154c0b3..5ab7f01cbc 100644
--- a/source/processes/electromagnetic/standard/include/G4hEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4hEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hEnergyLoss.hh,v 1.5.6.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4hEnergyLoss.icc
index 26d9e99125..ad34c29899 100644
--- a/source/processes/electromagnetic/standard/include/G4hEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4hEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hEnergyLoss.icc,v 1.2.8.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.hh b/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.hh
index df9a2e53cd..9d721951aa 100644
--- a/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.hh
+++ b/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hEnergyLossPlus.hh,v 1.3.8.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.icc b/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.icc
index e2e5f13a40..78da7cb482 100644
--- a/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.icc
+++ b/source/processes/electromagnetic/standard/include/G4hEnergyLossPlus.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hEnergyLossPlus.icc,v 1.1.8.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.hh b/source/processes/electromagnetic/standard/include/G4hIonisation.hh
index bdaf9610ec..41fd9761fa 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4hIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hIonisation.hh,v 1.4.8.1 1999/12/07 20:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.icc b/source/processes/electromagnetic/standard/include/G4hIonisation.icc
index f5ae507b5b..61cf09125c 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4hIonisation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hIonisation.icc,v 1.2.8.1 1999/12/07 20:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisationPlus.hh b/source/processes/electromagnetic/standard/include/G4hIonisationPlus.hh
index 7eef380cb6..152c507b20 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisationPlus.hh
+++ b/source/processes/electromagnetic/standard/include/G4hIonisationPlus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hIonisationPlus.hh,v 1.2.8.1 1999/12/07 20:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisationPlus.icc b/source/processes/electromagnetic/standard/include/G4hIonisationPlus.icc
index b9908b9676..c791dcc224 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisationPlus.icc
+++ b/source/processes/electromagnetic/standard/include/G4hIonisationPlus.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hIonisationPlus.icc,v 1.1.8.1 1999/12/07 20:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4ionIonisation.hh b/source/processes/electromagnetic/standard/include/G4ionIonisation.hh
index 897df9f5d7..720e57cee0 100644
--- a/source/processes/electromagnetic/standard/include/G4ionIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4ionIonisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ionIonisation.hh,v 1.2.8.1 1999/12/07 20:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4ionIonisation.icc b/source/processes/electromagnetic/standard/include/G4ionIonisation.icc
index ab3e174bff..7691d37a0e 100644
--- a/source/processes/electromagnetic/standard/include/G4ionIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4ionIonisation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ionIonisation.icc,v 1.2.8.1 1999/12/07 20:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
index fadf0ac37a..470a744488 100644
--- a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ComptonScattering.cc,v 1.2.8.1 1999/12/07 20:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ComptonScattering.cc,v 1.2.8.1.2.1 1999/12/08 17:34:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -286,7 +286,7 @@ void G4ComptonScattering::PrintInfoDefinition()
            comments += "Good description from 10 KeV to (100/Z) GeV. \n";
            comments += "        Scattered gamma energy according Klein-Nishina.";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << G4BestUnit(HighestEnergyLimit,"Energy") 
          << " in " << NumbBinTable << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4EnergyLossMessenger.cc b/source/processes/electromagnetic/standard/src/G4EnergyLossMessenger.cc
index a9bc3ed97c..3b91a8c437 100644
--- a/source/processes/electromagnetic/standard/src/G4EnergyLossMessenger.cc
+++ b/source/processes/electromagnetic/standard/src/G4EnergyLossMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EnergyLossMessenger.cc,v 1.2.6.1 1999/12/07 20:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EnergyLossMessenger.cc,v 1.2.6.1.2.5 1999/12/14 09:16:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -24,11 +24,7 @@
 #include "G4UIparameter.hh"
 #include "G4UIcmdWithABool.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -99,7 +95,7 @@ void G4EnergyLossMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
      G4double v1,v2;
      char unts[30];
      const char* t = newValue;
-     istrstream is((char*)t);
+     G4std::istrstream is((char*)t);
      is >> v1 >> v2 >> unts;
      G4String unt = unts;
      v2 *= G4UIcommand::ValueOf(unt);
diff --git a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
index 37ad79de9e..a38e5713f9 100644
--- a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
+++ b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GammaConversion.cc,v 1.2.8.1 1999/12/07 20:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GammaConversion.cc,v 1.2.8.1.2.2 1999/12/10 15:41:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -245,11 +245,11 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
    // limits of the screening variable
    G4double screenfac = 136.*epsil0/(anElement->GetIonisation()->GetZ3()) ;
    G4double screenmax = exp ((42.24 - FZ)/8.368) - 0.952 ;
-   G4double screenmin = min(4.*screenfac,screenmax) ;
+   G4double screenmin = G4std::min(4.*screenfac,screenmax) ;
 
    // limits of the energy sampling
    G4double epsil1 = 0.5 - 0.5*sqrt(1. - screenmin/screenmax) ;
-   G4double epsilmin = max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
+   G4double epsilmin = G4std::max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
 
    //
    // sample the energy rate of the created electron (or positron) 
@@ -258,7 +258,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
    G4double  screenvar, greject ;
 
    G4double F10 = ScreenFunction1(screenmin) - FZ , F20 = ScreenFunction2(screenmin) - FZ;
-   G4double NormF1 = max(F10*epsilrange*epsilrange,0.) ,  NormF2 = max(1.5*F20,0.);
+   G4double NormF1 = G4std::max(F10*epsilrange*epsilrange,0.) ,  NormF2 = G4std::max(1.5*F20,0.);
 
    do {
         if ( NormF1/(NormF1+NormF2) > G4UniformRand() )
@@ -316,7 +316,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
    G4double LocalEnerDeposit = 0. ;
    aParticleChange.SetNumberOfSecondaries(2) ; 
 
-   G4double ElectKineEnergy = max(0.,ElectTotEnergy - electron_mass_c2) ;
+   G4double ElectKineEnergy = G4std::max(0.,ElectTotEnergy - electron_mass_c2) ;
    //  condition changed !
      if((G4EnergyLossTables::GetRange(G4Electron::Electron(),
           ElectKineEnergy,aMaterial)>aStep.GetPostStepPoint()->GetSafety())
@@ -338,7 +338,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
 
    // the e+ is always created (even with Ekine=0) for further annihilation.
 
-   G4double PositKineEnergy = max(0.,PositTotEnergy - electron_mass_c2) ;
+   G4double PositKineEnergy = G4std::max(0.,PositTotEnergy - electron_mass_c2) ;
 
   //  if (G4EnergyLossTables::GetRange(G4Positron::Positron(),PositKineEnergy,aMaterial)
   //      < min(G4Positron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) )  
@@ -396,7 +396,7 @@ G4Element* G4GammaConversion::SelectRandomAtom(const G4DynamicParticle* aDynamic
         if (rval <= PartialSumSigma) return ((*theElementVector)(i));
       }
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 
@@ -408,7 +408,7 @@ void G4GammaConversion::PrintInfoDefinition()
            comments += "Good description from 1.5 MeV to 100 GeV for all Z. \n";
            comments += "        e+e- energies according Bethe-Heitler";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << G4BestUnit(HighestEnergyLimit,"Energy") 
          << " in " << NumbBinTable << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4IMultipleScattering.cc b/source/processes/electromagnetic/standard/src/G4IMultipleScattering.cc
index 15511a9910..b13a91f1f3 100644
--- a/source/processes/electromagnetic/standard/src/G4IMultipleScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4IMultipleScattering.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMultipleScattering.cc,v 1.2.8.1 1999/12/07 20:50:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IMultipleScattering.cc,v 1.2.8.1.2.1 1999/12/08 17:34:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -811,7 +811,7 @@ void G4IMultipleScattering::PrintInfoDefinition()
         comments += "\n          New model of MSC , computes the lateral \n";
         comments += "          displacement of the particle , too.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                   "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc b/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
index b7ef74e4dc..cbe4e55aa6 100644
--- a/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
+++ b/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeBremsstrahlung.cc,v 1.3.8.1 1999/12/07 20:50:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeBremsstrahlung.cc,v 1.3.8.1.2.3 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -142,21 +142,21 @@ void G4IeBremsstrahlung::TestOfInversion(
   const G4MaterialTable* theMaterialTable=
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-    G4cout << endl;
-    G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-    G4cout << "----------------------" << endl;
+    G4cout << G4endl;
+    G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+    G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
     if(printflag>1)
     {
-      G4cout << endl;
-      G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+      G4cout << G4endl;
+      G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
       G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-             << "         (Tprime-T)/T(%)" << endl ;
+             << "         (Tprime-T)/T(%)" << G4endl ;
     }
 
     G4PhysicsLogVector* aVector ;
@@ -190,29 +190,29 @@ void G4IeBremsstrahlung::TestOfInversion(
        }
        if(printflag>1)
        {
-         G4cout << setw(18) << setprecision(6) << T << "  " <<
-                setw(14)<< setprecision(6) << Nlambda << "  " <<
-                setw(14) << setprecision(6) << Tprime << "      " <<
-                setw(12) << setprecision(3) << del << endl;
+         G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+                G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+                G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+                G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
        }
      }
    }
    if(printflag>0)
    {
-     G4cout << endl;
+     G4cout << G4endl;
      G4cout << "G4IeBremsstrahlung::TestOfInversion (T->Nlambda->Tprime) " 
-            << endl ;
+            << G4endl ;
      G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-     G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3)
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+     G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3)
             << delta ;
-     G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+     G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
      delmean /= sum ;
-     G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-             setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-     G4cout << endl;
+     G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+             G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+     G4cout << G4endl;
    }
  }
 }
@@ -720,7 +720,7 @@ void G4IeBremsstrahlung::BuildLossTable(
 
            if(LPMGammaEnergyLimit > klim)
            {
-             G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
+             G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
 
              G4double floss = 0. ;
              G4int nmax = 1000 ;
@@ -1278,8 +1278,8 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
        G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
 
        // Compute the maximum of the rejection function
-       G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
-       G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
+       G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
+       G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
        grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
 
        // sample the energy rate of the emitted Gamma
@@ -1290,8 +1290,8 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
              x = pow(xmin, G4UniformRand()); 
              epsil = x*KineticEnergy/TotalEnergy;
              screenvar = screenfac*epsil/(1-epsil);
-             F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
-             F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
+             F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
+             F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
              migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
              greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);
         }  while( greject < G4UniformRand()*grejmax );
@@ -1314,9 +1314,9 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
        G4double bl = bl0 + bl1*U + bl2*U2;
 
        // Compute the maximum of the rejection function
-       grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
+       grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
        G4double xm = -al/(2.*bl);
-       if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
+       if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
 
        // sample the energy rate of the emitted Gamma
 
@@ -1406,7 +1406,7 @@ G4Element* G4IeBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 
@@ -1417,7 +1417,7 @@ void G4IeBremsstrahlung::PrintInfoDefinition()
            comments += "        log scale extrapolation above 100 GeV \n";
            comments += "        Gamma energy sampled from a parametrised formula.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4IeEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4IeEnergyLoss.cc
index 7827f13884..6fd4b1fff3 100644
--- a/source/processes/electromagnetic/standard/src/G4IeEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4IeEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IeEnergyLoss.cc,v 1.7.6.1 1999/12/07 20:50:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //  
 // $Id: 
 // -----------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4IeIonisation.cc b/source/processes/electromagnetic/standard/src/G4IeIonisation.cc
index 78834a4198..3b2a988f9d 100644
--- a/source/processes/electromagnetic/standard/src/G4IeIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4IeIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeIonisation.cc,v 1.3.8.1 1999/12/07 20:50:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeIonisation.cc,v 1.3.8.1.2.3 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
@@ -142,21 +142,21 @@ void G4IeIonisation::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ; 
+         << "         (Tprime-T)/T(%)" << G4endl ; 
    }
 
     G4PhysicsLogVector* aVector ;
@@ -190,28 +190,28 @@ void G4IeIonisation::TestOfInversion(
       }
     if(printflag>1)
     {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IeIonisation::TestOfInversion (T->Nlambda->Tprime) " << endl ; 
+    G4cout << G4endl;
+    G4cout << "G4IeIonisation::TestOfInversion (T->Nlambda->Tprime) " << G4endl ; 
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;  
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) <<
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;  
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) <<
                                                                     delta ; 
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) << 
-            Tdelta/MeV << "  MeV" << endl;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) << 
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
      
@@ -661,7 +661,7 @@ void G4IeIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
           {
             Tmax = LowEdgeEnergy/2. ;
   
-            d = min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
+            d = G4std::min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
 
             ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2 ;
             ionloss += log((tau-d)*d)+tau/(tau-d) ;
@@ -672,7 +672,7 @@ void G4IeIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
           {
             Tmax = LowEdgeEnergy ;
   
-            d = min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
+            d = G4std::min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
 
             d2=d*d/2. ;
             d3=d*d*d/3. ;
@@ -955,7 +955,7 @@ void G4IeIonisation::PrintInfoDefinition()
            comments += "Good description from 1 KeV to 100 GeV.\n";
            comments += "        delta ray energy sampled from  differential Xsection.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc b/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
index 095764bee4..4a426c966f 100644
--- a/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
+++ b/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeplusAnnihilation.cc,v 1.5.8.1 1999/12/07 20:50:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IeplusAnnihilation.cc,v 1.5.8.1.2.2 1999/12/09 16:18:04 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -43,9 +43,9 @@ G4IeplusAnnihilation::G4IeplusAnnihilation(const G4String& processName)
     NumbBinTable(100)
  {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
      G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << endl;
+     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
    }
      theCrossSectionTable = NULL;
      theMeanFreePathTable = NULL; 
@@ -209,21 +209,21 @@ void G4IeplusAnnihilation::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ;
+         << "         (Tprime-T)/T(%)" << G4endl ;
    }
 
     G4PhysicsLogVector* aVector ;
@@ -257,28 +257,28 @@ void G4IeplusAnnihilation::TestOfInversion(
       }
     if(printflag>1)
     {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IeplusAnnihilation::TestOfInversion (T->Nlambda->Tprime) " << endl
+    G4cout << G4endl;
+    G4cout << "G4IeplusAnnihilation::TestOfInversion (T->Nlambda->Tprime) " << G4endl
 ;
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta ;
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta ;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
 }
@@ -884,7 +884,7 @@ void G4IeplusAnnihilation::PrintInfoDefinition()
  G4String comments="Total cross section from Heitler formula (2 photon annihilation).\n";
           comments += "        gamma energies sampled according Heitler";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << G4BestUnit(HighestEnergyLimit,"Energy")
          << " in " << NumbBinTable << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4IhEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4IhEnergyLoss.cc
index da62218fcd..0b5b92ee9b 100644
--- a/source/processes/electromagnetic/standard/src/G4IhEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4IhEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IhEnergyLoss.cc,v 1.7.6.1 1999/12/07 20:50:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -----------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4IhIonisation.cc b/source/processes/electromagnetic/standard/src/G4IhIonisation.cc
index 1e5fd5ebb4..3682b4cf69 100644
--- a/source/processes/electromagnetic/standard/src/G4IhIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4IhIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IhIonisation.cc,v 1.5.8.1 1999/12/07 20:50:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IhIonisation.cc,v 1.5.8.1.2.2 1999/12/09 16:18:04 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -136,21 +136,21 @@ void G4IhIonisation::TestOfInversion(
                           G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length() ;
 
-  G4cout.setf(ios::scientific, ios::floatfield) ;
+  G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
   if(printflag>1)
   {
-  G4cout << endl;
-  G4cout << "  particle=" << aParticleType.GetParticleName() << endl;
-  G4cout << "----------------------" << endl;
+  G4cout << G4endl;
+  G4cout << "  particle=" << aParticleType.GetParticleName() << G4endl;
+  G4cout << "----------------------" << G4endl;
   }
   for (G4int J=0; J<numOfMaterials; J++)
   {
    if(printflag>1)
    {
-    G4cout << endl;
-    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
+    G4cout << G4endl;
+    G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
     G4cout << " mat.ind.=" << J << "  T           Nlambda         Tprime"
-         << "         (Tprime-T)/T(%)" << endl ;
+         << "         (Tprime-T)/T(%)" << G4endl ;
    }
 
     G4PhysicsLogVector* aVector ;
@@ -184,28 +184,28 @@ void G4IhIonisation::TestOfInversion(
       }
     if(printflag>1)
      {
-      G4cout << setw(18) << setprecision(6) << T << "  " <<
-              setw(14)<< setprecision(6) << Nlambda << "  " <<
-      setw(14) << setprecision(6) << Tprime << "      " <<
-              setw(12) << setprecision(3) << del << endl;
+      G4cout << G4std::setw(18) << G4std::setprecision(6) << T << "  " <<
+              G4std::setw(14)<< G4std::setprecision(6) << Nlambda << "  " <<
+      G4std::setw(14) << G4std::setprecision(6) << Tprime << "      " <<
+              G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
     }
      }
     }
     if(printflag>0)
     {
-    G4cout << endl;
-    G4cout << "G4IhIonisation::TestOfInversion (T->Nlambda->Tprime) " << endl ;
+    G4cout << G4endl;
+    G4cout << "G4IhIonisation::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
     G4cout << "particle= " << aParticleType.GetParticleName() <<
-            "   material= " << (*theMaterialTable)[J]->GetName() << endl ;
-    G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta
+            "   material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
+    G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta
 ;
-    G4cout << "  at a kinetic energy " << setw(10) << setprecision(3) <<
-            Tdelta/MeV << "  MeV" << endl;
+    G4cout << "  at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
+            Tdelta/MeV << "  MeV" << G4endl;
     delmean /= sum ;
-    G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
-            setprecision(3) << delmean <<
-            " % (mean is calculated in abs. value)" << endl;
-    G4cout << endl;
+    G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
+            G4std::setprecision(3) << delmean <<
+            " % (mean is calculated in abs. value)" << G4endl;
+    G4cout << G4endl;
     }
   }
 
@@ -1068,7 +1068,7 @@ void G4IhIonisation::PrintInfoDefinition()
            comments += "\n         Good description above the mean excitation energy.\n";
            comments += "         delta ray energy sampled from  differential Xsection.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                   "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc b/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc
index c644fa4a09..37ae2c6ea4 100644
--- a/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MultipleScattering.cc,v 1.16.6.1 1999/12/07 20:50:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MultipleScattering.cc,v 1.16.6.1.2.1 1999/12/08 17:34:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -570,7 +570,7 @@ void G4MultipleScattering::PrintInfoDefinition()
         comments += "\n          New model of MSC , computes the lateral \n";
         comments += "          displacement of the particle , too.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                   "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/src/G4PAIenergyLoss.cc b/source/processes/electromagnetic/standard/src/G4PAIenergyLoss.cc
index c3721266ce..cbbe0be949 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIenergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIenergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIenergyLoss.cc,v 1.2.8.1 1999/12/07 20:50:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -----------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4PAIonisation.cc b/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
index 6bf7bac22a..ef4a492cfc 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAIonisation.cc,v 1.2.8.1 1999/12/07 20:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAIonisation.cc,v 1.2.8.1.2.1 1999/12/08 17:34:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // -------------------------------------------------------------
@@ -75,7 +75,7 @@ G4PAIonisation::G4PAIonisation( const G4String& materialName,
   ComputeSandiaPhotoAbsCof() ;
 
 
-  // G4cout<<"G4PAIonisation constructor is called"<<endl ;
+  // G4cout<<"G4PAIonisation constructor is called"<<G4endl ;
   // BuildPAIonisationTable() ;
 }
 
@@ -287,7 +287,7 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
 
       G4double tau,tau0,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
 
-      // G4cout<<"Material no. = "<<J<<"\t"<<"TotBin = "<<TotBin<<endl ;
+      // G4cout<<"Material no. = "<<J<<"\t"<<"TotBin = "<<TotBin<<G4endl ;
 
       for (G4int i = 0 ; i < TotBin ; i++)  //The loop for the kinetic energy 
       {
@@ -304,7 +304,7 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
 	       tau = 0.01 ;
 	    }
 	    gamma = tau +1. ;
-	    G4cout<<"gamma = "<<gamma<<endl ;
+	    G4cout<<"gamma = "<<gamma<<G4endl ;
             bg2 = tau*(tau+2.) ;
             beta2 = bg2/(gamma*gamma) ;
             Tmax = 2.*electron_mass_c2*bg2
@@ -319,10 +319,10 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
 	    
 	    ionloss = protonPAI.GetMeanEnergyLoss() ;   //  total <dE/dx>
 
-	    G4cout<<"ionloss = "<<ionloss*cm/keV<<" keV/cm"<<endl ;
-  G4cout<<"n1 = "<<protonPAI.GetIntegralPAIxSection(1)*cm<<" 1/cm"<<endl ;
+	    G4cout<<"ionloss = "<<ionloss*cm/keV<<" keV/cm"<<G4endl ;
+  G4cout<<"n1 = "<<protonPAI.GetIntegralPAIxSection(1)*cm<<" 1/cm"<<G4endl ;
 	    // G4cout<<"protonPAI.GetSplineSize() = "<<
-            // protonPAI.GetSplineSize()<<endl ;
+            // protonPAI.GetSplineSize()<<G4endl ;
 
             transferVector = new 
                              G4PhysicsFreeVector(protonPAI.GetSplineSize()) ;
@@ -346,8 +346,8 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
       }                                        // end of Tkin loop
       theLossTable->insert(aVector);
    }                                           // end of material loop
-   // G4cout<<"G4PAIonisation::BuildPAIonisationTable() have been called"<<endl ;
-   // G4cout<<"G4PAIonisation::BuildLossTable() have been called"<<endl ;
+   // G4cout<<"G4PAIonisation::BuildPAIonisationTable() have been called"<<G4endl ;
+   // G4cout<<"G4PAIonisation::BuildLossTable() have been called"<<G4endl ;
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -634,7 +634,7 @@ G4PAIonisation::PostStepDoIt( const G4Track& trackData,
 G4VParticleChange* G4PAIonisation::AlongStepDoIt( const G4Track& trackData,
                                                    const G4Step& stepData    ) 
 {
-  //  G4cout<<"G4PAIonisation::AlongStepDoIt is called"<<endl ;
+  //  G4cout<<"G4PAIonisation::AlongStepDoIt is called"<<G4endl ;
   
   const G4DynamicParticle* aParticle;
   G4Material* aMaterial;
@@ -656,7 +656,7 @@ G4VParticleChange* G4PAIonisation::AlongStepDoIt( const G4Track& trackData,
 
   if( Step == 0. || index != fMatIndex ) return &aParticleChange ; 
  
-  G4cout<<"step = "<<Step/mm<<" mm"<<endl ;
+  G4cout<<"step = "<<Step/mm<<" mm"<<G4endl ;
 
 
 
@@ -730,7 +730,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
   G4int       index = aMaterial->GetIndex() ;
   G4bool isOutRange ;
 
-  // G4cout<<"G4PAIenergyLoss::GetLossWithFluct"<<endl ;
+  // G4cout<<"G4PAIenergyLoss::GetLossWithFluct"<<G4endl ;
 
   G4double loss = 0.0 ;
   G4double transfer, position, E1, E2, W1, W2, W, firstMu, secondMu ;
@@ -751,7 +751,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
   }
   G4int iPlace = iTkin - 1 ; // index*(G4PAIonisation::GetBinNumber()) +
 
-  G4cout<<"iPlace = "<<iPlace<<endl ;
+  G4cout<<"iPlace = "<<iPlace<<G4endl ;
 
   G4PhysicsVector*  firstVector = (*fPAItransferBank)(iPlace)     ;
   G4PhysicsVector* secondVector = (*fPAItransferBank)(iPlace + 1) ;
@@ -760,7 +760,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
   {
     numOfCollisions = RandPoisson::shoot((*(*fPAItransferBank)(iPlace))(0)*Step) ;
 
-      G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
+      G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
 
     while(numOfCollisions)
     {
@@ -781,7 +781,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
       numOfCollisions = RandPoisson::
                         shoot((*(*fPAItransferBank)(iPlace+1))(0)*Step) ;
 
-      G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
+      G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
 
       while(numOfCollisions)
       {
@@ -804,15 +804,15 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
       W2 = (TkinScaled - E1)*W ;
 
       // G4cout<<"(*(*fPAItransferBank)(iPlace))(0) = "<<
-      //   (*(*fPAItransferBank)(iPlace))(0)<<endl ;
+      //   (*(*fPAItransferBank)(iPlace))(0)<<G4endl ;
       // G4cout<<"(*(*fPAItransferBank)(iPlace+1))(0) = "<<
-      //     (*(*fPAItransferBank)(iPlace+1))(0)<<endl ;
+      //     (*(*fPAItransferBank)(iPlace+1))(0)<<G4endl ;
 
       numOfCollisions = RandPoisson::shoot(
                      ( (*(*fPAItransferBank)(iPlace))(0)*W1 + 
                      (*(*fPAItransferBank)(iPlace+1))(0)*W2 )*Step) ;
 
-      G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
+      G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
 
       while(numOfCollisions)
       {
@@ -835,7 +835,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
       }
     }
   } 
-  G4cout<<"PAI loss = "<<loss/keV<<" keV"<<endl ; 
+  G4cout<<"PAI loss = "<<loss/keV<<" keV"<<G4endl ; 
   return loss ;
 }
 
diff --git a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
index 0fe7a45a36..0426a47df0 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PAIxSection.cc,v 1.3.6.1 1999/12/07 20:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PAIxSection.cc,v 1.3.6.1.2.1 1999/12/08 17:34:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4PAIxSection.cc -- class implementation file
@@ -70,7 +70,7 @@ G4PAIxSection::G4PAIxSection(G4int materialIndex,
                              GetElectronDensity() ;
       fIntervalNumber         = (*theMaterialTable)[materialIndex]->
                              GetSandiaTable()->GetMatNbOfIntervals() ;
-      G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<endl ;
+      G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
       // G4double maxEnergyTransfer  = 100*keV ;
 
       fEnergyInterval = new G4double[fIntervalNumber+2] ;
@@ -91,7 +91,7 @@ G4PAIxSection::G4PAIxSection(G4int materialIndex,
          fA4[i]             = (*theMaterialTable)[materialIndex]->
 	                      GetSandiaTable()->GetSandiaCofForMaterial(i-1,4);
 	 // G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
-	 //                               <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
+	 //                               <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
          if(fEnergyInterval[i] >= maxEnergyTransfer)
          {
             fEnergyInterval[i] = maxEnergyTransfer ;
@@ -180,7 +180,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
 
 // (*theMaterialTable)[materialIndex]->GetSandiaTable()->GetMatNbOfIntervals() ;
 
-      // G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<endl ;
+      // G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
       // G4double maxEnergyTransfer  = 100*keV ;
 
       fEnergyInterval = new G4double[fIntervalNumber+2] ;
@@ -208,7 +208,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
          if( i == 1 || i == fIntervalNumber)
 	 {
 	   // G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
-	   //         <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
+	   //         <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
 	 }
          if(fEnergyInterval[i] >= maxEnergyTransfer)
          {
@@ -338,7 +338,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
          if( i == 1 || i == fIntervalNumber)
 	 {
 	   // G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
-	   //         <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
+	   //         <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
 	 }
          if(fEnergyInterval[i] >= maxEnergyTransfer)
          {
@@ -528,12 +528,12 @@ void G4PAIxSection::NormShift(G4double betaGammaSq)
 	                    RutherfordIntegral(j,fEnergyInterval[j],
                                                  fSplineEnergy[i]    ) ;
       }
-      // G4cout<<i<<"\t"<<fSplineEnergy[i]<<"\t"<<fIntegralTerm[i]<<"\n"<<endl;
+      // G4cout<<i<<"\t"<<fSplineEnergy[i]<<"\t"<<fIntegralTerm[i]<<"\n"<<G4endl;
    } 
    fNormalizationCof = 2*pi*pi*hbarc*hbarc*fine_structure_const/electron_mass_c2 ;
    fNormalizationCof *= fElectronDensity/fIntegralTerm[fSplineNumber] ;
 
-   // G4cout<<"fNormalizationCof = "<<fNormalizationCof<<endl ;
+   // G4cout<<"fNormalizationCof = "<<fNormalizationCof<<G4endl ;
 
 	  // Calculation of PAI differrential cross-section (1/(keV*cm))
 	  // in the energy points near borders of energy intervals
@@ -923,14 +923,14 @@ G4double G4PAIxSection::GetStepEnergyLoss( G4double step )
   G4double loss = 0.0 ;
   G4double meanNumber, position ;
 
-  // G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<endl ;
+  // G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<G4endl ;
 
 
 
   meanNumber = fIntegralPAIxSection[1]*step ;
   numOfCollisions = RandPoisson::shoot(meanNumber) ;
 
-  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
+  //   G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
 
   while(numOfCollisions)
   {
@@ -943,7 +943,7 @@ G4double G4PAIxSection::GetStepEnergyLoss( G4double step )
     loss += fSplineEnergy[iTransfer]  ;
     numOfCollisions-- ;
   }
-  // G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<endl ; 
+  // G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<G4endl ; 
 
   return loss ;
 }
diff --git a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
index 3f62a59dae..ecd9256279 100644
--- a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
+++ b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhotoElectricEffect.cc,v 1.8.6.1 1999/12/07 20:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhotoElectricEffect.cc,v 1.8.6.1.2.1 1999/12/08 17:34:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -307,7 +307,7 @@ void G4PhotoElectricEffect::PrintInfoDefinition()
            comments += "Good description from 10 KeV to 50 MeV for all Z";
            comments += "\n        Sandia crossSection below 50 KeV";
 	             
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n       PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << G4BestUnit(HighestEnergyLimit,"Energy") 
          << " in " << NumbBinTable << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
index b0a9ab67dc..71ae286efc 100644
--- a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolarizedComptonScattering.cc,v 1.1.10.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc b/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
index 9c249f0ad9..be9bb6f9e5 100644
--- a/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
+++ b/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SynchrotronRadiation.cc,v 1.1.10.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
index 6f27b00545..08c87da37c 100644
--- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
+++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eBremsstrahlung.cc,v 1.6.8.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eBremsstrahlung.cc,v 1.6.8.1.2.2 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -219,7 +219,7 @@ void G4eBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aParticleType
 
            if(LPMGammaEnergyLimit > klim)
            {
-             G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
+             G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
 
              G4double floss = 0. ;
              G4int nmax = 1000 ;
@@ -793,8 +793,8 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
        G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
 
        // Compute the maximum of the rejection function
-       G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
-       G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
+       G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
+       G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
        grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
 
        // sample the energy rate of the emitted Gamma 
@@ -805,8 +805,8 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
              x = pow(xmin, G4UniformRand());  
              epsil = x*KineticEnergy/TotalEnergy;
              screenvar = screenfac*epsil/(1-epsil);
-             F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
-             F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
+             F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
+             F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
              migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
              greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);      
         }  while( greject < G4UniformRand()*grejmax );
@@ -830,9 +830,9 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
        G4double bl = bl0 + bl1*U + bl2*U2;
 
        // Compute the maximum of the rejection function
-       grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
+       grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
        G4double xm = -al/(2.*bl);
-       if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
+       if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
 
        // sample the energy rate of the emitted Gamma 
 
@@ -924,7 +924,7 @@ G4Element* G4eBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 
@@ -937,7 +937,7 @@ void G4eBremsstrahlung::PrintInfoDefinition()
            comments += "        log scale extrapolation above 100 GeV \n";
            comments += "        Gamma energy sampled from a parametrised formula.";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy") 
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlungPlus.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlungPlus.cc
index e7669f521d..36beea3d2c 100644
--- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlungPlus.cc
+++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlungPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eBremsstrahlungPlus.cc,v 1.6.8.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eBremsstrahlungPlus.cc,v 1.6.8.1.2.2 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -219,7 +219,7 @@ void G4eBremsstrahlungPlus::BuildLossTable(const G4ParticleDefinition& aParticle
 
            if(LPMGammaEnergyLimit > klim)
            {
-             G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
+             G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
 
              G4double floss = 0. ;
              G4int nmax = 1000 ;
@@ -794,8 +794,8 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
        G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
 
        // Compute the maximum of the rejection function
-       G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
-       G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
+       G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
+       G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
        grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
 
        // sample the energy rate of the emitted Gamma 
@@ -806,8 +806,8 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
              x = pow(xmin, G4UniformRand());  
              epsil = x*KineticEnergy/TotalEnergy;
              screenvar = screenfac*epsil/(1-epsil);
-             F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
-             F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
+             F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
+             F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
              migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
              greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);      
         }  while( greject < G4UniformRand()*grejmax );
@@ -831,9 +831,9 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
        G4double bl = bl0 + bl1*U + bl2*U2;
 
        // Compute the maximum of the rejection function
-       grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
+       grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
        G4double xm = -al/(2.*bl);
-       if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
+       if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
 
        // sample the energy rate of the emitted Gamma 
 
@@ -925,7 +925,7 @@ G4Element* G4eBremsstrahlungPlus::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 
@@ -938,7 +938,7 @@ void G4eBremsstrahlungPlus::PrintInfoDefinition()
            comments += "        log scale extrapolation above 100 GeV \n";
            comments += "        Gamma energy sampled from a parametrised formula.";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy") 
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4eEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4eEnergyLoss.cc
index 0eaa1be514..95150415fd 100644
--- a/source/processes/electromagnetic/standard/src/G4eEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4eEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eEnergyLoss.cc,v 1.10.6.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eEnergyLoss.cc,v 1.10.6.1.2.1 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //  
 // $Id: 
 // -----------------------------------------------------------
@@ -1043,7 +1043,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1056,7 +1056,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1083,14 +1083,14 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a1>alim)
       {
         siga=sqrt(a1) ;
-        p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+        p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
       }
       else
        p1 = G4Poisson(a1);
       if(a2>alim)
       {
         siga=sqrt(a2) ;
-        p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
+        p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
       }
       else
         p2 = G4Poisson(a2);
@@ -1099,7 +1099,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a3>alim)
       {
         siga=sqrt(a3) ;
-        p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
+        p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
       }
       else
         p3 = G4Poisson(a3);
diff --git a/source/processes/electromagnetic/standard/src/G4eEnergyLossPlus.cc b/source/processes/electromagnetic/standard/src/G4eEnergyLossPlus.cc
index 4454228b40..5973a2e278 100644
--- a/source/processes/electromagnetic/standard/src/G4eEnergyLossPlus.cc
+++ b/source/processes/electromagnetic/standard/src/G4eEnergyLossPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eEnergyLossPlus.cc,v 1.16.6.1 1999/12/07 20:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eEnergyLossPlus.cc,v 1.16.6.1.2.2 1999/12/10 15:41:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //  
 // $Id: 
 // -----------------------------------------------------------
@@ -264,13 +264,13 @@ void G4eEnergyLossPlus::BuildDEDXTable(
      {
        // create array for the min. delta cuts in kinetic energy 
        G4double absLowerLimit = 1.*keV ;
-       G4cout << endl;
+       G4cout << G4endl;
        G4cout.precision(5) ;
        G4cout << " eIoni+ Minimum Delta cut in range=" << MinDeltaCutInRange/mm
-              << "  mm." << endl;
-       G4cout << " min. delta energies (keV) " << endl;
-       G4cout << "   material         min.delta energy " << endl;
-       G4cout << endl;
+              << "  mm." << G4endl;
+       G4cout << " min. delta energies (keV) " << G4endl;
+       G4cout << "   material         min.delta energy " << G4endl;
+       G4cout << G4endl;
 
        if(MinDeltaEnergy) delete MinDeltaEnergy ;
        MinDeltaEnergy = new G4double [numOfMaterials] ; 
@@ -285,8 +285,8 @@ void G4eEnergyLossPlus::BuildDEDXTable(
            MinDeltaEnergy[mat] = absLowerLimit ; 
 
          if(MinDeltaEnergy[mat]<Tlowerlimit) MinDeltaEnergy[mat]=Tlowerlimit ;
-         G4cout << setw(20) << (*theMaterialTable)(mat)->GetName() 
-                << setw(15) << MinDeltaEnergy[mat]/keV << endl;
+         G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName() 
+                << G4std::setw(15) << MinDeltaEnergy[mat]/keV << G4endl;
        }
      }
   }
@@ -1016,7 +1016,7 @@ G4VParticleChange* G4eEnergyLossPlus::AlongStepDoIt( const G4Track& trackData,
       postsafety =
           navigator->ComputeSafety(stepData.GetPostStepPoint()->GetPosition());
         
-      safety=min(presafety,postsafety);
+      safety=G4std::min(presafety,postsafety);
 
       if(safety<rcut)
       {
@@ -1279,7 +1279,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1292,7 +1292,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1319,14 +1319,14 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a1>alim)
       {
         siga=sqrt(a1) ;
-        p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+        p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
       }
       else
        p1 = G4Poisson(a1);
       if(a2>alim)
       {
         siga=sqrt(a2) ;
-        p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
+        p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
       }
       else
         p2 = G4Poisson(a2);
@@ -1335,7 +1335,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a3>alim)
       {
         siga=sqrt(a3) ;
-        p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
+        p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
       }
       else
         p3 = G4Poisson(a3);
diff --git a/source/processes/electromagnetic/standard/src/G4eIonisation.cc b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
index c16a7062e5..ebdb15e5f7 100644
--- a/source/processes/electromagnetic/standard/src/G4eIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eIonisation.cc,v 1.3.8.1 1999/12/07 20:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eIonisation.cc,v 1.3.8.1.2.2 1999/12/10 15:42:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -------------------------------------------------------------
@@ -158,7 +158,7 @@ void G4eIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
           if (&aParticleType==G4Electron::Electron())
             {
               Tmax = LowEdgeEnergy/2.;  
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2
                        + log((tau-d)*d)+tau/(tau-d)
                        + (0.5*d*d+(2.*tau+1.)*log(1.-d/tau))/gamma2;
@@ -166,7 +166,7 @@ void G4eIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
           else        //positron
             {
               Tmax = LowEdgeEnergy ;  
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               d2=d*d/2.; d3=d*d*d/3.; d4=d*d*d*d/4.;
               y=1./(1.+gamma);
               ionloss = log(2.*(tau+2.)/Eexcm2)+log(tau*d)
@@ -449,7 +449,7 @@ void G4eIonisation::PrintInfoDefinition()
            comments += "Good description from 1 KeV to 100 GeV.\n";
            comments += "        delta ray energy sampled from  differential Xsection.";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy") 
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4eIonisationPlus.cc b/source/processes/electromagnetic/standard/src/G4eIonisationPlus.cc
index 145f48514a..1ea35191dd 100644
--- a/source/processes/electromagnetic/standard/src/G4eIonisationPlus.cc
+++ b/source/processes/electromagnetic/standard/src/G4eIonisationPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eIonisationPlus.cc,v 1.3.8.1 1999/12/07 20:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eIonisationPlus.cc,v 1.3.8.1.2.2 1999/12/10 15:42:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -------------------------------------------------------------
@@ -158,7 +158,7 @@ void G4eIonisationPlus::BuildLossTable(const G4ParticleDefinition& aParticleType
           if (&aParticleType==G4Electron::Electron())
             {
               Tmax = LowEdgeEnergy/2.;  
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2
                        + log((tau-d)*d)+tau/(tau-d)
                        + (0.5*d*d+(2.*tau+1.)*log(1.-d/tau))/gamma2;
@@ -166,7 +166,7 @@ void G4eIonisationPlus::BuildLossTable(const G4ParticleDefinition& aParticleType
           else        //positron
             {
               Tmax = LowEdgeEnergy ;  
-              d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
+              d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
               d2=d*d/2.; d3=d*d*d/3.; d4=d*d*d*d/4.;
               y=1./(1.+gamma);
               ionloss = log(2.*(tau+2.)/Eexcm2)+log(tau*d)
@@ -449,7 +449,7 @@ void G4eIonisationPlus::PrintInfoDefinition()
            comments += "Good description from 1 KeV to 100 GeV.\n";
            comments += "        delta ray energy sampled from  differential Xsection.";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy") 
          << " in " << TotBin << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
index fe75c16887..9cb6547d67 100644
--- a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eplusAnnihilation.cc,v 1.1.10.1 1999/12/07 20:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4eplusAnnihilation.cc,v 1.1.10.1.2.1 1999/12/08 17:34:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -318,7 +318,7 @@ void G4eplusAnnihilation::PrintInfoDefinition()
   G4String comments = "Total cross section from Heilter formula (annihilation into 2 photons).\n";
            comments += "        gamma energies sampled according Heitler";
                      
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
          << " to " << G4BestUnit(HighestEnergyLimit,"Energy") 
          << " in " << NumbBinTable << " bins. \n";
diff --git a/source/processes/electromagnetic/standard/src/G4hEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4hEnergyLoss.cc
index fcba6bebf6..c44a45edc9 100644
--- a/source/processes/electromagnetic/standard/src/G4hEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4hEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4hEnergyLoss.cc,v 1.14.6.1 1999/12/07 20:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4hEnergyLoss.cc,v 1.14.6.1.2.1 1999/12/10 15:42:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -----------------------------------------------------------
@@ -1230,7 +1230,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1243,7 +1243,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1271,14 +1271,14 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a1>alim)
       {
         siga=sqrt(a1) ;
-        p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+        p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
       }
       else
        p1 = G4Poisson(a1);
       if(a2>alim)
       {
         siga=sqrt(a2) ;
-        p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
+        p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
       }
       else
         p2 = G4Poisson(a2);
@@ -1287,7 +1287,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a3>alim)
       {
         siga=sqrt(a3) ;
-        p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
+        p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
       }
       else
         p3 = G4Poisson(a3);
diff --git a/source/processes/electromagnetic/standard/src/G4hEnergyLossPlus.cc b/source/processes/electromagnetic/standard/src/G4hEnergyLossPlus.cc
index b40accab68..fbe50f98ab 100644
--- a/source/processes/electromagnetic/standard/src/G4hEnergyLossPlus.cc
+++ b/source/processes/electromagnetic/standard/src/G4hEnergyLossPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4hEnergyLossPlus.cc,v 1.16.6.1 1999/12/07 20:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4hEnergyLossPlus.cc,v 1.16.6.1.2.2 1999/12/10 15:42:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // -----------------------------------------------------------
@@ -303,13 +303,13 @@ void G4hEnergyLossPlus::BuildDEDXTable(
   if(aParticleType.GetParticleName()=="proton")
   {
     // create array for the min. delta cuts in kinetic energy
-    G4cout << endl;
+    G4cout << G4endl;
     G4cout.precision(5) ;
     G4cout << "hIoni+ Minimum Delta cut in range=" << MinDeltaCutInRange/mm
-           << "  mm." << endl;
-    G4cout << " min. delta energies (keV) " << endl;
-    G4cout << "   material         min.delta energy " << endl;
-    G4cout << endl;
+           << "  mm." << G4endl;
+    G4cout << " min. delta energies (keV) " << G4endl;
+    G4cout << "   material         min.delta energy " << G4endl;
+    G4cout << G4endl;
 
     if(MinDeltaEnergy) delete MinDeltaEnergy ;
     MinDeltaEnergy = new G4double [numOfMaterials] ;
@@ -320,8 +320,8 @@ void G4hEnergyLossPlus::BuildDEDXTable(
                             G4Electron::Electron(),MinDeltaCutInRange,
                                        (*theMaterialTable)(mat)) ;
       if(MinDeltaEnergy[mat]<Tlowerlimit) MinDeltaEnergy[mat]=Tlowerlimit ;
-      G4cout << setw(20) << (*theMaterialTable)(mat)->GetName()
-             << setw(15) << MinDeltaEnergy[mat]/keV << endl;
+      G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
+             << G4std::setw(15) << MinDeltaEnergy[mat]/keV << G4endl;
     }
   }
 }
@@ -1210,7 +1210,7 @@ G4VParticleChange* G4hEnergyLossPlus::AlongStepDoIt(
       postsafety =
           navigator->ComputeSafety(stepData.GetPostStepPoint()->GetPosition());
 
-      safety = min(presafety,postsafety) ;
+      safety = G4std::min(presafety,postsafety) ;
 
       if(safety < rcut)
      {
@@ -1251,7 +1251,7 @@ G4VParticleChange* G4hEnergyLossPlus::AlongStepDoIt(
       {
         T0=G4EnergyLossTables::GetPreciseEnergyFromRange(
                                              G4Electron::Electron(),
-                                             min(presafety,postsafety),
+                                             G4std::min(presafety,postsafety),
                                              aMaterial) ;
 
         // absolute lower limit for T0
@@ -1469,7 +1469,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1482,7 +1482,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
           if(a1>alim)
           {
             siga=sqrt(a1) ;
-            p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+            p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
           }
           else
             p1 = G4Poisson(a1);
@@ -1510,14 +1510,14 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a1>alim)
       {
         siga=sqrt(a1) ;
-        p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
+        p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
       }
       else
        p1 = G4Poisson(a1);
       if(a2>alim)
       {
         siga=sqrt(a2) ;
-        p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
+        p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
       }
       else
         p2 = G4Poisson(a2);
@@ -1526,7 +1526,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a3>alim)
       {
         siga=sqrt(a3) ;
-        p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
+        p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
       }
       else
         p3 = G4Poisson(a3);
diff --git a/source/processes/electromagnetic/standard/src/G4hIonisation.cc b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
index cd98a6b3d4..cea9910c0c 100644
--- a/source/processes/electromagnetic/standard/src/G4hIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4hIonisation.cc,v 1.6.8.1 1999/12/07 20:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4hIonisation.cc,v 1.6.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -566,7 +566,7 @@ void G4hIonisation::PrintInfoDefinition()
            comments += "\n         Good description above the mean excitation energy.\n";
            comments += "         delta ray energy sampled from  differential Xsection.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                   "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/src/G4hIonisationPlus.cc b/source/processes/electromagnetic/standard/src/G4hIonisationPlus.cc
index a205f50a7d..320c4da94e 100644
--- a/source/processes/electromagnetic/standard/src/G4hIonisationPlus.cc
+++ b/source/processes/electromagnetic/standard/src/G4hIonisationPlus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4hIonisationPlus.cc,v 1.3.8.1 1999/12/07 20:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4hIonisationPlus.cc,v 1.3.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -565,7 +565,7 @@ void G4hIonisationPlus::PrintInfoDefinition()
            comments += "\n         Good description above the mean excitation energy.\n";
            comments += "         delta ray energy sampled from  differential Xsection.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                   "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
diff --git a/source/processes/electromagnetic/standard/src/G4ionIonisation.cc b/source/processes/electromagnetic/standard/src/G4ionIonisation.cc
index 609399d640..1a4b6abd46 100644
--- a/source/processes/electromagnetic/standard/src/G4ionIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4ionIonisation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ionIonisation.cc,v 1.3.8.1 1999/12/07 20:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ionIonisation.cc,v 1.3.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -454,6 +454,6 @@ void G4ionIonisation::PrintInfoDefinition()
            comments += "\n         MeanFreePath is computed at tracking time.\n";
            comments += "         delta ray energy sampled from  differential Xsection.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments << endl;
+  G4cout << G4endl << GetProcessName() << ":  " << comments << G4endl;
 }
 
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
index 513f7ab320..d5cdbd7337 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EnergyLossTables.hh,v 1.8.2.1 1999/12/07 20:51:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EnergyLossTables.hh,v 1.8.2.1.2.1 1999/12/09 10:28:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 //
@@ -152,7 +152,7 @@ public:
   typedef const G4ParticleDefinition* K;
 
 private:
-  typedef G4std::map<K,G4EnergyLossTablesHelper,less<K> > helper_map;
+  typedef G4std::map<K,G4EnergyLossTablesHelper,G4std::less<K> > helper_map;
   static helper_map dict;
   
   static G4EnergyLossTablesHelper GetTables(const G4ParticleDefinition* p);
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
index 979886dec9..e9cc90d00a 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossTables.icc,v 1.7.2.1 1999/12/07 20:51:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 // Inline members of the G4EnergyLossTables class
diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
index 76c147bb25..3fa1e2692e 100644
--- a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
+++ b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossTables.cc,v 1.9.2.1 1999/12/07 20:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------------- 
 // first version created by P.Urban , 06/04/1998
diff --git a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
index 4c95162aba..e28f90fb5d 100644
--- a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
+++ b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Cerenkov.hh,v 1.3.4.1 1999/12/07 20:51:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
index 5f7421348b..d7dc210d98 100644
--- a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
+++ b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ForwardXrayTR.hh,v 1.2.8.1 1999/12/07 20:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4ForwardXrayTR -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
index c639c0e2b3..06a790626f 100644
--- a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
+++ b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Scintillation.hh,v 1.3.4.1 1999/12/07 20:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
index 17fa1ddb08..61f05f3abd 100644
--- a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
+++ b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransitionRadiation.hh,v 1.2.8.1 1999/12/07 20:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4TransitionRadiation  -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
index 9703f638ec..0a53659a9a 100644
--- a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Cerenkov.cc,v 1.6.2.1 1999/12/07 20:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Cerenkov.cc,v 1.6.2.1.2.1 1999/12/08 17:34:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Cerenkov Radiation Class Implementation
@@ -54,7 +54,7 @@ G4Cerenkov::G4Cerenkov(const G4String& processName)
         thePhysicsTable = NULL;
 
 	if (verboseLevel>0) {
-           G4cout << GetProcessName() << " is created " << endl;
+           G4cout << GetProcessName() << " is created " << G4endl;
 	}
 
 	BuildThePhysicsTable();
@@ -264,7 +264,7 @@ G4Cerenkov::AlongStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 
 	if (verboseLevel>0) {
 	G4cout << "\n Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = " 
-	     << aParticleChange.GetNumberOfSecondaries() << endl;
+	     << aParticleChange.GetNumberOfSecondaries() << G4endl;
 	}
 
 	return G4VContinuousProcess::AlongStepDoIt(aTrack, aStep);
@@ -485,8 +485,8 @@ G4Cerenkov::GetAverageNumberOfPhotons(const G4DynamicParticle* aParticle,
 		ge = CAImax - CAImin;
 
 		if (verboseLevel>0) {
-			G4cout << "CAImin = " << CAImin << endl;
-			G4cout << "ge = " << ge << endl;
+			G4cout << "CAImin = " << CAImin << G4endl;
+			G4cout << "ge = " << ge << G4endl;
 		}
 	}
 	
diff --git a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
index 963412b0bb..3baa2e0ee5 100644
--- a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
+++ b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ForwardXrayTR.cc,v 1.2.8.1 1999/12/07 20:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ForwardXrayTR.cc,v 1.2.8.1.2.1 1999/12/08 17:34:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4ForwardXrayTR class -- implementation file
 
@@ -236,7 +236,7 @@ G4ForwardXrayTR( const G4String& matName1,   //  G4Material* pMat1,
   {
     G4Exception("Invalid second material name in G4ForwardXrayTR constructor") ;
   }
-  //  G4cout<<"G4ForwardXray constructor is called"<<endl ;
+  //  G4cout<<"G4ForwardXray constructor is called"<<G4endl ;
   BuildXrayTRtables() ;
 }
 
@@ -331,7 +331,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
               fMaxThetaTR = fTheMinAngle ;
 	    }
 	  }
-   // G4cout<<endl<<"fGamma = "<<fGamma<<"  fMaxThetaTR = "<<fMaxThetaTR<<endl ;
+   // G4cout<<G4endl<<"fGamma = "<<fGamma<<"  fMaxThetaTR = "<<fMaxThetaTR<<G4endl ;
           G4PhysicsLinearVector* 
                      angleVector = new G4PhysicsLinearVector(        0.0,
                                                              fMaxThetaTR,
@@ -353,7 +353,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
             energyVector->PutValue(iTR,energySum) ;
             angleVector ->PutValue(iTR,angleSum)   ;
 	  }
-	  // G4cout<<"sumE = "<<energySum<<" ; sumA = "<<angleSum<<endl ;
+	  // G4cout<<"sumE = "<<energySum<<" ; sumA = "<<angleSum<<G4endl ;
 
           if(jMat < iMat)
 	  {
@@ -369,7 +369,7 @@ void G4ForwardXrayTR::BuildXrayTRtables()
       }      //         jMat != iMat
     }        //     jMat
   }          // iMat
-  //  G4cout<<"G4ForwardXrayTR::BuildXrayTRtables have been called"<<endl ;
+  //  G4cout<<"G4ForwardXrayTR::BuildXrayTRtables have been called"<<G4endl ;
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -536,7 +536,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
 				                const G4Step&  aStep)
 {
   aParticleChange.Initialize(aTrack);
-  //  G4cout<<"call G4ForwardXrayTR::PostStepDoIt"<<endl ;
+  //  G4cout<<"call G4ForwardXrayTR::PostStepDoIt"<<G4endl ;
   G4int iMat, jMat, iTkin, iPlace, numOfMat, numOfTR, iTR, iTransfer ;
 
   G4double energyPos, anglePos, energyTR, theta, phi, dirX, dirY, dirZ ;
@@ -624,7 +624,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
   {
  // G4cout<<iTkin<<" mean TR number = "<<( (*(*fEnergyDistrTable)(iPlace))(0) +
  //                                   (*(*fAngleDistrTable)(iPlace))(0) )
- //      *chargeSq*0.5<<endl ;
+ //      *chargeSq*0.5<<G4endl ;
 
     numOfTR = RandPoisson::shoot( ( (*(*fEnergyDistrTable)(iPlace))(0) +
                                     (*(*fAngleDistrTable)(iPlace))(0) )
@@ -635,7 +635,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
     }
     else
     {
-      // G4cout<<"Number of X-ray TR photons = "<<numOfTR<<endl ;
+      // G4cout<<"Number of X-ray TR photons = "<<numOfTR<<G4endl ;
 
       aParticleChange.SetNumberOfSecondaries(numOfTR);
 
@@ -648,7 +648,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
 	}
         energyTR = (*fEnergyDistrTable)(iPlace)->GetLowEdgeEnergy(iTransfer) ;
 
-	// G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<endl ;
+	// G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<G4endl ;
 
         kinEnergy -= energyTR ; 
         aParticleChange.SetEnergyChange(kinEnergy);
@@ -660,7 +660,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
 	}
         theta = sqrt((*fAngleDistrTable)(iPlace)->GetLowEdgeEnergy(iTransfer-1)) ;
 
-	// G4cout<<iTransfer<<" :  theta = "<<theta<<endl ;
+	// G4cout<<iTransfer<<" :  theta = "<<theta<<G4endl ;
 
         phi = twopi*G4UniformRand() ;
         dirX = sin(theta)*cos(phi)  ;
@@ -693,7 +693,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
   // (*(*fAngleDistrTable)(iPlace))(0))*W1 + 
   //                                ((*(*fEnergyDistrTable)(iPlace + 1))(0)+
   // (*(*fAngleDistrTable)(iPlace + 1))(0))*W2)
-  //                                    *chargeSq*0.5<<endl ;
+  //                                    *chargeSq*0.5<<G4endl ;
 
       numOfTR = RandPoisson::shoot((((*(*fEnergyDistrTable)(iPlace))(0)+
 (*(*fAngleDistrTable)(iPlace))(0))*W1 + 
@@ -706,7 +706,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
       }
       else
       {
-        // G4cout<<"Number of X-ray TR photons = "<<numOfTR<<endl ;
+        // G4cout<<"Number of X-ray TR photons = "<<numOfTR<<G4endl ;
 
         aParticleChange.SetNumberOfSecondaries(numOfTR);
         for(iTR=0;iTR<numOfTR;iTR++)
@@ -721,7 +721,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
           energyTR = ((*fEnergyDistrTable)(iPlace)->GetLowEdgeEnergy(iTransfer))*W1+
                ((*fEnergyDistrTable)(iPlace + 1)->GetLowEdgeEnergy(iTransfer))*W2 ;
 
-	  // G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<endl ;
+	  // G4cout<<"energyTR = "<<energyTR/keV<<"keV"<<G4endl ;
 
           kinEnergy -= energyTR ; 
           aParticleChange.SetEnergyChange(kinEnergy);
@@ -738,7 +738,7 @@ G4VParticleChange* G4ForwardXrayTR::PostStepDoIt(const G4Track& aTrack,
                   ((*fAngleDistrTable)(iPlace + 1)->
                         GetLowEdgeEnergy(iTransfer-1))*W2) ;
 
-	  // G4cout<<iTransfer<<" : theta = "<<theta<<endl ;
+	  // G4cout<<iTransfer<<" : theta = "<<theta<<G4endl ;
 
           phi = twopi*G4UniformRand() ;
           dirX = sin(theta)*cos(phi)  ;
@@ -843,7 +843,7 @@ G4ForwardXrayTR::GetEnergyTR(G4int iMat, G4int jMat, G4int iTkin) const
       }
       else
       {
-  G4cout<<"It is still OK in GetEnergyTR(int,int,int)"<<endl;
+  G4cout<<"It is still OK in GetEnergyTR(int,int,int)"<<G4endl;
         for(iTR=0;iTR<numOfTR;iTR++)
         {
           energyPos = ((*energyVector1)(0)*W1+
diff --git a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
index e229ac851c..7e3f49cc95 100644
--- a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Scintillation.cc,v 1.2.8.1 1999/12/07 20:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Scintillation.cc,v 1.2.8.1.2.1 1999/12/08 17:34:33 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Scintillation Light Class Implementation
@@ -54,7 +54,7 @@ G4Scintillation::G4Scintillation(const G4String& processName)
         thePhysicsTable = NULL;
 
 	if (verboseLevel>0) {
-           G4cout << GetProcessName() << " is created " << endl;
+           G4cout << GetProcessName() << " is created " << G4endl;
 	}
 
 	BuildThePhysicsTable();
@@ -163,8 +163,8 @@ G4Scintillation::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
                               ScintillationIntegral->GetEnergy(CIIvalue);
 
 		if (verboseLevel>1) {
-                   G4cout << "sampledMomentum = " << sampledMomentum << endl;
-		   G4cout << "CIIvalue =        " << CIIvalue << endl;
+                   G4cout << "sampledMomentum = " << sampledMomentum << G4endl;
+		   G4cout << "CIIvalue =        " << CIIvalue << G4endl;
 		}
 
 		// Generate random photon direction
@@ -241,7 +241,7 @@ G4Scintillation::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 
 	if (verboseLevel>0) {
 	G4cout << "\n Exiting from G4Scintillation::DoIt -- NumberOfSecondaries = " 
-	     << aParticleChange.GetNumberOfSecondaries() << endl;
+	     << aParticleChange.GetNumberOfSecondaries() << G4endl;
 	}
 
 	return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
diff --git a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
index 4ecc3b883d..af3023b2db 100644
--- a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
+++ b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransitionRadiation.cc,v 1.1.10.1 1999/12/07 20:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4TransitionRadiation class -- implementation file
 
diff --git a/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh b/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
index 75c6404663..e2bb7ed39b 100644
--- a/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
+++ b/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CrossSectionDataStore.hh,v 1.1.10.1 1999/12/07 20:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4CrossSectionDataStore -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
index cf890f4582..f6b04436ae 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronCaptureDataSet.hh,v 1.1.10.1 1999/12/07 20:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4HadronCaptureDataSet -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh b/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
index e5b0611219..b53125ca8c 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronCrossSections.hh,v 1.2.4.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 Hadron physics class -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
index 688d4f25be..f4f6b52691 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronElasticDataSet.hh,v 1.1.10.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4HadronElasticDataSet -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
index c859fa7cc9..91873027ca 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronFissionDataSet.hh,v 1.1.10.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4HadronFissionDataSet -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
index 5aa30a9038..99a820c030 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronInelasticDataSet.hh,v 1.1.10.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4HadronInelasticDataSet -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
index b3b0266218..979c07da90 100644
--- a/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
@@ -33,7 +33,7 @@ class G4NeutronInelasticCrossSection : public G4VCrossSectionDataSet
 
    virtual
    void DumpPhysicsTable(const G4ParticleDefinition&) 
-   {G4cout << "G4NeutronInelasticCrossSection: uses formula"<<endl;}
+   {G4cout << "G4NeutronInelasticCrossSection: uses formula"<<G4endl;}
 
 };
 
diff --git a/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
index b6ded5e5a8..612d5e33ed 100644
--- a/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
@@ -30,7 +30,7 @@ class G4ProtonInelasticCrossSection : public G4VCrossSectionDataSet
 
    virtual
    void DumpPhysicsTable(const G4ParticleDefinition&) 
-   {G4cout << "G4ProtonInelasticCrossSection: uses formula"<<endl;}
+   {G4cout << "G4ProtonInelasticCrossSection: uses formula"<<G4endl;}
 
 };
 
diff --git a/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh b/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
index d1e24c1309..5fccae23d3 100644
--- a/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCrossSectionDataSet.hh,v 1.1.10.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics abstract class: G4VCrossSectionData -- header file
diff --git a/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc b/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
index 8ed1488314..f97d04726e 100644
--- a/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
+++ b/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CrossSectionDataStore.cc,v 1.1.10.1 1999/12/07 20:51:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics class: G4CrossSectionDataStore
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
index 81ea87fff8..954743ddf4 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronCaptureDataSet.cc,v 1.1.10.1 1999/12/07 20:51:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Physics class: HadronCaptureDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
index 28dfb48bb1..e71f8130f7 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronCrossSections.cc,v 1.1.10.1 1999/12/07 20:51:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronCrossSections.cc,v 1.1.10.1.2.2 1999/12/10 15:42:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Hadron Physics class G4HadronCrossSections
@@ -1218,8 +1218,8 @@ G4HadronCrossSections::CalcScatteringCrossSections(
    G4double z = anElement->GetZ();
 
    if (verboseLevel > 1) {
-      G4cout << "G4HadronCrossSections: a=" << a << endl;
-      G4cout << "G4HadronCrossSections: z=" << z << endl;
+      G4cout << "G4HadronCrossSections: a=" << a << G4endl;
+      G4cout << "G4HadronCrossSections: z=" << z << G4endl;
    }
 
 // Ions...
@@ -1266,7 +1266,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
            je1 = midBin;
       } while (je2 - je1 > 1); 
 
-      G4double ekx = max(ek, 1.e-9);
+      G4double ekx = G4std::max(ek, 1.e-9);
       G4double delab = elab[je2] - elab[je1];
 
       //      G4int ja2 = NCNLW;
@@ -1355,8 +1355,8 @@ G4HadronCrossSections::CalcScatteringCrossSections(
    b = csin[ipart1][je1] - rc*plab[je1];
    sigin = rc*p + b;
    if (verboseLevel > 1) {
-      G4cout << "sigel " << sigel << endl;
-      G4cout << "sigin " << sigin << endl;
+      G4cout << "sigel " << sigel << G4endl;
+      G4cout << "sigin " << sigin << G4endl;
    }
    G4double alph = alpha[ipart1];
    if (ipart < 14) {
@@ -1440,8 +1440,8 @@ G4HadronCrossSections::CalcScatteringCrossSections(
             b = cspiin[i - 1][je1] - rc*plab[je1];
             xspiin = rc*p + b;
             if (verboseLevel > 1) {
-               G4cout << "xspiel " << xspiel << endl;
-               G4cout << "xspiin " << xspiin << endl;
+               G4cout << "xspiel " << xspiel << G4endl;
+               G4cout << "xspiin " << xspiin << G4endl;
             }               
             if (sigel >= 0.001) 
                crel = xspiel/(0.36*sigel*pow(G4double(csa[i]),1.17));
@@ -1482,7 +1482,7 @@ G4HadronCrossSections::GetCaptureCrossSection(
    G4double ek = aParticle->GetKineticEnergy()/GeV;
    if (ek > 0.0327) return 0.;
 
-   G4double ekx = max(ek, 1.e-9);
+   G4double ekx = G4std::max(ek, 1.e-9);
    G4double z = anElement->GetZ();
    G4int izno = z + 0.01;
    if (izno > 100) izno = 100;      // Not in GHESIG
@@ -1536,7 +1536,7 @@ G4HadronCrossSections::GetFissionCrossSection(
    G4double z43ba;
    if (j == 4) {
       z43ba = pow(z, 4./3.)/a;
-      z43ba = max(-67. + 38.7*z43ba, 0.);
+      z43ba = G4std::max(-67. + 38.7*z43ba, 0.);
    }
    else {
       z43ba = 1.;
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
index b8a7521467..4d9c88a598 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronElasticDataSet.cc,v 1.1.10.1 1999/12/07 20:51:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Physics class: HadronElasticDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
index 000f26ca48..0636f49e9a 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronFissionDataSet.cc,v 1.1.10.1 1999/12/07 20:51:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Physics class: HadronFissionDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
index 34ef04e6a8..831afd2480 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronInelasticDataSet.cc,v 1.1.10.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Physics class: HadronInelasticDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc b/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
index c25f57b47b..bcab35be16 100644
--- a/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCrossSectionDataSet.cc,v 1.1.10.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 physics abstract class: G4VCrossSectionDataSet
diff --git a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
index 6c3f46379c..9c10be200a 100644
--- a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
+++ b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyRangeManager.hh,v 1.1.10.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Energy Range Manager
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh b/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
index cc89ea3578..14df03f3cc 100644
--- a/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
+++ b/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Inelastic Process class
  // The specific particle inelastic processes derive from this class
diff --git a/source/processes/hadronic/management/include/G4HadronicInteraction.hh b/source/processes/hadronic/management/include/G4HadronicInteraction.hh
index 3494af42dc..9e57a3abc2 100644
--- a/source/processes/hadronic/management/include/G4HadronicInteraction.hh
+++ b/source/processes/hadronic/management/include/G4HadronicInteraction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronicInteraction.hh,v 1.2.8.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Interaction  abstract base class
  // This class is the base class for the model classes.
diff --git a/source/processes/hadronic/management/include/G4HadronicProcess.hh b/source/processes/hadronic/management/include/G4HadronicProcess.hh
index 924d687210..e4b5003ffc 100644
--- a/source/processes/hadronic/management/include/G4HadronicProcess.hh
+++ b/source/processes/hadronic/management/include/G4HadronicProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronicProcess.hh,v 1.4.2.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // This is the top level Hadronic Process class
  // The inelastic, elastic, capture, and fission processes
diff --git a/source/processes/hadronic/management/include/G4InelasticInteraction.hh b/source/processes/hadronic/management/include/G4InelasticInteraction.hh
index ddafcffe07..a0b6eb9510 100644
--- a/source/processes/hadronic/management/include/G4InelasticInteraction.hh
+++ b/source/processes/hadronic/management/include/G4InelasticInteraction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4InelasticInteraction.hh,v 1.1.10.1 1999/12/07 20:51:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Inelastic Interaction 
  // This class is an abstract base class, since the pure virtual
diff --git a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
index ef1fcff583..1b754dc23c 100644
--- a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
+++ b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyRangeManager.cc,v 1.2.8.1 1999/12/07 20:51:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Energy Range Manager
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc b/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
index baee34d904..e0a36a3296 100644
--- a/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
+++ b/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronInelasticProcess.cc,v 1.1.8.1.2.1 1999/12/07 20:51:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Inelastic Process Class
  // J.L. Chuma, TRIUMF, 24-Mar-1997
diff --git a/source/processes/hadronic/management/src/G4HadronicInteraction.cc b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
index 3d2f449da6..3df271ea6b 100644
--- a/source/processes/hadronic/management/src/G4HadronicInteraction.cc
+++ b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronicInteraction.cc,v 1.1.10.1 1999/12/07 20:51:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronicInteraction.cc,v 1.1.10.1.2.1 1999/12/08 17:34:35 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Interaction  base class
  // original by H.P. Wellisch
@@ -31,9 +31,9 @@
       if( aMaterial == theMinMaterials[i] )return theMinEnergyList[i];
     }
     if( verboseLevel > 0 )
-      G4cout << "*** Warning from HadronicInteraction::GetMinEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::GetMinEnergy" << G4endl
            << "    material " << aMaterial->GetName()
-           << " not found in min energy List" << endl;
+           << " not found in min energy List" << G4endl;
     return theMinEnergy;
   }
  
@@ -43,9 +43,9 @@
    G4Element *anElement )
   {
     if( IsBlocked(anElement) )
-      G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << G4endl
            << "    The model is not active for the Element  "
-           << anElement->GetName() << "." << endl;
+           << anElement->GetName() << "." << G4endl;
     
     for( G4int i=0; i<theMinCounterElements; ++i )
     {
@@ -67,9 +67,9 @@
    G4Material *aMaterial )
   {
     if( IsBlocked(aMaterial) )
-      G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << G4endl
            << "    The model is not active for the Material "
-           << aMaterial->GetName() << "." << endl;
+           << aMaterial->GetName() << "." << G4endl;
     
     for( G4int i=0; i<theMinCounter; ++i )
     {
@@ -101,9 +101,9 @@
       if( aMaterial == theMaxMaterials[i] )return theMaxEnergyList[i];
     }
     if( verboseLevel > 0 )
-      G4cout << "*** Warning from HadronicInteraction::GetMaxEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::GetMaxEnergy" << G4endl
            << "    material " << aMaterial->GetName()
-           << " not found in min energy List" << endl;
+           << " not found in min energy List" << G4endl;
     
     return theMaxEnergy;
   }
@@ -114,9 +114,9 @@
    G4Element *anElement ) 
   {
     if( IsBlocked(anElement) )
-      G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
            << "Warning: The model is not active for the Element  "
-           << anElement->GetName() << "." << endl;
+           << anElement->GetName() << "." << G4endl;
     
     for( G4int i=0; i<theMaxCounterElements; ++i )
     {
@@ -138,9 +138,9 @@
    G4Material *aMaterial )
   {
     if( IsBlocked(aMaterial) ) 
-      G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << endl
+      G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
            << "Warning: The model is not active for the Material "
-           << aMaterial->GetName() << "." << endl;
+           << aMaterial->GetName() << "." << G4endl;
     
     for( G4int i=0; i<theMaxCounter; ++i )
     {
diff --git a/source/processes/hadronic/management/src/G4HadronicProcess.cc b/source/processes/hadronic/management/src/G4HadronicProcess.cc
index 7d060a22bd..2df1821822 100644
--- a/source/processes/hadronic/management/src/G4HadronicProcess.cc
+++ b/source/processes/hadronic/management/src/G4HadronicProcess.cc
@@ -5,16 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronicProcess.cc,v 1.7.2.1 1999/12/07 20:51:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronicProcess.cc,v 1.7.2.1.2.5 1999/12/14 09:16:48 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // HPW to implement the choosing of an element for scattering.
-#include <fstream.h>
-#ifdef WIN32
-  #include <strstrea.h>
-#else
-  #include <strstream.h>
-#endif
+#include "g4std/fstream"
+#include "g4std/strstream"
 #include <stdlib.h>
 #include "G4HadronicProcess.hh"
 //@@ add model name info, once typeinfo available #include <typeinfo.h>
@@ -162,7 +158,7 @@
     
     // prepare the IsoResult.
     char the1[100] = {""};
-    ostrstream ost1(the1, 100, ios::out);
+    G4std::ostrstream ost1(the1, 100, G4std::ios::out);
     ost1 <<Z<<"_"<<A;
     G4String * biff = new G4String(the1);
     G4IsoResult * theResult = new G4IsoResult(*biff, aNucleus);
diff --git a/source/processes/hadronic/management/src/G4InelasticInteraction.cc b/source/processes/hadronic/management/src/G4InelasticInteraction.cc
index cc7dc3d58a..cf3010409a 100644
--- a/source/processes/hadronic/management/src/G4InelasticInteraction.cc
+++ b/source/processes/hadronic/management/src/G4InelasticInteraction.cc
@@ -38,7 +38,7 @@
     for( i=2; i<=nm; i++ )nmf += log((double)i);
     for( i=2; i<=nz; i++ )nzf += log((double)i);
     G4double r;
-    r = min( expxu, max( expxl, -(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf ) );
+    r = G4std::min( expxu, G4std::max( expxl, -(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf ) );
     return exp(r);
   }
 
@@ -136,7 +136,7 @@
     for( G4int i=iBegin; i<=numSec; ++i )
     {
       temp = pi*i/(2.0*n*n);
-      test = exp( min( expxu, max( expxl, -(pi/4.0)*(i*i)/(n*n) ) ) );
+      test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(i*i)/(n*n) ) ) );
       if( temp < 1.0 )
       {
         if( test >= 1.0e-10 )anpn += temp*test;
@@ -199,7 +199,7 @@
       //
       G4double tkin = targetNucleus.EvaporationEffects( ek*GeV )/GeV;
       ek -= tkin;
-      ek = max( 0.0001, ek );
+      ek = G4std::max( 0.0001, ek );
       modifiedOriginal.SetKineticEnergy( ek*GeV );
       G4double amas = originalIncident->GetDefinition()->GetPDGMass()/GeV;
       G4double et = ek + amas;
@@ -267,8 +267,8 @@
     //     there is no kinetic energy available for either proton/neutron
     //     or for deuteron/triton/alpha black track particles
     // For diffraction scattering on heavy nuclei use elastic routines instead
-    //G4cerr << "*** Error in G4InelasticInteraction::CalculateMomenta" << endl;
-    //G4cerr << "*** the elastic scattering would be better here ***" <<endl;
+    //G4cerr << "*** Error in G4InelasticInteraction::CalculateMomenta" << G4endl;
+    //G4cerr << "*** the elastic scattering would be better here ***" <<G4endl;
     //}
     theReactionDynamics.TwoBody( vec, vecLen,
                                  modifiedOriginal, originalTarget,
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
index fa93db0970..a6e43f0334 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitationHandler.hh,v 1.3.4.1 1999/12/07 20:51:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
index 03f10d92d8..7ff724abb0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FissionBarrier.hh,v 1.1.10.1 1999/12/07 20:51:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
index 55278f34e0..e460c2eb4f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
@@ -33,7 +33,7 @@
 #include "G4PtrLevelVector.hh"
 #include "G4NuclearLevel.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4NuclearLevelManager 
 {
@@ -73,7 +73,7 @@ private:
   G4bool operator==(const G4NuclearLevelManager &right) const;
   G4bool operator!=(const G4NuclearLevelManager &right) const;
 
-  G4bool Read(ifstream& aDataFile);
+  G4bool Read(G4std::ifstream& aDataFile);
  
   void MakeLevels();
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc
index 807e5b1672..ba2db47494 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc
@@ -3,13 +3,13 @@ G4bool G4Solver<Function>::Bisection(Function & theFunction)
 {
 	// Check the interval before start
 	if (a > b || abs(a-b) <= tolerance) {
-		G4cerr << "G4Solver::Bisection: The interval must be properly set." << endl;
+		G4cerr << "G4Solver::Bisection: The interval must be properly set." << G4endl;
 		return false;
 	}
 	G4double fa = theFunction(a);
 	G4double fb = theFunction(b);
 	if (fa*fb > 0.0) {
-		G4cerr << "G4Solver::Bisection: The interval must include a root." << endl;
+		G4cerr << "G4Solver::Bisection: The interval must include a root." << G4endl;
 		return false;
 	}
 	
@@ -36,7 +36,7 @@ G4bool G4Solver<Function>::Bisection(Function & theFunction)
 			fb=fc;
 		}
 	}
-	G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << endl;
+	G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << G4endl;
 	return false;
 }
 	
@@ -46,13 +46,13 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
 {
 	// Check the interval before start
 	if (a > b || abs(a-b) <= tolerance) {
-		G4cerr << "G4Solver::RegulaFalsi: The interval must be properly set." << endl;
+		G4cerr << "G4Solver::RegulaFalsi: The interval must be properly set." << G4endl;
 		return false;
 	}
 	G4double fa = theFunction(a);
 	G4double fb = theFunction(b);
 	if (fa*fb > 0.0) {
-		G4cerr << "G4Solver::RegulaFalsi: The interval must include a root." << endl;
+		G4cerr << "G4Solver::RegulaFalsi: The interval must include a root." << G4endl;
 		return false;
 	}
 	
@@ -62,7 +62,7 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
 	// Finding the root
 	for (G4int i = 0; i < MaxIter; i++) {
 		G4double c = (a*fb-b*fa)/(fb-fa);
-		G4double delta = min(abs(c-a),abs(b-c));
+		G4double delta = G4std::min(abs(c-a),abs(b-c));
 		if (delta < eps) {
 			root = c;
 			return true;
@@ -80,7 +80,7 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
 			fa=fc;
 		}
 	}
-	G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << endl;
+	G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << G4endl;
 	return false;
 
 }	
@@ -93,13 +93,13 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
 	
 	// Check the interval before start
 	if (a > b || abs(a-b) <= tolerance) {
-		G4cerr << "G4Solver::Brent: The interval must be properly set." << endl;
+		G4cerr << "G4Solver::Brent: The interval must be properly set." << G4endl;
 		return false;
 	}
 	G4double fa = theFunction(a);
 	G4double fb = theFunction(b);
 	if (fa*fb > 0.0) {
-		G4cerr << "G4Solver::Brent: The interval must include a root." << endl;
+		G4cerr << "G4Solver::Brent: The interval must include a root." << G4endl;
 		return false;
 	}
 	
@@ -153,7 +153,7 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
 			p = abs(p);
 			G4double min1 = 3.0*xm*q-abs(Tol1*q);
 			G4double min2 = abs(e*q);
-			if (2.0*p < min(min1,min2)) {
+			if (2.0*p < G4std::min(min1,min2)) {
 				// Interpolation
 				e = d;
 				d = p/q;
@@ -177,7 +177,7 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
 		}
 		fb = theFunction(b);
 	}
-	G4cerr << "G4Solver::Brent: Number of iterations exceeded." << endl;
+	G4cerr << "G4Solver::Brent: Number of iterations exceeded." << G4endl;
 	return false;
 }
 
@@ -185,7 +185,7 @@ template <class Function>
 void G4Solver<Function>::SetIntervalLimits(const G4double Limit1, const G4double Limit2)
 {
 	if (abs(Limit1-Limit2) <= tolerance) {
-		G4cerr << "G4Solver::SetIntervalLimits: Interval must be wider than tolerance." << endl;
+		G4cerr << "G4Solver::SetIntervalLimits: Interval must be wider than tolerance." << G4endl;
 		return;
 	}
 	if (Limit1 < Limit2) {
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
index 0dcadb928e..6060596a5e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFissionBarrier.hh,v 1.1.10.1 1999/12/07 20:51:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
index 01987c93b6..e1c8faaaa2 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
@@ -239,7 +239,7 @@ G4int G4CompetitiveFission::FissionAtomicNumber(const G4int A, const G4FissionPa
   G4double C2 = 0.0;
   if (w > 1000.0 ) C2 = C2S;
   else if (w < 0.001) C2 = C2A;
-  else C2 =  max(C2A,C2S);
+  else C2 =  G4std::max(C2A,C2S);
 
   G4double C1 = A-C2;
   if (C1 < 30.0) {
@@ -338,7 +338,7 @@ G4double G4CompetitiveFission::FissionKineticEnergy(const G4double A, const G4do
 {
 
   // Find maximal value of A for fragments
-  G4double AfMax = max(Af1,Af2);
+  G4double AfMax = G4std::max(Af1,Af2);
   if (AfMax < (A/2.0)) AfMax = A - AfMax;
 
   // Weights for symmetric and asymmetric components
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
index aaeaca3daf..ba1f717ebc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
@@ -63,7 +63,7 @@ G4VGammaTransition* G4ContinuumGammaDeexcitation::CreateTransition()
     }
 
   if (_verbose > 1)
-    G4cout << "G4ContinuumGammaDeexcitation::CreateTransition - Created" << endl;
+    G4cout << "G4ContinuumGammaDeexcitation::CreateTransition - Created" << G4endl;
 
   return new G4ContinuumGammaTransition(_levelManager,Z,A,excitation,_verbose );
 }
@@ -80,7 +80,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0)
 	G4cout 
 	  << "G4ContinuumGammaDeexcitation::CanDoTransition - Null transition "
-	  << endl;
+	  << G4endl;
     }
 
   G4Fragment nucleus = GetNucleus();
@@ -94,7 +94,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0) 
 	G4cout 
 	  << "G4ContinuumGammaDeexcitation::CanDoTransition - n/p/H"
-	  << endl;
+	  << G4endl;
     }
 
 
@@ -105,7 +105,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0) 
 	G4cout 
 	  << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation <= 0"
-	  << endl;
+	  << G4endl;
     }
 
   if (excitation <= _levelManager.MaxLevelEnergy()) 
@@ -114,13 +114,13 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0)
       G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation " 
 	     << excitation << " below max discrete level " 
-	     << _levelManager.MaxLevelEnergy() << endl;
+	     << _levelManager.MaxLevelEnergy() << G4endl;
     }
   
   if (canDo)
     { if (_verbose > 1) 
       G4cout <<"G4ContinuumGammaDeexcitation::CanDoTransition - CanDo" 
-	     << endl; 
+	     << G4endl; 
     }
 
   return canDo;
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
index 6e9b111b08..2acd484c9f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
@@ -101,7 +101,7 @@ void G4ContinuumGammaTransition::SelectGamma()
 
       if(_verbose > 10)
 	G4cout << "*---* G4ContinuumTransition: e = " << e 
-	       << " pdf = " << sampleArray[i] << endl;
+	       << " pdf = " << sampleArray[i] << G4endl;
     }
   G4RandGeneralTmp randGeneral(sampleArray, nBins);
   G4double random = randGeneral.shoot();
@@ -113,7 +113,7 @@ void G4ContinuumGammaTransition::SelectGamma()
   if(_verbose > 10)
     G4cout << "*---*---* G4ContinuumTransition: eGamma = " << _eGamma
 	   << "   finalExcitation = " << finalExcitation 
-	   << " random = " << random << endl;
+	   << " random = " << random << G4endl;
 
 //  if (finalExcitation < 0)
   if(finalExcitation < _minLevelE/2.)
@@ -133,7 +133,7 @@ void G4ContinuumGammaTransition::SelectGamma()
 
   if(_verbose > 10)
     G4cout << "*---*---* G4ContinuumTransition: _gammaCreationTime = "
-	   << _gammaCreationTime/second << endl;
+	   << _gammaCreationTime/second << G4endl;
 
   return;  
 }
@@ -172,7 +172,7 @@ G4double G4ContinuumGammaTransition::E1Pdf(G4double e)
 
   if(_verbose > 20)
     G4cout << _nucleusA << " LevelDensityParameter = " <<  aLevelDensityParam
-	   << " Bef Aft " << levelDensBef << " " << levelDensAft << endl;
+	   << " Bef Aft " << levelDensBef << " " << levelDensAft << G4endl;
   
   // Now form the probability density
 
@@ -197,7 +197,7 @@ G4double G4ContinuumGammaTransition::E1Pdf(G4double e)
     G4cout << ".. " << Egdp << " .. " << GammaR 
 	   << " .. " << normC << " .. " << sigmaAbs  
 	   << " .. " << e*e << " .. " << levelDensAft/levelDensBef
-	   << endl;
+	   << G4endl;
 
   //  theProb = normC * sigmaAbs * e*e * levelDensAft/levelDensBef;
   theProb =  sigmaAbs * e*e * levelDensAft/levelDensBef;
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
index bbe5d46c2c..06a5f568fd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
@@ -47,7 +47,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
       if (_verbose > 1)
 	G4cout 
 	  << "G4DiscreteGammaDeexcitation::CreateTransition - (A,Z) is valid " 
-	  << endl;
+	  << G4endl;
       
       if (_nucleusA != A || _nucleusZ != Z) 
 	{
@@ -66,7 +66,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
 	    G4cout 
 	      << "G4DiscreteGammaDeexcitation::CreateTransition - Created from level energy " 
 	      << level->Energy() << ", excitation is " 
-	      << excitation << endl;
+	      << excitation << G4endl;
 	  return new G4DiscreteGammaTransition(*level);
 	}
       else 
@@ -74,7 +74,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
 	  if (_verbose > 0)
 	    G4cout 
 	      << "G4DiscreteGammaDeexcitation::CreateTransition - No transition created from "
-	      << excitation << " within tolerance " << _tolerance << endl;
+	      << excitation << " within tolerance " << _tolerance << G4endl;
 	  
 	  return 0; 
 	}
@@ -95,7 +95,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0)
 	G4cout 
 	  << "G4DiscreteGammaDeexcitation::CanDoTransition - Null transition " 
-	  << endl;
+	  << G4endl;
     }
 
   G4Fragment nucleus = GetNucleus();
@@ -109,7 +109,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0) 
 	G4cout 
 	  << "G4DiscreteGammaDeexcitation::CanDoTransition - n/p/H/>U"
-	  << endl;
+	  << G4endl;
     }
 
   G4double excitation = nucleus.GetExcitationEnergy();
@@ -119,7 +119,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
       if (_verbose > 0) 
 	G4cout 
 	  << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation <= 0" 
-	  << endl;
+	  << G4endl;
     }
 
   if (excitation > _levelManager.MaxLevelEnergy() + _tolerance) canDo = false;
@@ -133,12 +133,12 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
       G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation " 
 	     << excitation << ", Min-Max are " 
 	     << _levelManager.MinLevelEnergy() << " "
-	     << _levelManager.MaxLevelEnergy() << endl;
+	     << _levelManager.MaxLevelEnergy() << G4endl;
     }
   
   if (canDo)
     { if (_verbose > 0) 
-      G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo" << endl; }
+      G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo" << G4endl; }
   //  else
   //    { 
   //      delete _transition;
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
index 619d85ba42..8beecb3194 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
@@ -98,7 +98,7 @@ void G4DiscreteGammaTransition::SelectGamma()
 
 //  if(_verbose > 10)
 //    G4cout << "*---*---* G4DiscreteTransition: _gammaCreationTime = "
-//	   << _gammaCreationTime/second << endl;
+//	   << _gammaCreationTime/second << G4endl;
   return;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
index 6a44953b0a..4b839d22ff 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
@@ -85,16 +85,16 @@ G4double G4E1Probability::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, gammaE = "<<Uexcite<<"  "<<gammaE<<endl;
-  //cout<<" Uexcite, gammaE = "<<Uexcite*MeV<<"  "<<gammaE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, gammaE = "<<Uexcite<<"  "<<gammaE<<G4endl;
+  //cout<<" Uexcite, gammaE = "<<Uexcite*MeV<<"  "<<gammaE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * gammaE*gammaE * GammaR*GammaR;
   G4double denominator = (gammaE*gammaE - Egdp*Egdp)*
@@ -106,8 +106,8 @@ G4double G4E1Probability::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
index 379014f8a4..bb78d30905 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
@@ -84,16 +84,16 @@ G4double G4E1Probability001::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability001::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
index 9b335078c7..8a6e238b1a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
@@ -84,16 +84,16 @@ G4double G4E1Probability01::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability01::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
index 691e09c930..b06622cea5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
@@ -84,16 +84,16 @@ G4double G4E1Probability10::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability10::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
index 76057c3e57..f57cba9f35 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
@@ -84,16 +84,16 @@ G4double G4E1Probability100::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability100::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
index 8e42d039da..867dcb0528 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability001::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability001::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
index 79516b59eb..8ea11f3e9d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability01::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability01::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
index cd871bffca..9db65b97cf 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
@@ -87,16 +87,16 @@ G4double G4E1SingleProbability1::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -108,8 +108,8 @@ G4double G4E1SingleProbability1::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
index b4bc37efc7..fed1497aa1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability10::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability10::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
index 7421f9d3d3..3f05ff0283 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability100::EmissionProbDensity(const G4Fragment& frag,
   G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
 
   // CD
-  //cout<<"  PROB TESTS "<<endl;
-  //cout<<" hbarc = "<<hbarc<<endl;
-  //cout<<" pi = "<<pi<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<endl;
-  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<endl;
-  //cout<<" lev density param = "<<aLevelDensityParam<<endl;
-  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<endl;
-  //cout<<" sigma0 = "<<sigma0<<endl;
-  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<endl;
-  //cout<<" normC = "<<normC<<endl;
+  //cout<<"  PROB TESTS "<<G4endl;
+  //cout<<" hbarc = "<<hbarc<<G4endl;
+  //cout<<" pi = "<<pi<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite<<"  "<<exciteE<<G4endl;
+  //cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<"  "<<exciteE*MeV<<G4endl;
+  //cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
+  //cout<<" level densities = "<<levelDensBef<<"  "<<levelDensAft<<G4endl;
+  //cout<<" sigma0 = "<<sigma0<<G4endl;
+  //cout<<" Egdp, GammaR = "<<Egdp<<"  "<<GammaR<<G4endl;
+  //cout<<" normC = "<<normC<<G4endl;
 
   G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
   G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability100::EmissionProbDensity(const G4Fragment& frag,
             levelDensAft/levelDensBef;
 
   // CD
-  //cout<<" sigmaAbs = "<<sigmaAbs<<endl;
-  //cout<<" Probability = "<<theProb<<endl;
+  //cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
+  //cout<<" Probability = "<<theProb<<G4endl;
 
   return theProb;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
index 70ec940430..01a5f8b7aa 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
@@ -454,11 +454,11 @@ G4FragmentVector * G4Evaporation::BreakItUp(const G4Fragment &theNucleus)
     for (i=0; i < TotNumberOfChannels; i++)
       TotalProbability += theChannels[i]->GetEmissionProbability();
 
-//     G4cout << "---------------- " << theResidualNucleus.GetExcitationEnergy()/MeV << "-----------------------" << endl;
-//     G4cout << "Prob of neutron: " << theChannels[0]->GetEmissionProbability()/TotalProbability << endl;
-//     G4cout << "Prob of proton : " << theChannels[1]->GetEmissionProbability()/TotalProbability<< endl;
-//     G4cout << "Prob of alpha  : " << theChannels[5]->GetEmissionProbability()/TotalProbability<< endl;
-//     G4cout << "Prob of fission: " << theChannels[NumberOfFissionChannel]->GetEmissionProbability()/TotalProbability<< endl;
+//     G4cout << "---------------- " << theResidualNucleus.GetExcitationEnergy()/MeV << "-----------------------" << G4endl;
+//     G4cout << "Prob of neutron: " << theChannels[0]->GetEmissionProbability()/TotalProbability << G4endl;
+//     G4cout << "Prob of proton : " << theChannels[1]->GetEmissionProbability()/TotalProbability<< G4endl;
+//     G4cout << "Prob of alpha  : " << theChannels[5]->GetEmissionProbability()/TotalProbability<< G4endl;
+//     G4cout << "Prob of fission: " << theChannels[NumberOfFissionChannel]->GetEmissionProbability()/TotalProbability<< G4endl;
 
 
     if (TotalProbability <= 0.0) {
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
index 70eda9832b..9a63f418e0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitationHandler.cc,v 1.3.8.1 1999/12/07 20:51:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
index 655d5c2f20..206f771638 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FissionBarrier.cc,v 1.1.10.1 1999/12/07 20:51:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
index 6590bd23c5..60e48ecc23 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
@@ -55,8 +55,8 @@ G4FissionParameters::G4FissionParameters(const G4int A, const G4int Z, const G4d
   }
   
   if (w == 0.0) {
-    w1 = max(1.03*wa - FasymAsym, 0.0001);
-    w2 = max(1.0 - FsymA1A2*wa,   0.0001);
+    w1 = G4std::max(1.03*wa - FasymAsym, 0.0001);
+    w2 = G4std::max(1.0 - FsymA1A2*wa,   0.0001);
     
     w = w1/w2;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
index 12ee3f5bae..2d6defbd24 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
@@ -128,19 +128,19 @@ void G4NuclearLevel::PrintAll() const
 {
   G4cout << "---- Level energy = " << _energy << ", angular momentum = "
 	 << _angularMomentum << ", half life " << _halfLife
-	 << ", " << _nGammas << " photons" << endl;
+	 << ", " << _nGammas << " photons" << G4endl;
   G4int i;
   G4cout << "     Gammas: ";
   for (i=0; i<_nGammas; i++) { G4cout << _energies.at(i) << " "; }
-  G4cout << endl << "     Weights: ";
+  G4cout << G4endl << "     Weights: ";
   for (i=0; i<_nGammas; i++) { G4cout << _weights.at(i) << " "; }
-  G4cout << endl << "     Relative transition probabilities ";
+  G4cout << G4endl << "     Relative transition probabilities ";
   for (i=0; i<_nGammas; i++) { G4cout << _prob.at(i) << " "; }
-  G4cout << endl << "     Cumulative probabilities: ";
+  G4cout << G4endl << "     Cumulative probabilities: ";
   for (i=0; i<_nGammas; i++) { G4cout << _cumProb.at(i) << " "; }
-  G4cout << endl << "     Polarities: ";
+  G4cout << G4endl << "     Polarities: ";
   for (i=0; i<_nGammas; i++) { G4cout << _polarities.at(i) << " "; }
-  G4cout << endl;      
+  G4cout << G4endl;      
 
   return;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
index 780829216f..75f2999d26 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
@@ -32,12 +32,8 @@
 #include "G4NuclearLevel.hh"
 #include "G4ios.hh"
 #include <stdlib.h>
-#include <fstream.h>
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/fstream"
+#include "g4std/strstream"
 
 G4NuclearLevelManager::G4NuclearLevelManager():
   _nucleusA(0), _nucleusZ(0), _levels(0), _levelEnergy(0), _gammaEnergy(0), _probability(0)
@@ -87,11 +83,11 @@ G4bool G4NuclearLevelManager::IsValid(G4int Z, G4int A) const
     G4Exception("G4NuclearLevelManager - Please set the G4LEVELGAMMADATA environment variable");
   G4String dirName(env);
   char name[100] = {""};
-  ostrstream ost(name, 100, ios::out);
+  G4std::ostrstream ost(name, 100, G4std::ios::out);
   ost << dirName << "/" << "z" << Z << ".a" << A;
   G4String file(name); 
   
-  ifstream inFile(file);
+  G4std::ifstream inFile(file);
   if (! inFile) valid = false;  
 
   return valid;
@@ -174,7 +170,7 @@ const G4NuclearLevel* G4NuclearLevelManager::LowestLevel() const
 }
 
 
-G4bool G4NuclearLevelManager::Read(ifstream& dataFile)
+G4bool G4NuclearLevelManager::Read(G4std::ifstream& dataFile)
 {
   const G4double minProbability = 0.001;
 
@@ -193,7 +189,7 @@ G4bool G4NuclearLevelManager::Read(ifstream& dataFile)
       // zero
       if (_probability < minProbability) _probability = minProbability;
 
-      // G4cout << "Read " << _levelEnergy << " " << _gammaEnergy << " " << _probability << endl;
+      // G4cout << "Read " << _levelEnergy << " " << _gammaEnergy << " " << _probability << G4endl;
     }
   else
     {
@@ -211,16 +207,16 @@ void G4NuclearLevelManager::MakeLevels()
     G4Exception("G4NuclearLevelManager: please set the G4LEVELGAMMADATA environment variable");
   G4String dirName(env);
   char name[100] = {""};
-  ostrstream ost(name, 100, ios::out);
+  G4std::ostrstream ost(name, 100, G4std::ios::out);
   ost << dirName << "/" << "z" << _nucleusZ << ".a" << _nucleusA;
   G4String file(name); 
   
-  ifstream inFile(file, ios::in);
+  G4std::ifstream inFile(file, G4std::ios::in);
   
   if (! inFile) 
     {
       //      G4cout << " G4NuclearLevelManager: (" << _nucleusZ << "," << _nucleusA 
-      //  	     << ") does not have LevelsAndGammas file" << endl;
+      //  	     << ") does not have LevelsAndGammas file" << G4endl;
       return;
     }
 
@@ -254,7 +250,7 @@ void G4NuclearLevelManager::MakeLevels()
 
   G4int nData = eLevel.entries();
 
-  //  G4cout << " ==== MakeLevels ===== " << nData << " data read " << endl;
+  //  G4cout << " ==== MakeLevels ===== " << nData << " data read " << G4endl;
 
   G4double thisLevelEnergy = eLevel.at(0);
   G4double thisLevelHalfLife = 0.;
@@ -272,7 +268,7 @@ void G4NuclearLevelManager::MakeLevels()
       {
 	//	  G4cout << "Making a new level... " << e << " " 
 	//		 << thisLevelEnergies.entries() << " " 
-	//		 << thisLevelWeights.entries() << endl;
+	//		 << thisLevelWeights.entries() << G4endl;
 	
 	G4NuclearLevel* newLevel = new G4NuclearLevel(thisLevelEnergy,
 						      thisLevelHalfLife,
@@ -315,10 +311,10 @@ void G4NuclearLevelManager::PrintAll()
   if (_levels != 0) nLevels = _levels->entries();
 
   G4cout << " ==== G4NuclearLevelManager ==== (" << _nucleusZ << ", " << _nucleusA
-	 << ") has " << nLevels << " levels" << endl
+	 << ") has " << nLevels << " levels" << G4endl
 	 << "Highest level is at energy " << MaxLevelEnergy() << " MeV "
-	 << endl << "Lowest level is at energy " << MinLevelEnergy()
-	 << " MeV " << endl;
+	 << G4endl << "Lowest level is at energy " << MinLevelEnergy()
+	 << " MeV " << G4endl;
 
   G4int i = 0;
   for (i=0; i<nLevels; i++)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
index 32f754008a..5cfb7b45e4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
@@ -102,7 +102,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
       if (_verbose > 0)
 	G4cout << " = BreakUp = " << nDiscr 
 	       << " gammas from DiscreteDeexcitation " 
-	       << endl;
+	       << G4endl;
       
       for (i=0; i<nDiscr; i++)
 	{
@@ -126,7 +126,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
 
 
   if (_verbose > 0)
-    G4cout << "*-*-*-* Photon evaporation: " << products->entries() << endl;
+    G4cout << "*-*-*-* Photon evaporation: " << products->entries() << G4endl;
 
   return products;
 }
@@ -151,7 +151,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
 
   if (_verbose > 0)
     G4cout << " = BreakItUp = " << nCont 
-	   << " gammas from ContinuumDeexcitation " << endl;
+	   << " gammas from ContinuumDeexcitation " << G4endl;
 
   G4int i;
   if (nCont > 0)
@@ -172,7 +172,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
 
   if (_verbose > 0)
     G4cout << " = BreakItUp = " << nDiscr 
-	   << " gammas from DiscreteDeexcitation " << endl;
+	   << " gammas from DiscreteDeexcitation " << G4endl;
 
   for (i=0; i<nDiscr; i++)
     {
@@ -184,13 +184,13 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
   products->insert(finalNucleus);
 
   if (_verbose > 0)
-    G4cout << " = BreakItUp = Nucleus added to products" << endl;
+    G4cout << " = BreakItUp = Nucleus added to products" << G4endl;
 
   delete contProducts;  // delete vector, not fragments 
   delete discrProducts;
 
   if (_verbose > 0)
-    G4cout << "*-*-* Photon evaporation: " << products->entries() << endl;
+    G4cout << "*-*-* Photon evaporation: " << products->entries() << G4endl;
 
   return products;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
index 12466efbbc..1f65366dcd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
@@ -85,7 +85,7 @@ G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
 		
 			G4double theMeanMult = theMicrocanonicalEnsemble->GetMeanMultiplicity();
 			if (theMeanMult <= MaxAverageMultiplicity) {
-//				G4cout << "MICROCANONICAL" << endl;
+//				G4cout << "MICROCANONICAL" << G4endl;
 				// choose fragments atomic numbers and charges from direct simulation
 				theChannel = theMicrocanonicalEnsemble->ChooseAandZ(theFragment);
 				_theEnsemble = theMicrocanonicalEnsemble;
@@ -99,7 +99,7 @@ G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
 					_theEnsemble = theMacrocanonicalEnsemble;
 					FirstTime = false;
 				}
-//				G4cout << "MACROCANONICAL" << endl;
+//				G4cout << "MACROCANONICAL" << G4endl;
 				// Select calculated fragment total multiplicity, 
 				// fragment atomic numbers and fragment charges.
 				theChannel = theMacrocanonicalEnsemble->ChooseAandZ(theFragment);
@@ -186,7 +186,7 @@ G4bool G4StatMF::FindTemperatureOfBreakingChannel(const G4Fragment & theFragment
 	G4double Z = theFragment.GetZ();
 	G4double U = theFragment.GetExcitationEnergy();
 
-	G4double T = max(Temperature,0.0012*MeV);
+	G4double T = G4std::max(Temperature,0.0012*MeV);
 
 	G4double Ta = T;
 	G4double Tb = T;
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
index 7e6e19ffce..a0743aec47 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
@@ -48,7 +48,7 @@ G4double G4StatMFFragment::GetEnergy(const G4double T)
 {
 	if (theA < 1 || theZ < 0 || theZ > theA) {
 		G4cerr << "G4StatMFFragment::GetEnergy: A = " << theA 
-				 << ", Z = " << theZ << endl;
+				 << ", Z = " << theZ << G4endl;
 		G4Exception(
 		"G4StatMFFragment::GetEnergy: Wrong values for A and Z!");
 	}
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
index 8aa0981d34..f2523702fb 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
@@ -61,7 +61,7 @@ G4double G4StatMFMacroMultiNucleon::CalcMeanMultiplicity(const G4double FreeVol,
 	
 	if (exponent > 30.0) exponent = 30.0;
 	
-	_MeanMultiplicity = max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
+	_MeanMultiplicity = G4std::max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
 	return _MeanMultiplicity;	
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
index ce0f9df111..e6981bcad5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
@@ -30,7 +30,7 @@ G4double G4StatMFMacroTemperature::CalcTemperature(void)
 {
 	// Temperature
 	G4double Ta = 0.00012; 
-	G4double Tb = max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
+	G4double Tb = G4std::max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
     
 	G4double fTa = this->operator()(Ta); 
 	G4double fTb = this->operator()(Tb); 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
index a3f69ce2bd..1e44a1619e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
@@ -89,7 +89,7 @@ void G4StatMFMacroCanonical::CalculateTemperature(const G4Fragment & theFragment
 	G4double Z = theFragment.GetZ();
 
 	// Fragment Multiplicity
-	G4double FragMult = max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
+	G4double FragMult = G4std::max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
 
 
 	// Parameter Kappa
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
index c730f6de89..9b8a5d822f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
@@ -152,7 +152,7 @@ G4double G4StatMFMicroPartition::CalcPartitionTemperature(const G4double U,
 	
 	// Bracketing the solution
 	G4double Ta = 0.001;
-	G4double Tb = max(sqrt(8.0*U/theA),0.0012*MeV);
+	G4double Tb = G4std::max(sqrt(8.0*U/theA),0.0012*MeV);
 	G4double Tmid = 0.0;
 	
 	G4double Da = (U + FreeInternalE0 - GetPartitionEnergy(Ta))/U;
@@ -180,7 +180,7 @@ G4double G4StatMFMicroPartition::CalcPartitionTemperature(const G4double U,
 	}
 	// if we arrive here the temperature could not be calculated
 	G4cerr << "G4StatMFMicroPartition::CalcPartitionTemperature: I can't calculate the temperature"  
-			<< endl;
+			<< G4endl;
 	// and set probability to 0 returning T < 0
 	return -1.0;
 	
@@ -237,7 +237,7 @@ G4double G4StatMFMicroPartition::CalcPartitionProbability(const G4double U,
 	G4double V0 = (4./3.)*pi*theA*G4StatMFParameters::Getr0()*G4StatMFParameters::Getr0()*
 						G4StatMFParameters::Getr0();
 	G4double FreeVolume = kappa*V0;
-	G4double TranslationalS = max(0.0, log(ProbA32/Fact) +
+	G4double TranslationalS = G4std::max(0.0, log(ProbA32/Fact) +
 			(_thePartition.entries()-1.0)*log(FreeVolume/ThermalWaveLenght3) +
 			1.5*(_thePartition.entries()-1.0) - (3./2.)*log(theA));
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
index dc924adbf0..bba22fd156 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
@@ -175,7 +175,7 @@ G4double G4StatMFMicroCanonical::CalcEntropyOfCompoundNucleus(const G4Fragment &
 	const G4double U = theFragment.GetExcitationEnergy();
 	const G4double A13 = pow(A,1.0/3.0);
 
-	G4double Ta = max(sqrt(U/(0.125*A)),0.0012*MeV); 
+	G4double Ta = G4std::max(sqrt(U/(0.125*A)),0.0012*MeV); 
 	G4double Tb = Ta;
   
 	G4double ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Ta);
@@ -230,7 +230,7 @@ G4double G4StatMFMicroCanonical::CalcEntropyOfCompoundNucleus(const G4Fragment &
 		} 
 	}
 
-	G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << endl;
+	G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << G4endl;
 
 	return 0.0;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
index 1b4fdf3f15..4286e20b70 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFissionBarrier.cc,v 1.1.10.1 1999/12/07 20:51:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
index b636b179ef..9533c2dd30 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
@@ -68,7 +68,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoTransition()
     }
 
   if (_verbose > 1)
-    G4cout << "G4VGammaDeexcitation::DoTransition - Transition deleted " << endl;
+    G4cout << "G4VGammaDeexcitation::DoTransition - Transition deleted " << G4endl;
 
   if (_transition != 0) delete _transition;
 
@@ -82,7 +82,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoChain()
 
   while (CanDoTransition())
     {
-      if (_verbose > 5) G4cout << "G4VGammaDeexcitation::DoChain -  Looping" << endl;
+      if (_verbose > 5) G4cout << "G4VGammaDeexcitation::DoChain -  Looping" << G4endl;
 
       G4Fragment* gamma = GenerateGamma();
       if (gamma != 0) 
@@ -94,7 +94,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoChain()
     } 
 
   if (_verbose > 1)
-      G4cout << "G4VGammaDeexcitation::DoChain - Transition deleted, end of chain " << endl;
+      G4cout << "G4VGammaDeexcitation::DoChain - Transition deleted, end of chain " << G4endl;
 
   if (_transition != 0) delete _transition;
   
@@ -128,7 +128,7 @@ G4Fragment* G4VGammaDeexcitation::GenerateGamma()
   {
     G4cout << "G4VGammaDeexcitation::GenerateGamma - Gamma energy " << eGamma 
 	   << " ** New excitation " << _nucleus.GetExcitationEnergy() - eGamma
-	   << endl;
+	   << G4endl;
   }
 
   // Photon momentum isotropically generated 
@@ -153,7 +153,7 @@ G4Fragment* G4VGammaDeexcitation::GenerateGamma()
     gammaFragment->SetCreationTime(gammaTime);
 
     if (_verbose > 1)
-      G4cout << "G4VGammaDeexcitation::GenerateGamma -  Gamma fragment generated " << endl;
+      G4cout << "G4VGammaDeexcitation::GenerateGamma -  Gamma fragment generated " << G4endl;
 
     return gammaFragment;
   }
@@ -218,7 +218,7 @@ void G4VGammaDeexcitation::Update()
       delete _transition;
       _transition = 0;
       if (_verbose > 1)
-	G4cout << "G4VGammaDeexcitation::Update - Transition deleted " << endl;
+	G4cout << "G4VGammaDeexcitation::Update - Transition deleted " << G4endl;
     }
 
   _transition = CreateTransition();
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
index d544c69efc..1a9f2946b2 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DiffractiveSplitableHadron.hh,v 1.2.8.1 1999/12/07 20:51:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4DiffractiveSplitableHadron_h
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
index bc517f19fd..189f2e9ddc 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FTFModel.hh,v 1.2.4.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4FTFModel_h
 #define G4FTFModel_h 1
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
index dd9ac7d873..7dc7055124 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FTFParticipants.hh,v 1.1.8.1.2.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4FTFParticipants_h
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
index 4f3847cb69..1d9609130e 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DiffractiveSplitableHadron.cc,v 1.1.10.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DiffractiveSplitableHadron.cc,v 1.1.10.1.2.1 1999/12/10 15:42:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
@@ -106,8 +106,8 @@ void G4DiffractiveSplitableHadron::ChooseStringEnds(G4int PDGcode,G4int * aEnd,
 	   G4int heavy=  absPDGcode/ 100;
 	   G4int light= (absPDGcode %100)/10;
 	   
-//	    G4int anti= pow(-1 , max( heavy, light));
-	    G4int anti= 1 -2 * ( max( heavy, light ) % 2 );
+//	    G4int anti= pow(-1 , G4std::max( heavy, light));
+	    G4int anti= 1 -2 * ( G4std::max( heavy, light ) % 2 );
 	    if (PDGcode < 0 ) anti *=-1;
 	    
 	    heavy *= anti;
@@ -177,8 +177,8 @@ G4int G4DiffractiveSplitableHadron::Diquark(G4int aquark,G4int bquark,G4int Spin
 {
 	G4int diquarkPDG;
 	
-	diquarkPDG = max( abs(aquark), abs(bquark) )*1000 +
-	             min( abs(aquark), abs(bquark) )*100  +
+	diquarkPDG = G4std::max( abs(aquark), abs(bquark) )*1000 +
+	             G4std::min( abs(aquark), abs(bquark) )*100  +
 	             2*Spin + 1;
 	return ( aquark > 0 && bquark > 0 ) ?  diquarkPDG : -1*diquarkPDG;
 }	      
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
index 982508bf6d..9f155b996a 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FTFModel.cc,v 1.2.2.1.2.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FTFModel.cc,v 1.2.2.1.2.1.2.1 1999/12/08 17:34:41 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
@@ -108,7 +108,7 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
 	    
 	
 //	G4cout << "BuildStrings prim/targ " << primaries.entries() << " , " <<
-//					     targets.entries() << endl;
+//					     targets.entries() << G4endl;
 
 
 	G4int ahadron;
@@ -131,15 +131,15 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
 
 G4bool G4FTFModel::ExciteParticipants()
 {
-//	G4cout << "G4FTFModel::ExciteParticipants starting " << endl;
+//	G4cout << "G4FTFModel::ExciteParticipants starting " << G4endl;
 	
 	while (theParticipants.Next())
 	{
-//	   G4cout << "next Collision " << endl;
+//	   G4cout << "next Collision " << G4endl;
 	   
 	   const G4InteractionContent & collision=theParticipants.GetInteraction();
 	   
-//	   G4cout << " soft colls : " << collision.GetNumberOfSoftCollisions() << endl;
+//	   G4cout << " soft colls : " << collision.GetNumberOfSoftCollisions() << G4endl;
 
 	   G4VSplitableHadron * projectile=collision.GetProjectile();
 	   G4VSplitableHadron * target=collision.GetTarget();
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
index 57918751f1..d0a7a927e1 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FTFParticipants.cc,v 1.1.10.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FTFParticipants.cc,v 1.1.10.1.2.1 1999/12/08 17:34:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -40,7 +40,7 @@ G4FTFParticipants::G4FTFParticipants(const G4FTFParticipants &right)
 
 G4FTFParticipants::~G4FTFParticipants()
 {
-// G4cout << "G4FTFParticipants::~G4FTFParticipants() called" << endl;
+// G4cout << "G4FTFParticipants::~G4FTFParticipants() called" << G4endl;
 }
 
 
@@ -67,9 +67,9 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
 		 sqr( G4Proton::Proton()->GetPDGMass() ) +
 		 2*thePrimary.GetTotalEnergy()*G4Proton::Proton()->GetPDGMass();
 
-//    G4cout << " primary Total E (GeV): " << thePrimary.GetTotalEnergy()/GeV << endl;
-//    G4cout << " primary Mass    (GeV): " << thePrimary.GetMass() /GeV << endl;
-//    G4cout << "cms sqrt(s) (GeV) = " << sqrt(s) / GeV << endl;
+//    G4cout << " primary Total E (GeV): " << thePrimary.GetTotalEnergy()/GeV << G4endl;
+//    G4cout << " primary Mass    (GeV): " << thePrimary.GetMass() /GeV << G4endl;
+//    G4cout << "cms sqrt(s) (GeV) = " << sqrt(s) / GeV << G4endl;
 
     G4PomeronCrossSection theCrossSection(thePrimary.GetDefinition());
     
@@ -82,7 +82,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
     G4double xyradius;
     xyradius =theNucleus->GetOuterRadius() + deltaxy;
 
-//    G4cout <<"  G4FTFParticipants::StartLoop: xyradius " << xyradius << endl;
+//    G4cout <<"  G4FTFParticipants::StartLoop: xyradius " << xyradius << G4endl;
 
     G4bool nucleusNeedsShift = true;
     
@@ -98,7 +98,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
 	G4double impactX=x*xyradius;
 	G4double impactY=y*xyradius;
 
-//	G4cout << " impctX, impctY " << impactX/fermi << "    "<<impactY/fermi << " fm" << endl;
+//	G4cout << " impctX, impctY " << impactX/fermi << "    "<<impactY/fermi << " fm" << G4endl;
 
 	theNucleus->StartLoop();
 	G4Nucleon * nucleon;
@@ -130,7 +130,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
 
 //	G4cout << "Number of Hit nucleons " << theInteractions.entries() 
 //		<< "\t" << impactX/fermi << "\t"<<impactY/fermi
-//		<< "\t" << sqrt(sqr(impactX)+sqr(impactY))/fermi <<endl;
+//		<< "\t" << sqrt(sqr(impactX)+sqr(impactY))/fermi <<G4endl;
 	 
     }
    
diff --git a/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh b/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
index 9bc32ed97c..8b6710e1e3 100644
--- a/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
+++ b/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TheoFSGenerator.hh,v 1.2 1999/04/12 15:45:28 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4TheoFSGenerator_h
 #define G4TheoFSGenerator_h 1
diff --git a/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc b/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
index 0c1849e4db..4a4d5e53b2 100644
--- a/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
+++ b/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TheoFSGenerator.cc,v 1.3 1999/04/18 11:30:49 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4TheoFSGenerator
 #include "G4DynamicParticle.hh"
diff --git a/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc b/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
index 98c0493f41..d161654e1b 100644
--- a/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
+++ b/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
@@ -9,9 +9,9 @@
    G4VParticleChange* G4GeneratorPrecompoundInterface::
    ApplyYourself(const G4Track& aTrack, G4Nucleus& theNucleus)
    {
-     cout << "G4GeneratorPrecompoundInterface: ApplyYourself interface called stand-allone."<< endl;
-     cout << "This class is only a mediator between generator and precompound"<<endl;
-     cout << "Please remove from your physics list."<<endl;
+     G4std::cout << "G4GeneratorPrecompoundInterface: ApplyYourself interface called stand-allone."<< G4endl;
+     G4std::cout << "This class is only a mediator between generator and precompound"<<G4endl;
+     G4std::cout << "Please remove from your physics list."<<G4endl;
      G4Exception("SEVERE: G4GeneratorPrecompoundInterface model interface called stand-allone.");
      return new G4ParticleChange;
    }
diff --git a/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh b/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
index 80c9e75db6..5113a71a18 100644
--- a/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4V3DNucleus.hh,v 1.2.8.1 1999/12/07 20:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4V3DNucleus_h
 #define G4V3DNucleus_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh b/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
index d620741d80..f25ea7b349 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHighEnergyGenerator.hh,v 1.2.8.1 1999/12/07 20:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VHighEnergyGenerator_h
 #define G4VHighEnergyGenerator_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh b/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
index ffa97c5191..917d4c1072 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VIntraNuclearTransportModel.hh,v 1.3.8.1 1999/12/07 20:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh b/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
index 9386d2d9f5..df4071c37b 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VKineticNucleon.hh,v 1.1.8.1 1999/12/07 20:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VKineticNucleon_h
 #define G4VKineticNucleon_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh b/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
index a030df6412..d64676b006 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VNuclearDensity.hh,v 1.1.10.1 1999/12/07 20:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VNuclearDensity_h
 #define G4VNuclearDensity_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh b/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
index 2cefc6b8fc..29ab98dc08 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPreCompoundModel.hh,v 1.2.8.1 1999/12/07 20:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VPreCompoundModel_h
diff --git a/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc b/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
index 929ba7aaa8..c3c061a666 100644
--- a/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4V3DNucleus.cc,v 1.1.10.1 1999/12/07 20:51:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4V3DNucleus.hh"
 
diff --git a/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc b/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
index 1726980c34..33a05779e7 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VHighEnergyGenerator.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VHighEnergyGenerator
 #include "G4VHighEnergyGenerator.hh"
diff --git a/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc b/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
index 575be43b9b..7faa22c4d6 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.2.8.1 1999/12/07 20:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc b/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
index e6328dc936..5d2ea8ef2d 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VKineticNucleon.cc,v 1.1.8.1 1999/12/07 20:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4VKineticNucleon.hh"
 
diff --git a/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc b/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
index d355e3f2ad..ff619fffc2 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VNuclearDensity.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VNuclearDensity.hh"
diff --git a/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc b/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
index 130c8be961..53946c650f 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPreCompoundModel.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VPreCompoundModel.hh"
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
index ef3fa23201..40f18ba0d0 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PreCompoundModel.hh,v 1.4.6.1.2.1 1999/12/07 20:51:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by V. Lara
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
index 63345f55fc..c049348f66 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
@@ -12,7 +12,7 @@
 #define G4VPreCompoundFragment_h 1
 
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
@@ -44,8 +44,8 @@ public:
   
   G4int operator!=(const G4VPreCompoundFragment &right) const;
 
-  friend ostream& operator<<(ostream&, const G4VPreCompoundFragment*);
-  friend ostream& operator<<(ostream&, const G4VPreCompoundFragment&);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment*);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment&);
 
 
   // methods
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
index 0459e798af..d2e104cd62 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PreCompoundModel.cc,v 1.7.4.1 1999/12/07 20:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PreCompoundModel.cc,v 1.7.4.1.2.1 1999/12/08 17:34:42 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // by V. Lara
 
@@ -240,7 +240,7 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(const G4Fragment & theInit
 	    theChannels(aChannel)->GetKineticEnergy(aFragment);
 	  
 
-	  // G4cout << "Kinetic energy of Emitted fragment " << KineticEnergyOfEmittedFragment << endl;
+	  // G4cout << "Kinetic energy of Emitted fragment " << KineticEnergyOfEmittedFragment << G4endl;
 	  
 	  // Sample Fermi momentum of emitted fragment
 	  static const G4double FermiMaxMom = 250.0; // MeV
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
index 82433ac278..6a822fd0c2 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
@@ -55,7 +55,7 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
                 aFragment.GetA()*aFragment.GetExcitationEnergy()/MeV;
 
   // Transition probability for \Delta n = -2 (at F(p,h) = 0)
-  //  TransitionProb2 = max(0, (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE));
+  //  TransitionProb2 = G4std::max(0, (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE));
   TransitionProb2 = (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE);
   if (TransitionProb2 < 0.0) TransitionProb2 = 0.0; 
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
index 6632caee79..76092babed 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
@@ -77,24 +77,24 @@ G4int G4VPreCompoundFragment::operator!=(const G4VPreCompoundFragment & right) c
 }
 
 
-ostream& operator << (ostream &out, const G4VPreCompoundFragment &theFragment)
+G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment &theFragment)
 {
   out << &theFragment;
   return out; 
 }
 
 
-ostream& operator << (ostream &out, const G4VPreCompoundFragment *theFragment)
+G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment *theFragment)
 {
-  long old_floatfield = out.setf(0,ios::floatfield);
+  long old_floatfield = out.setf(0,G4std::ios::floatfield);
 
   out 
-    << "PreCompound Model Emitted Fragment: A = " << setprecision(3) << theFragment->theA 
-    << ", Z = " << setprecision(3) << theFragment->theZ;
-  out.setf(ios::scientific,ios::floatfield);
+    << "PreCompound Model Emitted Fragment: A = " << G4std::setprecision(3) << theFragment->theA 
+    << ", Z = " << G4std::setprecision(3) << theFragment->theZ;
+  out.setf(G4std::ios::scientific,G4std::ios::floatfield);
 //   out
 //     << ", U = " << theFragment->theExcitationEnergy/MeV 
-//     << " MeV" << endl
+//     << " MeV" << G4endl
 //     << "          P = (" 
 //     << theFragment->theMomentum.x()/MeV << ","
 //     << theFragment->theMomentum.y()/MeV << ","
@@ -102,7 +102,7 @@ ostream& operator << (ostream &out, const G4VPreCompoundFragment *theFragment)
 //     << ") MeV   E = " 
 //     << theFragment->theMomentum.t()/MeV << " MeV";
 
-  out.setf(old_floatfield,ios::floatfield);
+  out.setf(old_floatfield,G4std::ios::floatfield);
 
   return out;
     
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
index 031dca5c37..07b700a07f 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4InelasticSplitableHadron.hh,v 1.1.4.1 1999/12/07 20:51:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4InelasticSplitableHadron_h
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
index 171a42bb9e..14df0e571a 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PartonStringAnnihilator.hh,v 1.1.4.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $Maxim Komogorov
+// GEANT4 tag $Name: geant4-01-01 $Maxim Komogorov
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
index 869464f094..4174800d8a 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
@@ -71,7 +71,7 @@ void G4InelasticSplitableHadron::GetValenceQuarkFlavors(G4int PDGcode, G4int& aE
       {
       G4int heavy =  absPDGcode/100;
       G4int light = (absPDGcode%100)/10;
-      G4int anti  = 1 - 2*(max(heavy, light)%2);
+      G4int anti  = 1 - 2*(G4std::max(heavy, light)%2);
       if (PDGcode < 0 ) anti = -anti;
       heavy *= anti;
       light *= -1 * anti;
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
index aaf62874e6..5d98dac45d 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
@@ -7,7 +7,7 @@ G4bool G4MesonSplitter::SplitMeson(G4int PDGcode, G4int* aEnd, G4int* bEnd)
 
   G4int heavy =  absPDGcode/100;
   G4int light = (absPDGcode%100)/10;
-  G4int anti  = 1 - 2*(max(heavy, light)%2);
+  G4int anti  = 1 - 2*(G4std::max(heavy, light)%2);
   if (PDGcode < 0 ) anti = -anti;
   heavy *=  anti;
   light *= -anti;
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
index 9fb03bff79..bd76f915d0 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
@@ -109,7 +109,7 @@ void G4QGSMSplitableHadron::DiffractiveSplitUp()
   RightMom.setPy(HadronMom.py() - pt.y());
 
   G4double Local1 = HadronMom.minus() + (RightMom.perp2() - LeftMom.perp2())/HadronMom.plus();
-  G4double Local2 = sqrt(max(0., sqr(Local1) - 4.*RightMom.perp2()*HadronMom.minus()/HadronMom.plus()));
+  G4double Local2 = sqrt(G4std::max(0., sqr(Local1) - 4.*RightMom.perp2()*HadronMom.minus()/HadronMom.plus()));
   if (Direction) Local2 = -Local2;
   G4double RightMinus   = 0.5*(Local1 + Local2);
   G4double LeftMinus = HadronMom.minus() - RightMinus;
@@ -229,7 +229,7 @@ void G4QGSMSplitableHadron::SoftSplitUp()
      aParton = AntiColor.at(aSeaPair); 
      aParton->DefineMomentumInZ(lightCone, Direction);
    }  
-//--DEBUG--   cout <<endl<<"XSAMPLE "<<HPWtest<<endl;
+//--DEBUG--   cout <<G4endl<<"XSAMPLE "<<HPWtest<<G4endl;
    return;
 } 
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
index 3b7e3d670d..684089ed65 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
@@ -24,7 +24,7 @@ void G4QGSModel::Init(const G4Nucleus & aNucleus, const G4DynamicParticle & aPro
      // this is an approximation, neglecting the motion of nucleons in the nucleus & p,n mass differences. @@@
     G4double vz = aProjectile.Get4Momentum().pz()/
                   (aProjectile.Get4Momentum().e() + G4Proton::Proton()->GetPDGMass());
-//--DEBUG--    cout << "IncomingMomentum "<<aProjectile.Get4Momentum()<<endl;
+//--DEBUG--    cout << "IncomingMomentum "<<aProjectile.Get4Momentum()<<G4endl;
     theCurrentVelocity.setZ(vz);
     theParticipants.GetWoundedNucleus()->DoLorentzBoost(-theCurrentVelocity); 
     G4LorentzVector Mom = aProjectile.Get4Momentum();
@@ -33,7 +33,7 @@ void G4QGSModel::Init(const G4Nucleus & aNucleus, const G4DynamicParticle & aPro
     theProjectile.SetDefinition(aProjectile.GetDefinition());
     theProjectile.SetTotalEnergy(Mom.e());
     theProjectile.SetMomentum(Mom);
-//--DEBUG--    cout << "PreInteractionMomentum "<<Mom<<endl;
+//--DEBUG--    cout << "PreInteractionMomentum "<<Mom<<G4endl;
     theParticipants.BuildInteractions(theProjectile);
     theParticipants.GetWoundedNucleus()->DoLorentzBoost(theCurrentVelocity);
     }
@@ -59,10 +59,10 @@ G4ExcitedStringVector * G4QGSModel::GetStrings()
     aString->Boost(theCurrentVelocity);  
     theStrings->insert(aString);
   }
-//--DEBUG--  cout << endl;
+//--DEBUG--  cout << G4endl;
   for(G4int i=0; i<theStrings->length(); i++)
   {
-//--DEBUG--    cout << "String = "<<theStrings->at(i)->Get4Momentum()<<endl;
+//--DEBUG--    cout << "String = "<<theStrings->at(i)->Get4Momentum()<<G4endl;
   }
   return theStrings;
 }
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
index b260abc76e..c3bbb25b94 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
@@ -79,7 +79,7 @@ void G4QGSParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
 //      ModelMode = DIFFRACTIVE;
       if (Probability > rndNumber)
       {
-//--DEBUG--        cout << "DEBUG p="<< Probability<<" r="<<rndNumber<<" d="<<sqrt(Distance2)<<endl;
+//--DEBUG--        cout << "DEBUG p="<< Probability<<" r="<<rndNumber<<" d="<<sqrt(Distance2)<<G4endl;
         G4QGSMSplitableHadron* aTarget = new G4QGSMSplitableHadron(*pNucleon);
         theTargets.insert(aTarget);
  	pNucleon->Hit(aTarget);
@@ -130,10 +130,10 @@ void G4QGSParticipants::BuildInteractions(const G4ReactionProduct  &thePrimary)
        }
       }
     }
-//--DEBUG--  cout << endl<<"NUCLEONCOUNT "<<nucleonCount<<endl;
+//--DEBUG--  cout << G4endl<<"NUCLEONCOUNT "<<nucleonCount<<G4endl;
   }
-//--DEBUG--  cout << endl<<"CUTDEBUG "<< totalCuts <<endl;
-//--DEBUG--  cout << "Impact Parameter used = "<<impactUsed<<endl;
+//--DEBUG--  cout << G4endl<<"CUTDEBUG "<< totalCuts <<G4endl;
+//--DEBUG--  cout << "Impact Parameter used = "<<impactUsed<<G4endl;
   // now build the parton pairs. HPW
   SplitHadrons();
   
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh b/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
index 09da4bb531..69b2fe91b9 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EventGenerator.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4EventGenerator_h
 #define G4EventGenerator_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh b/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
index ec1507833e..d2eaa50da2 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4InteractionCode.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4InteractionCode_h
 #define G4InteractionCode_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh b/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
index d2e9a54607..cb87cc81f9 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4InteractionContent.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4InteractionContent_h
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh b/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
index 9e0da76d2f..f080b8c3bc 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4PomeronCrossSection.hh,v 1.2.8.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Proton.hh"
 #include "G4Neutron.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh b/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
index 22fd20a806..e4fca2a7c5 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StringModel.hh,v 1.2.8.1 1999/12/07 20:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4StringModel_h
 #define G4StringModel_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh b/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
index 346f205097..c79d13b66b 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VParticipants.hh,v 1.1.8.1 1999/12/07 20:51:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VParticipants_h
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh b/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
index 553e287715..b959aa30f2 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPartonStringModel.hh,v 1.2.8.1 1999/12/07 20:51:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VPartonStringModel_h
 #define G4VPartonStringModel_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh b/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
index fa69deb42b..4116c176e9 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSplitableHadron.hh,v 1.1.6.1.2.1 1999/12/07 20:51:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VSplitableHadron_h
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh b/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
index f4c671e017..63b0c551b2 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VStringFragmentation.hh,v 1.1.8.1 1999/12/07 20:51:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VStringFragmentation_h
 #define G4VStringFragmentation_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh b/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
index c16011eed5..761f8a253f 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VertexCode.hh,v 1.1.10.1 1999/12/07 20:51:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VertexCode_h
 #define G4VertexCode_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc b/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
index 6352dd1981..9997b27045 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
@@ -5,7 +5,7 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DiffractiveExcitation.cc,v 1.5.4.1 1999/12/07 20:51:53 gunter Exp $
+// $Id: G4DiffractiveExcitation.cc,v 1.5.4.1.2.3 1999/12/10 15:42:06 gunter Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
 //
@@ -47,7 +47,7 @@ G4bool G4DiffractiveExcitation::
   	   G4LorentzVector Ptarget=target->Get4Momentum();
    	   G4double Mtarget2=sqr(target->GetDefinition()->GetPDGMass() + minExtraMass);
 //	     G4cout << "E proj, target :" << Pprojectile.e() << ", " <<
-//					    Ptarget.e() << endl;
+//					    Ptarget.e() << G4endl;
 
 // Transform momenta to cms and then rotate parallel to z axis;
 
@@ -61,15 +61,15 @@ G4bool G4DiffractiveExcitation::
 	   if ( Ptmp.pz() <= 0. )
 	   {
 	   // "String" moving backwards in  CMS, abort collision !!
-//	   	   G4cout << " abort Collision!! " << endl;
+//	   	   G4cout << " abort Collision!! " << G4endl;
 		   return false; 
 	   }
 	   		   
 	   toCms.rotateZ(-1*Ptmp.phi());
 	   toCms.rotateY(-1*Ptmp.theta());
 
-//	   G4cout << "Pprojectile  be4 boost " << Pprojectile << endl;
-//	   G4cout << "Ptarget be4 boost : " << Ptarget << endl;
+//	   G4cout << "Pprojectile  be4 boost " << Pprojectile << G4endl;
+//	   G4cout << "Ptarget be4 boost : " << Ptarget << G4endl;
 	
 
 
@@ -78,14 +78,14 @@ G4bool G4DiffractiveExcitation::
 	   Pprojectile.transform(toCms);
 	   Ptarget.transform(toCms);
 
-//	   G4cout << "Pprojectile aft boost : " << Pprojectile << endl;
-//	   G4cout << "Ptarget aft boost : " << Ptarget << endl;
-//	   G4cout << "cms aft boost : " << (Pprojectile+ Ptarget) << endl;
+//	   G4cout << "Pprojectile aft boost : " << Pprojectile << G4endl;
+//	   G4cout << "Ptarget aft boost : " << Ptarget << G4endl;
+//	   G4cout << "cms aft boost : " << (Pprojectile+ Ptarget) << G4endl;
 
 //	   G4cout << " Projectile Xplus / Xminus : " << 
-//	   	Pprojectile.plus() << " / " << Pprojectile.minus() << endl;
+//	   	Pprojectile.plus() << " / " << Pprojectile.minus() << G4endl;
 //	   G4cout << " Target Xplus / Xminus : " << 
-//	   	Ptarget.plus() << " / " << Ptarget.minus() << endl;
+//	   	Ptarget.plus() << " / " << Ptarget.minus() << G4endl;
 
 	   G4LorentzVector Qmomentum;
 	   G4int whilecount=0;
@@ -96,18 +96,18 @@ G4bool G4DiffractiveExcitation::
 	       if (whilecount++ >= 500 && (whilecount%100)==0) 
 //	   	 G4cout << "G4DiffractiveExcitation::ExciteParticipants possibly looping"
 //	   	 << ", loop count/ maxPtSquare : " 
-//           	 << whilecount << " / " << maxPtSquare << endl;
+//           	 << whilecount << " / " << maxPtSquare << G4endl;
                if (whilecount > 1000 ) 
                {
            	   Qmomentum=0;
-//	   	 G4cout << "G4DiffractiveExcitation::ExciteParticipants: Aborting loop!" << endl;
+//	   	 G4cout << "G4DiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
 	   	 return false; 	  //  Ignore this interaction 
                }
 	       Qmomentum=G4LorentzVector(GaussianPt(widthOfPtSquare,maxPtSquare),0);
 
-//	       G4cout << "generated Pt " << Qmomentum << endl;
-//	       G4cout << "Pprojectile with pt : " << Pprojectile+Qmomentum << endl;
-//	       G4cout << "Ptarget with pt : " << Ptarget-Qmomentum << endl;
+//	       G4cout << "generated Pt " << Qmomentum << G4endl;
+//	       G4cout << "Pprojectile with pt : " << Pprojectile+Qmomentum << G4endl;
+//	       G4cout << "Ptarget with pt : " << Ptarget-Qmomentum << G4endl;
 
 //  Momentum transfer
 	       G4double Xmin = minmass / ( Pprojectile.e() + Ptarget.e() );
@@ -115,8 +115,8 @@ G4bool G4DiffractiveExcitation::
 	       G4double Xplus =ChooseX(Xmin,Xmax);
 	       G4double Xminus=ChooseX(Xmin,Xmax);
 
-//	       G4cout << " X-plus  " << Xplus << endl;
-//	       G4cout << " X-minus " << Xminus << endl;
+//	       G4cout << " X-plus  " << Xplus << G4endl;
+//	       G4cout << " X-minus " << Xminus << G4endl;
 	       
 	       G4double pt2=G4ThreeVector(Qmomentum).mag2();
 	       G4double Qplus =-1 * pt2 / Xminus/Ptarget.minus();
@@ -125,11 +125,11 @@ G4bool G4DiffractiveExcitation::
 	       Qmomentum.setPz( (Qplus-Qminus)/2 );
 	       Qmomentum.setE(  (Qplus+Qminus)/2 );
 
-//	     G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<endl;
-//	     G4cout << "pt2" << pt2 << endl;
-//	     G4cout << "Qmomentum " << Qmomentum << endl;
+//	     G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<G4endl;
+//	     G4cout << "pt2" << pt2 << G4endl;
+//	     G4cout << "Qmomentum " << Qmomentum << G4endl;
 //	     G4cout << " Masses (P/T) : " << (Pprojectile+Qmomentum).mag() <<
-//	   		       " / " << (Ptarget-Qmomentum).mag() << endl;
+//	   		       " / " << (Ptarget-Qmomentum).mag() << G4endl;
 
 	   } while ( (Pprojectile+Qmomentum).mag2() <= Mprojectile2 ||
 	   	     (Ptarget-Qmomentum).mag2()     <= Mtarget2 );
@@ -137,25 +137,25 @@ G4bool G4DiffractiveExcitation::
 	   Pprojectile += Qmomentum;
 	   Ptarget     -= Qmomentum;
 
-//	   G4cout << "Pprojectile with Q : " << Pprojectile << endl;
-//	   G4cout << "Ptarget with Q : " << Ptarget << endl;
+//	   G4cout << "Pprojectile with Q : " << Pprojectile << G4endl;
+//	   G4cout << "Ptarget with Q : " << Ptarget << G4endl;
 	
 	
 	
-//	   G4cout << "Projectile back: " << toLab * Pprojectile << endl;
-//	   G4cout << "Target back: " << toLab * Ptarget << endl;
+//	   G4cout << "Projectile back: " << toLab * Pprojectile << G4endl;
+//	   G4cout << "Target back: " << toLab * Ptarget << G4endl;
 
 // Transform back and update SplitableHadron Participant.
 	   Pprojectile.transform(toLab);
 	   Ptarget.transform(toLab);
 
-//	   G4cout << "Target	 mass  " <<  Ptarget.mag() << endl;
+//	   G4cout << "Target	 mass  " <<  Ptarget.mag() << G4endl;
 	   		   
 	   target->Set4Momentum(Ptarget);
 // 	
 	   
 
-//	   G4cout << "Projectile mass  " <<  Pprojectile.mag() << endl;
+//	   G4cout << "Projectile mass  " <<  Pprojectile.mag() << G4endl;
 
 	   projectile->Set4Momentum(Pprojectile);
 	
@@ -170,12 +170,12 @@ G4ExcitedString * G4DiffractiveExcitation::
 	hadron->SplitUp();
 	G4Parton *start= hadron->GetNextParton();
 	if ( start==NULL) 
-	{ cout << " G4FTFModel::String() Error:No start parton found"<< endl;
+	{ G4cout << " G4FTFModel::String() Error:No start parton found"<< G4endl;
 	  return NULL;
 	}
 	G4Parton *end  = hadron->GetNextParton();
 	if ( end==NULL) 
-	{ cout << " G4FTFModel::String() Error:No end parton found"<< endl;
+	{ G4cout << " G4FTFModel::String() Error:No end parton found"<< G4endl;
 	  return NULL;
 	}
 	
@@ -208,7 +208,7 @@ G4ExcitedString * G4DiffractiveExcitation::
 	G4double tm1=hadron->Get4Momentum().minus() +
 	  ( Pend.perp2()-Pstart.perp2() ) / hadron->Get4Momentum().plus();
 
-	G4double tm2= sqrt( max(0., sqr(tm1) -
+	G4double tm2= sqrt( G4std::max(0., sqr(tm1) -
 	     4. * Pend.perp2() * hadron->Get4Momentum().minus()
 	      /  hadron->Get4Momentum().plus() ));
 
@@ -230,11 +230,11 @@ G4ExcitedString * G4DiffractiveExcitation::
 	end->Set4Momentum(Pend);
 	
 #ifdef G4_FTFDEBUG
-	G4cout << " generated string flavors          " << start->GetPDGcode() << " / " << end->GetPDGcode() << endl;
-	G4cout << " generated string momenta:   quark " << start->Get4Momentum() << "mass : " <<start->Get4Momentum().mag()<< endl;
-	G4cout << " generated string momenta: Diquark " << end ->Get4Momentum() << "mass : " <<end->Get4Momentum().mag()<< endl;
-	G4cout << " sum of ends                       " << Pstart+Pend << endl;
-	G4cout << " Original                          " << hadron->Get4Momentum() << endl;
+	G4cout << " generated string flavors          " << start->GetPDGcode() << " / " << end->GetPDGcode() << G4endl;
+	G4cout << " generated string momenta:   quark " << start->Get4Momentum() << "mass : " <<start->Get4Momentum().mag()<< G4endl;
+	G4cout << " generated string momenta: Diquark " << end ->Get4Momentum() << "mass : " <<end->Get4Momentum().mag()<< G4endl;
+	G4cout << " sum of ends                       " << Pstart+Pend << G4endl;
+	G4cout << " Original                          " << hadron->Get4Momentum() << G4endl;
 #endif
 	
 	return string;	
@@ -253,7 +253,7 @@ G4double G4DiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) const
 	
 	if ( Xmin <= 0. || range <=0. ) 
 	{
-		G4cout << " Xmin, range : " << Xmin << " , " << range << endl;
+		G4cout << " Xmin, range : " << Xmin << " , " << range << G4endl;
 		G4Exception("G4DiffractiveExcitation::ChooseX : Invalid arguments ");
 	}
 
@@ -262,7 +262,7 @@ G4double G4DiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) const
 	    x=Xmin + G4UniformRand() * range;
 	}  while ( Xmin/x < G4UniformRand() );
 
-//debug-hpw	cout << "DiffractiveX "<<x<<endl;
+//debug-hpw	G4cout << "DiffractiveX "<<x<<G4endl;
 	return x;
 }
 
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc b/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
index 07527c31c8..24db3d622f 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EventGenerator.cc,v 1.1.10.1 1999/12/07 20:51:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4EventGenerator
 #include "G4EventGenerator.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc b/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
index 92e20d0479..cd2538de08 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4InteractionContent.cc,v 1.1.10.1 1999/12/07 20:51:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc b/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
index e2ce302e86..aa3e2f0321 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PomeronCrossSection.cc,v 1.2.8.1 1999/12/07 20:51:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4PomeronCrossSection.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc b/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
index 457c50af8c..341199757e 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
@@ -5,7 +5,7 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SingleDiffractiveExcitation.cc,v 1.3.4.1 1999/12/07 20:51:54 gunter Exp $
+// $Id: G4SingleDiffractiveExcitation.cc,v 1.3.4.1.2.1 1999/12/08 17:34:43 gunter Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
 //
@@ -47,17 +47,17 @@ G4bool G4SingleDiffractiveExcitation::
   	   G4LorentzVector Ptarget=target->Get4Momentum();
    	   G4double Mtarget2=sqr(target->GetDefinition()->GetPDGMass() + minExtraMass);
 //	     G4cout << "E proj, target :" << Pprojectile.e() << ", " <<
-//					    Ptarget.e() << endl;
+//					    Ptarget.e() << G4endl;
 
 	   G4bool KeepProjectile= G4UniformRand() > 0.5;
 
 //     reset the min.mass of the non diffractive particle to its value, ( minus a bit for rounding...)	   
 	   if ( KeepProjectile ) 
 	   {
-//	   	cout << " Projectile fix" << endl;
+//	   	cout << " Projectile fix" << G4endl;
 	   	Mprojectile2 = sqr(projectile->GetDefinition()->GetPDGMass() * (1-perCent) ); 
 	   } else {
-//	   	cout << " Target fix" << endl;
+//	   	cout << " Target fix" << G4endl;
 	   	Mtarget2=sqr(target->GetDefinition()->GetPDGMass() * (1-perCent) );
 	   }
 
@@ -73,15 +73,15 @@ G4bool G4SingleDiffractiveExcitation::
 	   if ( Ptmp.pz() <= 0. )
 	   {
 	   // "String" moving backwards in  CMS, abort collision !!
-//	   	   G4cout << " abort Collision!! " << endl;
+//	   	   G4cout << " abort Collision!! " << G4endl;
 		   return false; 
 	   }
 	   		   
 	   toCms.rotateZ(-1*Ptmp.phi());
 	   toCms.rotateY(-1*Ptmp.theta());
 
-//	   G4cout << "Pprojectile  be4 boost " << Pprojectile << endl;
-//	   G4cout << "Ptarget be4 boost : " << Ptarget << endl;
+//	   G4cout << "Pprojectile  be4 boost " << Pprojectile << G4endl;
+//	   G4cout << "Ptarget be4 boost : " << Ptarget << G4endl;
 	
 
 
@@ -99,11 +99,11 @@ G4bool G4SingleDiffractiveExcitation::
 	       if (whilecount++ >= 500 && (whilecount%100)==0) 
 //	   	 G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants possibly looping"
 //	   	 << ", loop count/ maxPtSquare : " 
-//           	 << whilecount << " / " << maxPtSquare << endl;
+//           	 << whilecount << " / " << maxPtSquare << G4endl;
                if (whilecount > 1000 ) 
                {
            	   Qmomentum=0;
-//	   	 G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants: Aborting loop!" << endl;
+//	   	 G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
 	   	 return false; 	  //  Ignore this interaction 
                }
 	       Qmomentum=G4LorentzVector(GaussianPt(widthOfPtSquare,maxPtSquare),0);
@@ -134,11 +134,11 @@ G4bool G4SingleDiffractiveExcitation::
 	       Qmomentum.setPz( (Qplus-Qminus)/2 );
 	       Qmomentum.setE(  (Qplus+Qminus)/2 );
 
-//	 G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<endl;
-//	 G4cout << "pt2 " << pt2 << endl;
-//	 G4cout << "Qmomentum " << Qmomentum << endl;
+//	 G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<G4endl;
+//	 G4cout << "pt2 " << pt2 << G4endl;
+//	 G4cout << "Qmomentum " << Qmomentum << G4endl;
 //	 G4cout << " Masses (P/T) : " << (Pprojectile+Qmomentum).mag() <<
-//			   " / " << (Ptarget-Qmomentum).mag() << endl;
+//			   " / " << (Ptarget-Qmomentum).mag() << G4endl;
 
 	   } while (  (Ptarget-Qmomentum).mag2() <= Mtarget2 
 	   	     || (Pprojectile+Qmomentum).mag2() <= Mprojectile2
@@ -152,24 +152,24 @@ G4bool G4SingleDiffractiveExcitation::
 
 	   Ptarget     -= Qmomentum;
 	   
-//	   G4cout << "Pprojectile.e()  : " << Pprojectile.e() << endl;
-//	   G4cout << "Ptarget.e()      : " << Ptarget.e() << endl;
+//	   G4cout << "Pprojectile.e()  : " << Pprojectile.e() << G4endl;
+//	   G4cout << "Ptarget.e()      : " << Ptarget.e() << G4endl;
 
-// 	   G4cout << "end event_______________________________________________"<<endl;
+// 	   G4cout << "end event_______________________________________________"<<G4endl;
 // 	   
 
 
-// 	   G4cout << "Pprojectile with Q : " << Pprojectile << endl;
-// 	   G4cout << "Ptarget with Q : " << Ptarget << endl;
-// 	   G4cout << "Projectile back: " << toLab * Pprojectile << endl;
-// 	   G4cout << "Target back: " << toLab * Ptarget << endl;
+// 	   G4cout << "Pprojectile with Q : " << Pprojectile << G4endl;
+// 	   G4cout << "Ptarget with Q : " << Ptarget << G4endl;
+// 	   G4cout << "Projectile back: " << toLab * Pprojectile << G4endl;
+// 	   G4cout << "Target back: " << toLab * Ptarget << G4endl;
 
 // Transform back and update SplitableHadron Participant.
 	   Pprojectile.transform(toLab);
 	   Ptarget.transform(toLab);
 
-//	   G4cout << "Target	 mass  " <<  Ptarget.mag() << endl;
-//	   G4cout << "Projectile mass  " <<  Pprojectile.mag() << endl;
+//	   G4cout << "Target	 mass  " <<  Ptarget.mag() << G4endl;
+//	   G4cout << "Projectile mass  " <<  Pprojectile.mag() << G4endl;
 	   		   
 	   target->Set4Momentum(Ptarget);
 	   projectile->Set4Momentum(Pprojectile);
@@ -193,7 +193,7 @@ G4double G4SingleDiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) co
 	
 	if ( Xmin <= 0. || range <=0. ) 
 	{
-		G4cout << " Xmin, range : " << Xmin << " , " << range << endl;
+		G4cout << " Xmin, range : " << Xmin << " , " << range << G4endl;
 		G4Exception("G4SingleDiffractiveExcitation::ChooseX : Invalid arguments ");
 	}
 
@@ -202,7 +202,7 @@ G4double G4SingleDiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) co
 	    x=Xmin + G4UniformRand() * range;
 	}  while ( Xmin/x < G4UniformRand() );
 
-//	cout << "DiffractiveX "<<x<<endl;
+//	cout << "DiffractiveX "<<x<<G4endl;
 	return x;
 }
 
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc b/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
index f6876cd218..0e05bc1f76 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StringModel.cc,v 1.1.10.1 1999/12/07 20:51:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4StringModel
 #include "G4StringModel.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc b/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
index ae839bc5f2..73bd292115 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VParticipants.cc,v 1.1.8.1 1999/12/07 20:51:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VParticipants.cc,v 1.1.8.1.2.1 1999/12/08 17:34:43 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -29,7 +29,7 @@ G4VParticipants::G4VParticipants() : theNucleus(NULL)
 
 G4VParticipants::~G4VParticipants()
 {
-// G4cout << "G4VParticipants::~G4VParticipants()" << endl;
+// G4cout << "G4VParticipants::~G4VParticipants()" << G4endl;
 	if ( theNucleus != NULL ) delete theNucleus;
 }
 
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc b/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
index e318808359..0c12232f3b 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VPartonStringModel.cc,v 1.4.4.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VPartonStringModel.cc,v 1.4.4.1.2.2 1999/12/09 17:37:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //// ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -86,7 +86,7 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
   	strings = GetStrings();
   }
   
-//  G4cout << "Number of strings " << strings->entries() << endl << endl;
+//  G4cout << "Number of strings " << strings->entries() << G4endl << G4endl;
 
   G4KineticTrackVector * theResult = new G4KineticTrackVector;
 
@@ -101,13 +101,13 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
 	KTsum+= strings->at(astring)->Get4Momentum();
         G4KineticTrackVector * generatedKineticTracks = NULL;
 
-// 	G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl; 	
-// 	G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << endl;
-//  	G4cout << " strings["<<astring<<"] Position " << strings->at(astring)->GetPosition() << endl;
-// 	G4cout << "Parton Left  " << strings->at(astring)->GetLeftParton()->Get4Momentum() << endl;
-// 	G4cout << " code " << strings->at(astring)->GetLeftParton()->GetPDGcode()<< endl;
-// 	G4cout << "Parton Right  " << strings->at(astring)->GetRightParton()->Get4Momentum() << endl;
-// 	G4cout << " code " << strings->at(astring)->GetRightParton()->GetPDGcode()<< endl;
+// 	G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl; 	
+// 	G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << G4endl;
+//  	G4cout << " strings["<<astring<<"] Position " << strings->at(astring)->GetPosition() << G4endl;
+// 	G4cout << "Parton Left  " << strings->at(astring)->GetLeftParton()->Get4Momentum() << G4endl;
+// 	G4cout << " code " << strings->at(astring)->GetLeftParton()->GetPDGcode()<< G4endl;
+// 	G4cout << "Parton Right  " << strings->at(astring)->GetRightParton()->Get4Momentum() << G4endl;
+// 	G4cout << " code " << strings->at(astring)->GetRightParton()->GetPDGcode()<< G4endl;
   
 	if ( strings->at(astring)->IsExcited() )
 	{
@@ -117,21 +117,21 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
 	     generatedKineticTracks->insert(strings->at(astring)->GetKineticTrack());
 	}    
 
-//	G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << endl;
+//	G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << G4endl;
 
 	if (generatedKineticTracks == NULL) 
 	{
-		G4cout << "G4VPartonStringModel:No KineticTracks produced" << endl;
+		G4cout << "G4VPartonStringModel:No KineticTracks produced" << G4endl;
 		continue;
 	}
 	
 // 	if ( generatedKineticTracks->entries() == 1 ) 
 // 	{
 // 		G4cout << " Only one track created, mass " 
-// 		       << generatedKineticTracks->at(0)->Get4Momentum().mag() << endl;
+// 		       << generatedKineticTracks->at(0)->Get4Momentum().mag() << G4endl;
 // 		       
-// 		G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl;
-// 		G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << endl;
+// 		G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl;
+// 		G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << G4endl;
 // 		
 // 	}
 	G4LorentzVector KTsum1;
@@ -143,34 +143,34 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
 // 		G4cout << " Momentum/ Mass " <<
 // 		(*generatedKineticTracks)[aTrack]->Get4Momentum() << 
 // 		" / " << (*generatedKineticTracks)[aTrack]->Get4Momentum().mag()
-// 		<< endl;
+// 		<< G4endl;
 // 		G4cout << " Position " <<
 // 		(*generatedKineticTracks)[aTrack]->GetPosition() 
-// 		<< endl;
+// 		<< G4endl;
 
 	}
 	
-//	G4cout << " KTsum Momentum " << KTsum << endl;
-//	G4cout << " KTsum  Mass     " << KTsum.mag() << endl;
+//	G4cout << " KTsum Momentum " << KTsum << G4endl;
+//	G4cout << " KTsum  Mass     " << KTsum.mag() << G4endl;
 	
 	if  ( abs((KTsum1.e()-strings->at(astring)->Get4Momentum().e()) / KTsum1.e()) > perMillion ) 
 	{
 	   NeedEnergyCorrector=true;
 	   
-// 	   G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl;  
-//  	   G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << endl;
-//  	   G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << endl;
+// 	   G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl;  
+//  	   G4cout << " strings["<<astring<<"] Mass     " << strings->at(astring)->Get4Momentum().mag() << G4endl;
+//  	   G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << G4endl;
 // 	   for ( G4int bTrack=0; bTrack<generatedKineticTracks->entries();bTrack++)
 // 	   {
 // 	   	G4cout << " Particle : " << 
 // 	   	   (*generatedKineticTracks)[bTrack]->GetDefinition()->GetParticleName()
-// 	   	   << endl;
+// 	   	   << G4endl;
 // 		G4cout << " Momentum " <<
 // 		   (*generatedKineticTracks)[bTrack]->Get4Momentum()
-// 		   << endl;
+// 		   << G4endl;
 // 		G4cout << "  Mass " <<
 // 		   (*generatedKineticTracks)[bTrack]->Get4Momentum().mag()
-// 		   << endl;
+// 		   << G4endl;
 // 	   }
 // 		 
  	}
@@ -236,8 +236,8 @@ G4bool G4VPartonStringModel::EnergyAndMomentumCorrector(G4KineticTrackVector* Ou
         if (Scale - 1 <= ErrLimit) goto LTRUE;
         }
     
-    cout << "G4VPartonStringModel::EnergyAndMomentumCorrector"<<endl;
-    cout << "   Increase number of attempts or increase ERRLIMIT"<<endl;
+    G4cout << "G4VPartonStringModel::EnergyAndMomentumCorrector"<<G4endl;
+    G4cout << "   Increase number of attempts or increase ERRLIMIT"<<G4endl;
  
  LTRUE:   
     // Compute c.m.s. interaction velocity and KTV back boost   
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc b/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
index bcfb7232f8..ae979649d2 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSplitableHadron.cc,v 1.1.8.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc b/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
index b630088b20..93d3792b13 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VStringFragmentation.cc,v 1.1.8.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VStringFragmentation
 #include "G4VStringFragmentation.hh"
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
index 1b591f9605..1a018d1081 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedStringDecay.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4ExcitedStringDecay_h
 #define G4ExcitedStringDecay_h 1
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
index f55de38bea..21ad644c16 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LundStringFragmentation.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $ Maxim Komogorov
+// GEANT4 tag $Name: geant4-01-01 $ Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
index d11fc257fe..795cc1e3ca 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4QGSMFragmentation.hh,v 1.2.8.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
index 105b152276..ca91868cc8 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VKinkyStringDecay.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //  Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
index b5ea605fde..7772a5085a 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VLongitudinalStringDecay.hh,v 1.3.8.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VLongitudinalStringDecay.hh,v 1.3.8.1.2.2 1999/12/09 16:59:03 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ public:
 	void update();
 
 private:
-	SimpleString(){cout << " error calling bad ctor for class SimpleString"<< endl;};
+	SimpleString(){G4cout << " error calling bad ctor for class SimpleString"<< G4endl;}
 	
 	SideOfString * left, * right;
 	SideOfString * decay, * stable;
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
index 8078fbf94b..464c0c0911 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedStringDecay.cc,v 1.1.10.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4ExcitedStringDecay
 
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
index 53bd5f2045..bcaaec21f1 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LundStringFragmentation.cc,v 1.1.10.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
index d4684ea0bd..d56e7b9156 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4QGSMFragmentation.cc,v 1.3.8.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
index a712942803..88e800be88 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VKinkyStringDecay.cc,v 1.2.8.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //  Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
index 8e23aff672..9a8c66e939 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VLongitudinalStringDecay.cc,v 1.4.6.1 1999/12/07 20:51:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VLongitudinalStringDecay.cc,v 1.4.6.1.2.2 1999/12/10 15:42:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //  Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
@@ -210,10 +210,10 @@ G4ParticleDefinition* G4VLongitudinalStringDecay::CreateHadron(G4int id1, G4int
       G4int kflb = abs(ifl2);
       G4int kflc = abs(ifl3);
 
-      G4int kfld = max(kfla,kflb);
-            kfld = max(kfld,kflc);
-      G4int kflf = min(kfla,kflb);
-            kflf = min(kflf,kflc);
+      G4int kfld = G4std::max(kfla,kflb);
+            kfld = G4std::max(kfld,kflc);
+      G4int kflf = G4std::min(kfla,kflb);
+            kflf = G4std::min(kflf,kflc);
 
       G4int kfle = kfla + kflb + kflc - kfld - kflf;
       //... barion with content uuu or ddd or sss has always spin = 4
@@ -286,8 +286,8 @@ G4ParticleDefinition * G4VLongitudinalStringDecay::SimpleString::Splitup(G4int &
              //... sample quarks and Construct Diquark ifln 
              G4int i1  = theStringDecay->SampleQuarkFlavor();
              G4int i2  = theStringDecay->SampleQuarkFlavor();
-             G4int i10 = max(i1,i2);
-             G4int i20 = min(i1,i2);
+             G4int i10 = G4std::max(i1,i2);
+             G4int i20 = G4std::min(i1,i2);
              G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3;
              QuarkEncoding = signdecayEncoding * (i10 * 1000 + i20 * 100 + spin);
              NewDecayEncoding = -QuarkEncoding;
@@ -313,8 +313,8 @@ G4ParticleDefinition * G4VLongitudinalStringDecay::SimpleString::Splitup(G4int &
 	     	
              QuarkEncoding = -decayQuarkEncoding/abs(decayQuarkEncoding)*theStringDecay->SampleQuarkFlavor();
              //... Build new Diquark
-             G4int i10  = max(abs(QuarkEncoding), abs(stableQuarkEncoding));
-             G4int i20  = min(abs(QuarkEncoding), abs(stableQuarkEncoding));
+             G4int i10  = G4std::max(abs(QuarkEncoding), abs(stableQuarkEncoding));
+             G4int i20  = G4std::min(abs(QuarkEncoding), abs(stableQuarkEncoding));
              G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3;
              NewDecayEncoding = -QuarkEncoding/abs(QuarkEncoding)*(i10 * 1000 + i20 * 100 + spin);
              }
@@ -368,8 +368,8 @@ G4bool G4VLongitudinalStringDecay::SimpleString::SplitLast(G4KineticTrackVector
 	     //... sample quarks and Construct Diquark ifln 
 	     G4int i1 = theStringDecay->SampleQuarkFlavor();
 	     G4int i2 = theStringDecay->SampleQuarkFlavor();
-	     G4int i10 = max(i1,i2);
-	     G4int i20 = min(i1,i2);
+	     G4int i10 = G4std::max(i1,i2);
+	     G4int i20 = G4std::min(i1,i2);
 	     G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1: 3;
 	     QuarkEncoding = signLeftEncoding*(i10 * 1000 + i20 * 100 + spin);
              }
@@ -660,7 +660,7 @@ G4ParticleDefinition* G4VLongitudinalStringDecay::FindParticle(G4int Encoding)
    if (ptr == NULL) ptr = G4ParticleTable::GetParticleTable()->FindParticle(-Encoding);
    if (ptr == NULL)
        {
-       G4cout << "Particle with encoding "<<Encoding<<" does not exist!!!"<<endl;
+       G4cout << "Particle with encoding "<<Encoding<<" does not exist!!!"<<G4endl;
        G4Exception("Check your particle table");
        }
    return ptr;    
diff --git a/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh b/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
index 0161bada64..5f741532d7 100644
--- a/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedString.hh,v 1.3.2.1.2.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4ExcitedString_h
diff --git a/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh b/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
index 0c1a612b40..10b41a8cf7 100644
--- a/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedStringVector.hh,v 1.1.8.1.2.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4ExcitedStringVector_h
 #define G4ExcitedStringPartonVector_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh b/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
index cc7983bd04..b7aa2a7f4a 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Fancy3DNucleus.hh,v 1.4.6.1.2.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4Fancy3DNucleus_h
 #define G4Fancy3DNucleus_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh b/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
index a967d3fdc0..6bf6b005bc 100644
--- a/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FermiMomentum.hh,v 1.1.10.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4FermiMomentum_h
 #define G4FermiMomentum_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4Fragment.hh b/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
index e9306521f2..cf8e223015 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Fragment.hh,v 1.5.6.1.2.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Fragment.hh,v 1.5.6.1.2.1.2.3 1999/12/14 07:08:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -15,7 +15,7 @@
 #define G4Fragment_h 1
 
 #include "G4ios.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "g4rw/tpordvec.h"
 
 #include "globals.hh"
@@ -70,8 +70,8 @@ public:
   G4bool operator==(const G4Fragment &right) const;
   G4bool operator!=(const G4Fragment &right) const;
 
-  friend ostream& operator<<(ostream&, const G4Fragment*);
-  friend ostream& operator<<(ostream&, const G4Fragment&);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4Fragment*);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4Fragment&);
 
 
   inline G4double GetA(void) const;
@@ -180,7 +180,7 @@ inline G4double G4Fragment::GetExcitationEnergy()  const
 inline void G4Fragment::SetExcitationEnergy(const G4double value)
 {
   //   theExcitationEnergy = value;
-  G4cout << "Warning: G4Fragment::SetExcitationEnergy() is a dummy method. Please, avoid to use it." << endl;
+  G4cout << "Warning: G4Fragment::SetExcitationEnergy() is a dummy method. Please, avoid to use it." << G4endl;
 }
 
 inline const G4LorentzVector G4Fragment::GetMomentum()  const
diff --git a/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh b/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
index 9a73ad566f..8be003d490 100644
--- a/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FragmentVector.hh,v 1.1.10.1 1999/12/07 20:51:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh b/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
index a3ed72cc93..fb55dd6607 100644
--- a/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeneralPhaseSpaceDecay.hh,v 1.2.4.1 1999/12/07 20:51:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //$Id: G4GeneralPhaseSpaceDecay.hh,v 1.1 1997/05/21
 // ----------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh b/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
index 11f4e3a656..64b93bb186 100644
--- a/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KineticTrack.hh,v 1.1.10.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: G4KineticTrack.hh,v 1.0 1998/05/20
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh b/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
index fe4f5b83b6..3fc4f29aa7 100644
--- a/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KineticTrackVector.hh,v 1.1.8.1.2.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // Modified at 8-Oct-1998 by Maxim Komogorov. Methods BoostBeam,Boost,Shift
 // were added.
diff --git a/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh b/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
index b12861251f..0dae3a1b2e 100644
--- a/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NuclearFermiDensity.hh,v 1.1.10.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NuclearFermiDensity_h
 #define G4NuclearFermiDensity_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh b/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
index 30895f148d..af8c6ff100 100644
--- a/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NuclearShellModelDensity.hh,v 1.1.10.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NuclearShellModelDensity_h
 #define G4NuclearShellModelDensity_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh b/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
index c9e887bc3b..706bd2c64a 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Nucleon.hh,v 1.2.8.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Nucleon.hh,v 1.2.8.1.2.1 1999/12/08 17:34:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4Nucleon_h
 #define G4Nucleon_h 1
@@ -85,7 +85,7 @@ class G4Nucleon : public G4VKineticNucleon
 
 };
 
-ostream & operator << (ostream &, const G4Nucleon&);
+G4std::ostream & operator << (G4std::ostream &, const G4Nucleon&);
 
 inline int G4Nucleon::operator==(const G4Nucleon &right) const
 {
diff --git a/source/processes/hadronic/models/generator/util/include/G4Parton.hh b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
index fe83a49fd7..9895803464 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Parton.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Parton.hh,v 1.6.8.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Parton.hh,v 1.6.8.1.2.2 1999/12/14 07:08:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4Parton_h
@@ -25,7 +25,7 @@
 #include "globals.hh"
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
-#include <iostream.h>
+#include "g4std/iostream"
 #include "G4ParticleTable.hh"
 
 class G4Parton
diff --git a/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh b/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
index c48b2503d9..10b6171c3d 100644
--- a/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PartonVector.hh,v 1.1.8.1.2.1 1999/12/07 20:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4PartonVector_h
 #define G4PartonVector_h 1
diff --git a/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc b/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
index 3ba5f84f72..c9299b1c1e 100644
--- a/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedString.cc,v 1.2.4.1 1999/12/07 20:52:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
index a5ff5969f8..f9a3feeec8 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Fancy3DNucleus.cc,v 1.4.6.1.2.1 1999/12/07 20:52:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Fancy3DNucleus.cc,v 1.4.6.1.2.1.2.1 1999/12/08 17:34:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -34,7 +34,7 @@ G4Fancy3DNucleus::G4Fancy3DNucleus()
 	currentNucleon=-1;
 	myA=0;
 	myZ=0;
-//G4cout <<"G4Fancy3DNucleus::G4Fancy3DNucleus()"<<endl;
+//G4cout <<"G4Fancy3DNucleus::G4Fancy3DNucleus()"<<G4endl;
 }
 
 /* No use for these
@@ -66,7 +66,7 @@ G4Fancy3DNucleus::~G4Fancy3DNucleus()
 void G4Fancy3DNucleus::Init(G4double theA, G4double theZ)
 {
   G4int i;
-//  G4cout << "G4Fancy3DNucleus::Init(theA, theZ) called"<<endl;
+//  G4cout << "G4Fancy3DNucleus::Init(theA, theZ) called"<<G4endl;
   currentNucleon=-1;
   if(theNucleons!=NULL) delete [] theNucleons;
 
@@ -77,7 +77,7 @@ void G4Fancy3DNucleus::Init(G4double theA, G4double theZ)
 
   theNucleons = new G4Nucleon[myA];
   
-//  G4cout << "myA, myZ" << myA << ", " << myZ << endl;
+//  G4cout << "myA, myZ" << myA << ", " << myZ << G4endl;
 
   if(theDensity!=NULL) delete theDensity;
   if ( myA < 17 ) {
@@ -242,7 +242,7 @@ void G4Fancy3DNucleus::ChooseNucleons()
 	  {
 	       theNucleons[nucleons++].SetParticleType(G4Neutron::Neutron());
 	  }
-	  else G4cout << "G4Fancy3DNucleus::ChooseNucleons not efficient" << endl;
+	  else G4cout << "G4Fancy3DNucleus::ChooseNucleons not efficient" << G4endl;
 	}
 	return;
 }
@@ -294,13 +294,13 @@ void G4Fancy3DNucleus::ChooseFermiMomenta()
 	
 	if (ReduceSum(momentum,fermiM) ) 
 	  break;
-//       G4cout <<" G4FancyNucleus: iterating to find momenta: "<< ntry<< endl;
+//       G4cout <<" G4FancyNucleus: iterating to find momenta: "<< ntry<< G4endl;
     }
 
 //     G4ThreeVector sum;
 //     for (G4int index=0; index<myA;sum+=momentum[index++])
 //     ;
-//     cout << "final sum / mag() " << sum << " / " << sum.mag() << endl;
+//     cout << "final sum / mag() " << sum << " / " << sum.mag() << G4endl;
     
     
     G4double energy;
@@ -344,10 +344,10 @@ void G4Fancy3DNucleus::ChooseFermiMomenta()
     private:
     	G4Fancy3DNucleusHelper operator =(const G4Fancy3DNucleusHelper &right) const 
     	{
-    		G4cout <<" G4Fancy3DNucleus::G4Fancy3DNucleusHelper op = called------------------" << endl;
+    		G4cout <<" G4Fancy3DNucleus::G4Fancy3DNucleusHelper op = called------------------" << G4endl;
 		return G4Fancy3DNucleusHelper();
     	}
-    	G4Fancy3DNucleusHelper(): Vector(0), Size(0), anInt(0) {G4cout << "def ctor for MixMasch" << endl;}
+    	G4Fancy3DNucleusHelper(): Vector(0), Size(0), anInt(0) {G4cout << "def ctor for MixMasch" << G4endl;}
 	const G4ThreeVector Vector;
 	const G4double Size;
 	const G4int anInt;
@@ -423,11 +423,11 @@ G4bool G4Fancy3DNucleus::ReduceSum(G4ThreeVector * momentum, G4double *pFermiM)
 	
 	// Now we have a nucleon with a bigger Fermi Momentum.
 	// Exchange with last nucleon.. and iterate.
-// 	G4cout << " Nucleon to swap with : " << swapit << endl;
+// 	G4cout << " Nucleon to swap with : " << swapit << G4endl;
 // 	G4cout << " Fermi momentum test, and better.. " << PFermi << " / "
-// 	    << theFermi.GetFermiMomentum(theDensity->GetDensity(theNucleons[swapit].GetPosition())) << endl;
-//	cout << theNucleons[swapit]<< endl << theNucleons[myA-1] << endl;
-//	cout << momentum[swapit] << endl << momentum[myA-1] << endl;
+// 	    << theFermi.GetFermiMomentum(theDensity->GetDensity(theNucleons[swapit].GetPosition())) << G4endl;
+//	cout << theNucleons[swapit]<< G4endl << theNucleons[myA-1] << G4endl;
+//	cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
 	G4Nucleon swap= theNucleons[swapit];
 	G4ThreeVector mom_swap=momentum[swapit];
 	G4double pf=pFermiM[swapit];
@@ -437,7 +437,7 @@ G4bool G4Fancy3DNucleus::ReduceSum(G4ThreeVector * momentum, G4double *pFermiM)
 	theNucleons[myA-1]=swap;
 	momentum[myA-1]=mom_swap;
 	pFermiM[myA-1]=pf;
-//	cout << "after swap" <<endl<< theNucleons[swapit] << endl << theNucleons[myA-1] << endl;
-//	cout << momentum[swapit] << endl << momentum[myA-1] << endl;
+//	cout << "after swap" <<G4endl<< theNucleons[swapit] << G4endl << theNucleons[myA-1] << G4endl;
+//	cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
 	return ReduceSum(momentum,pFermiM);	
 }
diff --git a/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc b/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
index 117f332c25..a5268986bb 100644
--- a/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FermiMomentum.cc,v 1.1.10.1 1999/12/07 20:52:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4FermiMomentum.hh"
 
diff --git a/source/processes/hadronic/models/generator/util/src/G4Fragment.cc b/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
index b36f4b3ead..efecef2573 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Fragment.cc,v 1.4.8.1 1999/12/07 20:52:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Fragment.cc,v 1.4.8.1.2.3 1999/12/09 17:45:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -67,8 +67,8 @@ G4Fragment::G4Fragment(const G4int A, const G4int Z, const G4LorentzVector aMome
       theExcitationEnergy = 0.0;
     else 
     {
-      cout << "A, Z, momentum, theExcitationEnergy"<<
-           A<<" "<<Z<<" "<<aMomentum<<" "<<theExcitationEnergy<<endl;
+      G4cout << "A, Z, momentum, theExcitationEnergy"<<
+           A<<" "<<Z<<" "<<aMomentum<<" "<<theExcitationEnergy<<G4endl;
       G4Exception( "G4Fragment::G4Fragment Excitation Energy < 0.0!" );
     }
 }
@@ -155,17 +155,17 @@ G4bool G4Fragment::operator!=(const G4Fragment &right) const
 }
 
 
-ostream& operator << (ostream &out, const G4Fragment *theFragment)
+G4std::ostream& operator << (G4std::ostream &out, const G4Fragment *theFragment)
 {
-  long old_floatfield = out.setf(0,ios::floatfield);
+  long old_floatfield = out.setf(0,G4std::ios::floatfield);
 
   out 
-    << "Fragment: A = " << setprecision(3) << theFragment->theA 
-    << ", Z = " << setprecision(3) << theFragment->theZ ;
-  out.setf(ios::scientific,ios::floatfield);
+    << "Fragment: A = " << G4std::setprecision(3) << theFragment->theA 
+    << ", Z = " << G4std::setprecision(3) << theFragment->theZ ;
+  out.setf(G4std::ios::scientific,G4std::ios::floatfield);
   out
     << ", U = " << theFragment->theExcitationEnergy/MeV 
-    << " MeV" << endl
+    << " MeV" << G4endl
     << "          P = (" 
     << theFragment->theMomentum.x()/MeV << ","
     << theFragment->theMomentum.y()/MeV << ","
@@ -176,19 +176,19 @@ ostream& operator << (ostream &out, const G4Fragment *theFragment)
   // What about Angular momentum???
 
   if (theFragment->numberOfExcitons != 0) {
-    out << endl;
+    out << G4endl;
     out << "          " 
 	<< "#Excitons = " << theFragment->numberOfExcitons 
 	<< ", #Holes = "   << theFragment->numberOfHoles
 	<< ", #Charged = " << theFragment->numberOfCharged;
   }
-  out.setf(old_floatfield,ios::floatfield);
+  out.setf(old_floatfield,G4std::ios::floatfield);
 
   return out;
     
 }
 
-ostream& operator << (ostream &out, const G4Fragment &theFragment)
+G4std::ostream& operator << (G4std::ostream &out, const G4Fragment &theFragment)
 {
   out << &theFragment;
   return out; 
diff --git a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
index 4da144b7ff..61b841e810 100644
--- a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GeneralPhaseSpaceDecay.cc,v 1.1.10.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GeneralPhaseSpaceDecay.cc,v 1.1.10.1.2.1 1999/12/08 17:34:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: G4GeneralSpaceDecay.cc,v 1.0 1998/05/21
 // ----------------------------------------------------------------
@@ -33,7 +33,7 @@
 G4GeneralPhaseSpaceDecay::G4GeneralPhaseSpaceDecay(G4int Verbose) : 
                           G4VDecayChannel("Phase Space", Verbose)
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << G4endl;
 }
 
 G4GeneralPhaseSpaceDecay::G4GeneralPhaseSpaceDecay(const G4String& theParentName,
@@ -49,7 +49,7 @@ G4GeneralPhaseSpaceDecay::G4GeneralPhaseSpaceDecay(const G4String& theParentName
 					           theDaughterName2,
 					           theDaughterName3)
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << G4endl;
   
   //   Set the parent particle (resonance) mass to the (default) PDG vale
   if (parent != NULL)
@@ -73,7 +73,7 @@ G4GeneralPhaseSpaceDecay::G4GeneralPhaseSpaceDecay(const G4String& theParentName
 					           theDaughterName2,
 					           theDaughterName3)
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay:: constructor " << G4endl;
 }
 
 G4GeneralPhaseSpaceDecay::~G4GeneralPhaseSpaceDecay()
@@ -92,7 +92,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::DecayIt(G4double)
   case 0:
     if (GetVerboseLevel()>0) {
       G4cout << "G4GeneralPhaseSpaceDecay::DecayIt ";
-      G4cout << " daughters not defined " <<endl;
+      G4cout << " daughters not defined " <<G4endl;
     }
     break;
   case 1:
@@ -110,7 +110,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::DecayIt(G4double)
   }
   if ((products == NULL) && (GetVerboseLevel()>0)) {
     G4cout << "G4GeneralPhaseSpaceDecay::DecayIt ";
-    G4cout << *parent_name << " can not decay " << endl;
+    G4cout << *parent_name << " can not decay " << G4endl;
     DumpInfo();
   }
   return products;
@@ -118,7 +118,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::DecayIt(G4double)
 
 G4DecayProducts *G4GeneralPhaseSpaceDecay::OneBodyDecayIt()
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::OneBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::OneBodyDecayIt()"<<G4endl;
 
   G4double daughtermass = daughters[0]->GetPDGMass();
 
@@ -137,7 +137,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::OneBodyDecayIt()
   if (GetVerboseLevel()>1) 
     {
      G4cout << "G4GeneralPhaseSpaceDecay::OneBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
     }
   return products;
@@ -145,7 +145,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::OneBodyDecayIt()
 
 G4DecayProducts *G4GeneralPhaseSpaceDecay::TwoBodyDecayIt()
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::TwoBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::TwoBodyDecayIt()"<<G4endl;
   
   //daughters'mass
   G4double daughtermass[2]; 
@@ -178,7 +178,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::TwoBodyDecayIt()
   if (GetVerboseLevel()>1) 
     {
      G4cout << "G4GeneralPhaseSpaceDecay::TwoBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
     }
   return products;
@@ -187,7 +187,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::TwoBodyDecayIt()
 G4DecayProducts *G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt()
 // algorism of this code is originally written in GDECA3 of GEANT3
 {
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt()"<<G4endl;
 
   //daughters'mass
   G4double daughtermass[3]; 
@@ -247,10 +247,10 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt()
 
   // output message
   if (GetVerboseLevel()>1) {
-    G4cout << "     daughter 0:" << daughtermomentum[0]/GeV << "[GeV/c]" <<endl;
-    G4cout << "     daughter 1:" << daughtermomentum[1]/GeV << "[GeV/c]" <<endl;
-    G4cout << "     daughter 2:" << daughtermomentum[2]/GeV << "[GeV/c]" <<endl;
-    G4cout << "   momentum sum:" << momentumsum/GeV << "[GeV/c]" <<endl;
+    G4cout << "     daughter 0:" << daughtermomentum[0]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "     daughter 1:" << daughtermomentum[1]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "     daughter 2:" << daughtermomentum[2]/GeV << "[GeV/c]" <<G4endl;
+    G4cout << "   momentum sum:" << momentumsum/GeV << "[GeV/c]" <<G4endl;
   }
 
   //create daughter G4DynamicParticle 
@@ -287,7 +287,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt()
 
   if (GetVerboseLevel()>1) {
      G4cout << "G4GeneralPhaseSpaceDecay::ThreeBodyDecayIt ";
-     G4cout << "  create decay products in rest frame " <<endl;
+     G4cout << "  create decay products in rest frame " <<G4endl;
      products->DumpInfo();
   }
   return products;
@@ -307,7 +307,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
   //return value
   G4DecayProducts *products;
 
-  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()"<<endl;
+  if (GetVerboseLevel()>1) G4cout << "G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()"<<G4endl;
 
   //daughters'mass
   G4double *daughtermass = new G4double[numberOfDaughters]; 
@@ -353,7 +353,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
       temp -= daughtermass[index1];
       if (GetVerboseLevel()>1) {
         G4cout << index1 << "  rundom number:" << rd[index1]; 
-        G4cout << "   virtual mass:" << sm[index1]/GeV << "[GeV/c/c]" <<endl; 
+        G4cout << "   virtual mass:" << sm[index1]/GeV << "[GeV/c/c]" <<G4endl; 
       }
     }
     delete [] rd;
@@ -364,7 +364,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
     daughtermomentum[index1]= Pmx( sm[index1-1],daughtermass[index1-1],sm[index1]);
     if (GetVerboseLevel()>1) {
       G4cout << "     daughter " << index1 << ":" << *daughters_name[index1];
-      G4cout << " momentum:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<endl;
+      G4cout << " momentum:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<G4endl;
     }
     for(index1 =numberOfDaughters-2; index1>=0; index1--) {
       // calculate 
@@ -373,12 +373,12 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
         // !!! illegal momentum !!!
         if (GetVerboseLevel()>0) {
           G4cout << "G4GeneralPhaseSpaceDecay::ManyBodyDecayIt ";
-          G4cout << "     can not calculate daughter momentum " <<endl;
+          G4cout << "     can not calculate daughter momentum " <<G4endl;
           G4cout << "     parent:" << *parent_name;
-          G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<endl;
+          G4cout << " mass:" << parentmass/GeV << "[GeV/c/c]" <<G4endl;
           G4cout << "     daughter " << index1 << ":" << *daughters_name[index1];
           G4cout << " mass:" << daughtermass[index1]/GeV << "[GeV/c/c]" ;
-          G4cout << " mass:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<endl;
+          G4cout << " mass:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<G4endl;
         }
 	delete [] sm;
 	delete [] daughtermass;
@@ -390,19 +390,19 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
         weight *=  daughtermomentum[index1]/sm[index1];
         if (GetVerboseLevel()>1) {
           G4cout << "     daughter " << index1 << ":" << *daughters_name[index1];
-          G4cout << " momentum:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<endl;
+          G4cout << " momentum:" << daughtermomentum[index1]/GeV << "[GeV/c]" <<G4endl;
         }
       }
     }
     if (GetVerboseLevel()>1) {
-      G4cout << "    weight: " << weight <<endl;
+      G4cout << "    weight: " << weight <<G4endl;
     }
     
     // exit if number of Try exceeds 100
     if (numberOfTry++ >100) {
       if (GetVerboseLevel()>0) {
         G4cout << "G4GeneralPhaseSpaceDecay::ManyBodyDecayIt: ";
-	G4cout << " can not determine Decay Kinematics " << endl;
+	G4cout << " can not determine Decay Kinematics " << G4endl;
       }
       delete [] sm;
       delete [] daughtermass;
@@ -411,7 +411,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
     }
   } while ( weight > G4UniformRand());
   if (GetVerboseLevel()>1) {
-      G4cout << "Start calulation of daughters momentum vector "<<endl;
+      G4cout << "Start calulation of daughters momentum vector "<<G4endl;
   }
   
   G4double costheta, sintheta, phi;
@@ -466,7 +466,7 @@ G4DecayProducts *G4GeneralPhaseSpaceDecay::ManyBodyDecayIt()
   }
   if (GetVerboseLevel()>1) { 
     G4cout << "G4GeneralPhaseSpaceDecay::ManyBodyDecayIt ";
-    G4cout << "  create decay products in rest frame " << endl;
+    G4cout << "  create decay products in rest frame " << G4endl;
     products->DumpInfo();
   }
 
diff --git a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
index a1d57de445..db31616dcc 100644
--- a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KineticTrack.cc,v 1.3.8.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KineticTrack.cc,v 1.3.8.1.2.1 1999/12/08 17:34:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: G4KineticTrack.cc,v 1.0 1998/05/20
 // -----------------------------------------------------------------------------
@@ -54,9 +54,9 @@ G4KineticTrack::G4KineticTrack() :
 ////////////////
 
 /*
- G4cerr << endl << endl << endl;
+ G4cerr << G4endl << G4endl << G4endl;
  G4cerr << "   G4KineticTrack default constructor invoked! \n";
- G4cerr << "   =========================================== \n" << endl;
+ G4cerr << "   =========================================== \n" << G4endl;
 */
 }
 
@@ -89,9 +89,9 @@ G4KineticTrack::G4KineticTrack(const G4KineticTrack &right)
 ////////////////
 
 /*
- G4cerr << endl << endl << endl;
+ G4cerr << G4endl << G4endl << G4endl;
  G4cerr << "   G4KineticTrack copy constructor invoked! \n";
- G4cerr << "   ======================================== \n" <<endl;
+ G4cerr << "   ======================================== \n" <<G4endl;
 */
 }
 
@@ -183,7 +183,7 @@ G4KineticTrack::G4KineticTrack(G4ParticleDefinition* aDefinition,
           if ( !theDaughterIsShortLived[0] && !theDaughterIsShortLived[1] )
              {
 
-//              G4cout << endl << "Both the " << nDaughters <<
+//              G4cout << G4endl << "Both the " << nDaughters <<
 //                              " decay products are stable!";
 
               theActualMom = EvaluateCMMomentum(theActualMass, 
@@ -195,7 +195,7 @@ G4KineticTrack::G4KineticTrack(G4ParticleDefinition* aDefinition,
           else if ( !theDaughterIsShortLived[0] && theDaughterIsShortLived[1] )   
              {
 
-//              G4cout << endl << "Only the first of the " << nDaughters <<
+//              G4cout << G4endl << "Only the first of the " << nDaughters <<
 //                              " decay products is stable!";
 
               theActualMom = IntegrateCMMomentum();
@@ -205,7 +205,7 @@ G4KineticTrack::G4KineticTrack(G4ParticleDefinition* aDefinition,
           else if ( theDaughterIsShortLived[0] && !theDaughterIsShortLived[1] )   
              {
 
-//              G4cout << endl << "Only the second of the " << nDaughters <<
+//              G4cout << G4endl << "Only the second of the " << nDaughters <<
 //                              " decay products is stable!";
 
 //
@@ -222,7 +222,7 @@ G4KineticTrack::G4KineticTrack(G4ParticleDefinition* aDefinition,
           else if ( theDaughterIsShortLived[0] && theDaughterIsShortLived[1] )   
              {
 
-//              G4cout << endl << "Both the " << nDaughters <<
+//              G4cout << G4endl << "Both the " << nDaughters <<
 //                              " decay products are resonances!";
 
               /* @@@@@@ code has to be implemented */
@@ -258,14 +258,14 @@ G4KineticTrack::G4KineticTrack(G4ParticleDefinition* aDefinition,
 
 // for (G4int y = nChannels - 1; y >= 0; y--)
 //     {
-//      G4cout << endl << theActualWidth[y];
+//      G4cout << G4endl << theActualWidth[y];
 //     }
-// G4cout << endl << endl << endl;
+// G4cout << G4endl << G4endl << G4endl;
 
  /*
- G4cerr << endl << endl << endl;
+ G4cerr << G4endl << G4endl << G4endl;
  G4cerr << "   G4KineticTrack by argument constructor invoked! \n";
- G4cerr << "   =============================================== \n" << endl;
+ G4cerr << "   =============================================== \n" << G4endl;
  */
 
 }
@@ -462,8 +462,8 @@ G4double G4KineticTrack::IntegrateCMMomentum() const
                                                               theUpperLimit,
                                                               nIterations);                                    
 
-// G4cout << endl << "Inside IntegrateCMMomentum (actual mass case): ";
-// G4cout << endl << "   Integration result = " << theIntegralOverMass2;
+// G4cout << G4endl << "Inside IntegrateCMMomentum (actual mass case): ";
+// G4cout << G4endl << "   Integration result = " << theIntegralOverMass2;
 
  return theIntegralOverMass2;
 }
@@ -478,8 +478,8 @@ G4double G4KineticTrack::IntegrateCMMomentum(const G4double polemass) const
                                                               theUpperLimit,
                                                               nIterations);                                    
 
-// G4cout << endl << "Inside IntegrateCMMomentum (pole mass case): ";
-// G4cout << endl << "   Integration result = " << theIntegralOverMass2;
+// G4cout << G4endl << "Inside IntegrateCMMomentum (pole mass case): ";
+// G4cout << G4endl << "   Integration result = " << theIntegralOverMass2;
 
  return theIntegralOverMass2;
 }
diff --git a/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc b/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
index a37ddfa1b2..fac8620544 100644
--- a/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NuclearFermiDensity.cc,v 1.1.10.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4NuclearFermiDensity.hh"
diff --git a/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc b/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
index dc0822053d..f93300f812 100644
--- a/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NuclearShellModelDensity.cc,v 1.1.10.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4NuclearShellModelDensity.hh"
diff --git a/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc b/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
index 73a17d4f4e..34df09731c 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Nucleon.cc,v 1.2.8.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Nucleon.cc,v 1.2.8.1.2.3 1999/12/14 07:08:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4Nucleon.hh"
 
@@ -41,13 +41,13 @@ void G4Nucleon::Boost(const G4LorentzVector & aMomentum)
 	theMomentum.setVect(factor*aMomentum.vect() + theMomentum.vect());
 }
 
-#include <iostream.h>
-ostream & operator << (ostream &s, const G4Nucleon& nucleon)
+#include "g4std/iostream"
+G4std::ostream & operator << (G4std::ostream &s, const G4Nucleon& nucleon)
 {
 //	s<< nucleon.GetDefinition()->GetParticleName() 
 //	 << "  is " << nucleon.AreYouHit() ? " " : "not" 
-//	 << " hit. Momentum/position:" << endl;
-	s<< "  momentum : " << nucleon.Get4Momentum() << endl;
+//	 << " hit. Momentum/position:" << G4endl;
+	s<< "  momentum : " << nucleon.Get4Momentum() << G4endl;
 	s<< "  position : " << nucleon.GetPosition() ;
 	return s;
 }	  
diff --git a/source/processes/hadronic/models/generator/util/src/G4Parton.cc b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
index e1440fac87..114d1cdc73 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Parton.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Parton.cc,v 1.3.8.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Parton.cc,v 1.3.8.1.2.2 1999/12/09 17:44:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -27,7 +27,7 @@ G4Parton::G4Parton(G4int PDGcode)
 	theDefinition=G4ParticleTable::GetParticleTable()->FindParticle(PDGencoding);;
 	if (theDefinition == NULL)
 	{
-	  cout << "Encoding = "<<PDGencoding<<endl;
+	  G4cout << "Encoding = "<<PDGencoding<<G4endl;
 	  G4Exception("G4Parton::GetDefinition(): Encoding not in particle table");
 	}
 }
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
index f8d1ff3f0c..28aca2b8b7 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiKaonZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
index f21f294a03..50c6b13c86 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiLambdaInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
index b3c3d8a227..468e8dfede 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiNeutronInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
index bef50299cd..4e4dead6cd 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiOmegaMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
index 40eac15e90..cdcfb7f3db 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiProtonInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
index a98073d547..3bd4ed7fd5 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
index 6e59664977..d60e6c02a5 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaPlusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
index d8b506ef7a..349fce5c78 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
index 64ef943323..55754abf26 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiXiMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
index 0ae3864824..72b38a22ed 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiXiZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
index 9ccfbd14fa..eae5329f06 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEInelastic.hh,v 1.2.8.1 1999/12/07 20:52:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy (GHE) model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
index f6c411aa68..2e40387eaf 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
index c20da63ba5..1e00d91e09 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonPlusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
index a57a39e629..0b6f474356 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
index 4a1036791a..d4d2a50a09 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroLongInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
index d7eab6520b..627a590380 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroShortInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
index f7cab1b36c..02b608b9a5 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HELambdaInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
index ed761b66a5..4e4c42328d 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HENeutronInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
index 04a24c2d4d..988617b667 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEOmegaMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
index 3bc8cc39d9..dd3e74b1e0 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPionMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
index 2bd2f567b9..b594e830d3 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPionPlusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
index a7463323c1..6425aa98a0 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPlot.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha friend class G4HEPlot  -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
index 0462c96449..daedf01ca1 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEProtonInelastic.hh,v 1.2.8.1 1999/12/07 20:52:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
index 2f4c53a729..2bbdb83fcf 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
index 2cfbf1d0b3..edb905fb54 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaPlusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
index 5b463827da..49ff9224b7 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
index a1a3900ff9..265e723f8f 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEVector.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEVector.hh,v 1.2.8.1.2.1 1999/12/13 16:33:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha friend class G4KinematicParticle  -- header file
@@ -108,9 +108,13 @@ class G4HEVector
 
    G4String getParticleName(G4int code, G4int baryon);
  
-   void setMomentum( G4ParticleMomentum mom ); 
+   void setMomentum( const G4ParticleMomentum mom ); 
 
-   void setMomentumAndUpdate( G4ParticleMomentum mom );
+   void setMomentum( const G4ParticleMomentum * mom ); 
+
+   void setMomentumAndUpdate( const G4ParticleMomentum mom );
+
+   void setMomentumAndUpdate( const G4ParticleMomentum * mom );
 
    const G4ParticleMomentum getMomentum() const ;
 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
index 3c592586f0..492c64bbff 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEXiMinusInelastic.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
index 566b49479b..11ed4ee314 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEXiZeroInelastic.hh,v 1.2.8.1 1999/12/07 20:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Gheisha High Energy model class -- header file
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
index 5546046c16..3971bcb42b 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiKaonZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiKaonZeroInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiKaonZeroInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiKaonZeroInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiKaonZeroInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiKaonZeroInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                   incidentParticle, targetParticle );
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -225,7 +225,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -289,7 +289,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
    G4int iplab = G4int( incidentTotalMomentum*5.);
    if( (iplab < 10) && (G4UniformRand() < cech[iplab]) ) 
      {
-       G4int     iplab = min(19, G4int( incidentTotalMomentum*5.));
+       G4int     iplab = G4std::min(19, G4int( incidentTotalMomentum*5.));
        G4double cnk0[] = {0.17, 0.18, 0.17, 0.24, 0.26, 0.20, 0.22, 0.21, 0.34, 0.45,
                           0.58, 0.55, 0.36, 0.29, 0.29, 0.32, 0.32, 0.33, 0.33, 0.33};
        if( G4UniformRand() < cnk0[iplab] )
@@ -364,7 +364,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -379,7 +379,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-2); nm<=np; nm++ ) 
+                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -388,7 +388,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -410,7 +410,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -419,7 +419,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -596,7 +596,7 @@ G4HEAntiKaonZeroInelastic::FirstIntInCasAntiKaonZero( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
index 6cfa4160e5..1008c1a081 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiLambdaInelastic.cc,v 1.2.8.1 1999/12/07 20:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiLambdaInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiLambdaInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiLambdaInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiLambdaInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiLambdaInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                 incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -274,7 +274,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-1); 
+            nm = G4std::max(0,np-1); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -325,7 +325,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -400,7 +400,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -417,7 +417,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -432,7 +432,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -441,7 +441,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -463,7 +463,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -472,7 +472,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -596,7 +596,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -619,7 +619,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -647,7 +647,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -704,7 +704,7 @@ G4HEAntiLambdaInelastic::FirstIntInCasAntiLambda( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
index 0efa3eff19..03a61308fe 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiNeutronInelastic.cc,v 1.2.8.1 1999/12/07 20:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiNeutronInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiNeutronInelastic: incident energy < 1 GeV" << endl;;
+        G4cout << "GHEAntiNeutronInelastic: incident energy < 1 GeV" << G4endl;;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiNeutronInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiNeutronInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                  incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ void
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ void
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -274,7 +274,7 @@ void
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-1); 
+            nm = G4std::max(0,np-1); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -327,7 +327,7 @@ void
          {
            G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-           G4int iplab = min(9, G4int( incidentTotalMomentum*2.5));
+           G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5));
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {
                pv[0] = AntiProton;
@@ -349,7 +349,7 @@ void
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {
@@ -403,7 +403,7 @@ void
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -418,7 +418,7 @@ void
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=np; nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -427,7 +427,7 @@ void
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -449,7 +449,7 @@ void
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -458,7 +458,7 @@ void
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -538,7 +538,7 @@ void
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -561,7 +561,7 @@ void
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -589,7 +589,7 @@ void
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -646,7 +646,7 @@ void
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
index dde23283d8..a819f5fb87 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiOmegaMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiOmegaMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiOmegaMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiOmegaMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                     incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -222,7 +222,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -243,7 +243,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -270,7 +270,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-1); 
+            nm = G4std::max(0,np-1); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -321,7 +321,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5 ));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5 ));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -396,7 +396,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -413,7 +413,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -428,7 +428,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -437,7 +437,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -459,7 +459,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -468,7 +468,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -592,7 +592,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -615,7 +615,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -643,7 +643,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -700,7 +700,7 @@ G4HEAntiOmegaMinusInelastic::FirstIntInCasAntiOmegaMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
index 7af67e6e8e..ff08ea0f6c 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiProtonInelastic.cc,v 1.2.8.1 1999/12/07 20:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiProtonInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiProtonInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiProtonInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiProtonInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiProtonInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
 
     incidentKineticEnergy -= inelasticity;
@@ -74,7 +74,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                 incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -330,7 +330,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                               0.11, 0.082, 0.065, 0.050, 0.041, 0.035, 0.028, 0.024, 0.010, 0.000};
 
            G4int iplab = G4int( incidentTotalMomentum*10.);
-           if (iplab > 9) iplab = min(19, G4int( incidentTotalMomentum) + 9);
+           if (iplab > 9) iplab = G4std::min(19, G4int( incidentTotalMomentum) + 9);
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                                            // charge exchange  pi+ n -> pi0 p
                pv[0] = AntiNeutron;
@@ -351,7 +351,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
    G4int            iplab =      G4int( incidentTotalMomentum*10.);
    if ( iplab >  9) iplab =  9 + G4int( incidentTotalMomentum);          
    if ( iplab > 18) iplab = 18 + G4int( incidentTotalMomentum*10.);
-                    iplab = min(28, iplab);
+                    iplab = G4std::min(28, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {
@@ -408,7 +408,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -423,7 +423,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -432,7 +432,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -463,7 +463,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>=1) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -543,7 +543,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -566,7 +566,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>0) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -594,7 +594,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>=1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -651,7 +651,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
index a1884fedf0..c3b6746598 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiSigmaMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiSigmaMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiSigmaMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiSigmaMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -109,7 +109,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -119,7 +119,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                     incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -161,7 +161,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-         G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+         G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -225,7 +225,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -246,7 +246,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -273,7 +273,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-2); 
+            nm = G4std::max(0,np-2); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -324,7 +324,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5 ));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5 ));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -378,7 +378,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -395,7 +395,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -410,7 +410,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=np; nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -419,7 +419,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -441,7 +441,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -450,7 +450,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -556,7 +556,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -579,7 +579,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -607,7 +607,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -664,7 +664,7 @@ G4HEAntiSigmaMinusInelastic::FirstIntInCasAntiSigmaMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
index 9ec89a543d..58d3614439 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -44,23 +44,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiSigmaPlusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiSigmaPlusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiSigmaPlusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiSigmaPlusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -73,7 +73,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -110,7 +110,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -120,7 +120,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                    incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -162,7 +162,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -325,7 +325,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -379,7 +379,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -396,7 +396,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -411,7 +411,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -420,7 +420,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -451,7 +451,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -556,7 +556,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -579,7 +579,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -607,7 +607,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -664,7 +664,7 @@ G4HEAntiSigmaPlusInelastic::FirstIntInCasAntiSigmaPlus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
index 6e1ff6802d..559b66c533 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
index ad062ab5d5..2cffd88042 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiXiMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiXiMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiXiMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiXiMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiXiMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiXiMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                  incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -225,7 +225,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -246,7 +246,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -273,7 +273,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-1); 
+            nm = G4std::max(0,np-1); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -324,7 +324,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -399,7 +399,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -416,7 +416,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -431,7 +431,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -440,7 +440,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -462,7 +462,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -471,7 +471,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -595,7 +595,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -618,7 +618,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -646,7 +646,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -703,7 +703,7 @@ G4HEAntiXiMinusInelastic::FirstIntInCasAntiXiMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
index 2e5f264ac7..7d3f9822d9 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEAntiXiZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEAntiXiZeroInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEAntiXiZeroInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEAntiXiZeroInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEAntiXiZeroInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEAntiXiZeroInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                 incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -166,7 +166,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -274,7 +274,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
        counter = -1;
        for( np=1; np<(numSec/3); np++ ) 
           {
-            nm = max(0,np-1); 
+            nm = G4std::max(0,np-1); 
             for( nz=0; nz<numSec/3; nz++ ) 
                {
                  if( ++counter < numMulAn ) 
@@ -325,7 +325,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
      {                                        // some two-body reactions 
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
 
-       G4int iplab = min(9, G4int( incidentTotalMomentum*2.5 ));
+       G4int iplab = G4std::min(9, G4int( incidentTotalMomentum*2.5 ));
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {           
            G4double ran = G4UniformRand();
@@ -400,7 +400,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
    if ( iplab >  9) iplab = 10 + G4int( (incidentTotalMomentum  -1.)*5. );          
    if ( iplab > 14) iplab = 15 + G4int(  incidentTotalMomentum  -2.     );
    if ( iplab > 22) iplab = 23 + G4int( (incidentTotalMomentum -10.)/10.); 
-                    iplab = min(24, iplab);
+                    iplab = G4std::min(24, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {                                           // non- annihilation channels
@@ -417,7 +417,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -432,7 +432,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+                    for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -441,7 +441,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -463,7 +463,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+                    for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -472,7 +472,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -596,7 +596,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -619,7 +619,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -647,7 +647,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>1) && (nt<=numSec) ) 
                               {
-                                test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -704,7 +704,7 @@ G4HEAntiXiZeroInelastic::FirstIntInCasAntiXiZero( G4bool &inElastic,
             { 
               G4cout << pv[i].getCode() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
index 663e23779d..a6df577ab1 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEInelastic.cc,v 1.3.8.1 1999/12/07 20:52:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEInelastic.cc,v 1.3.8.1.2.2 1999/12/10 15:42:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -110,20 +110,20 @@ G4HEInelastic::NuclearInelasticity(G4double incidentKineticEnergy,
     G4double ale    = log(incidentKineticEnergy);
     G4double sig1   = 0.5;
     G4double sig2   = 0.5;
-    G4double em     = min(0.239 + 0.0408*ala*ala, 1.);
-    G4double cinem  = min(0.0019*pow(ala,3.), 0.15);
+    G4double em     = G4std::min(0.239 + 0.0408*ala*ala, 1.);
+    G4double cinem  = G4std::min(0.0019*pow(ala,3.), 0.15);
     G4double sig    = (ale > em) ? sig2 : sig1; 
-    G4double corr   = min(max(-pow(ale-em,2.)/(2.*sig*sig),expl), expu);
+    G4double corr   = G4std::min(G4std::max(-pow(ale-em,2.)/(2.*sig*sig),expl), expu);
     G4double dum1   = -(incidentKineticEnergy)*cinem;
     G4double dum2   = abs(dum1);
     G4double dum3   = exp(corr);
     G4double cinema = 0.;
     if (dum2 >= 1.)           cinema = dum1*dum3;
     else if (dum3 > 1.e-10) cinema = dum1*dum3;    
-    cinema = - max(-incidentKineticEnergy, cinema);
+    cinema = - G4std::max(-incidentKineticEnergy, cinema);
     if(verboseLevel > 1)
       { G4cout << " NuclearInelasticity: " << ala << " " <<  ale << " "  << em << " " << corr
-             << " " <<  dum1 << " "  << dum2 << " " <<  dum3 << " " <<  cinema << endl;
+             << " " <<  dum1 << " "  << dum2 << " " <<  dum3 << " " <<  cinema << G4endl;
       }                 
     return cinema;
   }
@@ -144,13 +144,13 @@ G4HEInelastic::NuclearExcitation(G4double  incidentKineticEnergy,
     if (atomicWeight > (neutronMass + 2.*electronMass))
        {
          G4int    magic = ((G4int)(atomicNumber+0.1) == 82) ? 1 : 0;
-         G4double ekin  = min(max(incidentKineticEnergy, 0.1), 4.);
-         G4double cfa   = max(0.35 +((0.35 - 0.05)/2.3)*log(ekin), 0.15);
+         G4double ekin  = G4std::min(G4std::max(incidentKineticEnergy, 0.1), 4.);
+         G4double cfa   = G4std::max(0.35 +((0.35 - 0.05)/2.3)*log(ekin), 0.15);
                   exnu  = 7.716*cfa*exp(-cfa);
-         G4double atno  = min(atomicWeight, 120.);
+         G4double atno  = G4std::min(atomicWeight, 120.);
                   cfa   = ((atno - 1.)/120.) * exp(-(atno-1.)/120.);
                   exnu  = exnu * cfa;
-         G4double fpdiv = max(1.-0.25*ekin*ekin, 0.5);
+         G4double fpdiv = G4std::max(1.-0.25*ekin*ekin, 0.5);
          G4double gfa   = 2.*((atomicWeight-1.)/70.) 
                             * exp(-(atomicWeight-1.)/70.);
 
@@ -162,14 +162,14 @@ G4HEInelastic::NuclearExcitation(G4double  incidentKineticEnergy,
 	    { ran1 = normal();
               ran2 = normal();
             }
-         excitationEnergyGPN = max(excitationEnergyGPN*(1.+ran1*gfa),0.);
-         excitationEnergyDTA = max(excitationEnergyDTA*(1.+ran2*gfa),0.);
+         excitationEnergyGPN = G4std::max(excitationEnergyGPN*(1.+ran1*gfa),0.);
+         excitationEnergyDTA = G4std::max(excitationEnergyDTA*(1.+ran2*gfa),0.);
          exnu = excitationEnergyGPN + excitationEnergyDTA;
          if(verboseLevel > 1)
            {
              G4cout << " NuclearExcitation: " << magic << " " <<  ekin << " " << cfa
                   << " " <<  atno << " " << fpdiv << " " <<  gfa << " " << excitationEnergyGPN
-                  << " " <<  excitationEnergyDTA << endl;
+                  << " " <<  excitationEnergyDTA << G4endl;
            } 
 
          while (exnu >= incidentKineticEnergy)
@@ -192,7 +192,7 @@ G4HEInelastic::pmltpc(G4int np, G4int nm, G4int nz, G4int n, G4double b, G4doubl
    for(i=2;i<=np;i++) npf += log((G4double)i);
    for(i=2;i<=nm;i++) nmf += log((G4double)i);
    for(i=2;i<=nz;i++) nzf += log((G4double)i);
-   G4double r = min(expxu,max(expxl,-(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf));
+   G4double r = G4std::min(expxu,G4std::max(expxl,-(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf));
    return exp(r);
  }
 
@@ -217,7 +217,7 @@ G4int G4HEInelastic::Poisson( G4double x )
    G4double ran;
    if ( x > 9.9 )
       {
-        iran = G4int( max( 0.0, x + normal() * sqrt( x ) ) );
+        iran = G4int( G4std::max( 0.0, x + normal() * sqrt( x ) ) );
       }
    else
       {
@@ -543,7 +543,7 @@ G4HEInelastic::StrangeParticlePairProduction(
              return;
            }
        }
-   if (verboseLevel > 1) G4cout << endl;
+   if (verboseLevel > 1) G4cout << G4endl;
    return;
  }
 
@@ -607,7 +607,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
 
    G4int i, j, k, l;
 
-   if (verboseLevel > 1) G4cout << " G4HEInelastic::HighEnergyCascading " << endl;
+   if (verboseLevel > 1) G4cout << " G4HEInelastic::HighEnergyCascading " << G4endl;
    successful = false; 
    if(incidentTotalMomentum < 25. + G4UniformRand()*25.) return;
  
@@ -640,7 +640,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
 
    if (annihilation)
       {                        // do some corrections of incident particle kinematic
-        G4double ekcor = max( 1., 1./incidentKineticEnergy);
+        G4double ekcor = G4std::max( 1., 1./incidentKineticEnergy);
         incidentKineticEnergy = 2*targetMass + incidentKineticEnergy*(1.+ekcor/atomicWeight);
         G4double excitation = NuclearExcitation(incidentKineticEnergy,
                                                 atomicWeight,
@@ -651,13 +651,13 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         if (incidentKineticEnergy < excitationEnergyDTA) incidentKineticEnergy = 0.;
         incidentEnergy = incidentKineticEnergy + incidentMass;
         incidentTotalMomentum =
-                 sqrt( max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
+                 sqrt( G4std::max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
       }  
     
    G4HEVector pTemp;
    for (i = 2; i<vecLen; i++)
      {
-       j = min( vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen - 2)));
+       j = G4std::min( vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen - 2)));
        pTemp = pv[j];
        pv[j] = pv[i];
        pv[i] = pTemp;
@@ -751,7 +751,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
        tb = (2. * ntb + vecLen)/2.;     
 
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after Randomization " << vecLen << endl;
+      { G4cout << " pv Vector after Randomization " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -765,8 +765,8 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    G4double s, xtarg, ran;
    s = centerOfMassEnergy*centerOfMassEnergy;
    G4double afc;
-   afc = min( 0.5, 0.312 + 0.200 * log(log(s))+ pow(s,1.5)/6000.0 ); 
-   xtarg = max(0.01, afc * (pow(atomicWeight, 0.33) - 1.0) * tb);
+   afc = G4std::min( 0.5, 0.312 + 0.200 * log(log(s))+ pow(s,1.5)/6000.0 ); 
+   xtarg = G4std::max(0.01, afc * (pow(atomicWeight, 0.33) - 1.0) * tb);
 
    G4int nstran = Poisson( 0.03*xtarg);
      
@@ -774,14 +774,14 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    G4double nucsup[] = { 1.00, 0.7, 0.5, 0.4, 0.5, 0.5 };
    G4double psup[]   = {   3.,  6., 20., 50., 100., 1000. };
    while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin])) momentumBin++;
-   momentumBin = min(5, momentumBin);
-   G4double xpnhmf = max(0.01,xtarg*nucsup[momentumBin]);
-   G4double xshhmf = max(0.01,xtarg - xpnhmf);
+   momentumBin = G4std::min(5, momentumBin);
+   G4double xpnhmf = G4std::max(0.01,xtarg*nucsup[momentumBin]);
+   G4double xshhmf = G4std::max(0.01,xtarg - xpnhmf);
    G4double rshhmf = 0.25*xshhmf;
    G4double rpnhmf = 0.81*xpnhmf;
    G4double xhmf;
    if(verboseLevel > 1)
-     { G4cout << "xtarg= " << xtarg << " xpnhmf = " << xpnhmf << endl;
+     { G4cout << "xtarg= " << xtarg << " xpnhmf = " << xpnhmf << G4endl;
      }
    G4int nshhmf, npnhmf;
    if (rshhmf > 1.1)
@@ -795,7 +795,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
      }
    nshhmf = Poisson( xshhmf );   
    if(verboseLevel > 1)
-     { G4cout << "xshhmf = " << xshhmf << " xhmf = " << xhmf << " rshhmf = " << rshhmf << endl;
+     { G4cout << "xshhmf = " << xshhmf << " xhmf = " << xhmf << " rshhmf = " << rshhmf << G4endl;
      }
 
    if (rpnhmf > 1.1)
@@ -809,7 +809,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
      }
    npnhmf = Poisson( xpnhmf );
    if(verboseLevel > 1)
-     { G4cout << "nshhmf = " << nshhmf << " npnhmf = " <<  npnhmf << " nstran = " << nstran << endl;
+     { G4cout << "nshhmf = " << nshhmf << " npnhmf = " <<  npnhmf << " nstran = " << nstran << G4endl;
      } 
    G4int ntarg = nshhmf + npnhmf + nstran;          
 
@@ -965,7 +965,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    if (verboseLevel > 1)
       { G4cout << " pv Vector after Energy checks "
              << vecLen << " " << tavai1 << " " << iavai1 << " " << tavai2
-             << " " <<  iavai2 << " " << ntarg << endl;
+             << " " <<  iavai2 << " " << ntarg << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -992,7 +992,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[2] );
 
    if (verboseLevel > 1)
-     { G4cout << " General Vectors after Definition " << endl;
+     { G4cout << " General Vectors after Definition " << G4endl;
        for (i=0; i<10; i++) pvmx[i].Print(i);
      }
                                                  //  main loop for 4-momentum generation
@@ -1066,7 +1066,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         if (pv[i].getSide() <= -2) j = 6;
         if (j == 6 && pv[i].getType() == baryonType) j = 7;
         pt    = sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j]));
-        if(pt<0.05) pt = max(0.001, 0.3*G4UniformRand());
+        if(pt<0.05) pt = G4std::max(0.001, 0.3*G4UniformRand());
         aspar = maspar[j]; 
         phi   = G4UniformRand()*M_2PI; 
         pv[i].setMomentum( pt*cos(phi), pt*sin(phi) );        // set x- and y-momentum
@@ -1104,8 +1104,8 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                       l = 1;
                       ran = G4UniformRand()*dndl[19];
                       while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-                      l = min( 19, l );
-                      xval = min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+                      l = G4std::min( 19, l );
+                      xval = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
                       if( pv[i].getSide() < 0 ) xval *= -1.;
                       pv[i].setMomentumAndUpdate( xval*et );                  // set the z-momentum
                       pvEnergy = pv[i].getEnergy();
@@ -1119,7 +1119,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                if (pp1 >= 1.e-6)
                                   {
                                     G4double pp = sqrt(ekin*(ekin+2*pvMass));
-                                    pp = max(0., pp*pp - pt*pt);
+                                    pp = G4std::max(0., pp*pp - pt*pt);
                                     pp = sqrt(pp)*pv[i].getSide()/fabs(G4double(pv[i].getSide())); // cast for aCC 
                                     pv[i].setMomentum( pp );
                                   }
@@ -1161,7 +1161,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                         } 
                       else 
                         {                                            // backward side
-                          xval = min(0.999,0.95+0.05*targ/20.0);
+                          xval = G4std::min(0.999,0.95+0.05*targ/20.0);
                           if( (ekin2+pvEnergy-pvMass) < xval*tavai2 ) 
                             {
                               pvmx[5].Add( pvmx[5], pv[i] );
@@ -1199,7 +1199,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                       if (verboseLevel > 1) 
                          {
                            G4cout << " Reset energies for index " << i << " " << ekin1 
-                                << " " << tavai1 << endl;
+                                << " " << tavai1 << G4endl;
                            pv[i].Print(i);
                          }
                       ekin1 = 0.0;
@@ -1232,7 +1232,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
           {                                                              // eliminate this particle
             if (verboseLevel > 1)
                {
-                  G4cout << " Eliminate particle index " << i << endl;
+                  G4cout << " Eliminate particle index " << i << G4endl;
                   pv[i].Print(i);
                }
             if(i != vecLen-1)
@@ -1255,7 +1255,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
           }
       }                                                                  // closes main for loop
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after lambda fragmentation " << vecLen << endl;
+      { G4cout << " pv Vector after lambda fragmentation " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -1291,7 +1291,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
             if (pv[i].getSide() == -3)
               {
                 G4double ekit = pow(G4UniformRand()*(1.-ga)/avalue + pow(ekit1,1.-ga), 1./(1.-ga) );
-                G4double cost = max(-1., min(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                G4double cost = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
                 G4double sint = sqrt(1. - cost*cost);
                 G4double phi  = M_2PI*G4UniformRand();
                 G4double pp   = sqrt(ekit*(ekit+2*pvMass));
@@ -1400,7 +1400,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
        teta = pvmx[7].Ang( pvmx[3] );
        if (verboseLevel > 1) 
          { 
-           G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0 << " " << ekin1 << " " << ekin << endl;
+           G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0 << " " << ekin1 << " " << ekin << G4endl;
          }
      }
 
@@ -1420,7 +1420,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
        teta = pvmx[6].Ang( pvmx[3] );
        if (verboseLevel > 1) 
 	 {
-            G4cout << " ekin1 != 0 " << teta << " " <<  ekin0 << " " <<  ekin1 << endl;
+            G4cout << " ekin1 != 0 " << teta << " " <<  ekin0 << " " <<  ekin1 << G4endl;
             incidentParticle.Print(0);
             targetParticle.Print(1);
             for(i=0;i<vecLen;i++) pv[i].Print(i);
@@ -1455,7 +1455,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         pvmx[6].Add( pvmx[6], pv[i] );  
       }
    teta = pvmx[6].Ang( pvmx[3] );   
-   if (verboseLevel > 1) G4cout << " After smearing " << teta << endl;
+   if (verboseLevel > 1) G4cout << " After smearing " << teta << G4endl;
 
                                //  Rotate in direction of primary particle, subtract binding energies
                                //   and make some further corrections if required
@@ -1474,7 +1474,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              if(incidentCode == pionPlusCode || incidentCode == pionMinusCode)
@@ -1515,13 +1515,13 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
       }
    if (verboseLevel > 1)
-      { G4cout << " Lab-System " <<  ek1 << " " << npions << endl;
+      { G4cout << " Lab-System " <<  ek1 << " " << npions << G4endl;
         incidentParticle.Print(0);
         targetParticle.Print(1);
         for (i=0; i<vecLen; i++) pv[i].Print(i);
@@ -1533,11 +1533,11 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
 
    if (verboseLevel > 1) 
       G4cout << " Evaporation : " <<  atomicWeight << " " << excitationEnergyGNP << " " 
-           <<  excitationEnergyDTA << endl;
+           <<  excitationEnergyDTA << G4endl;
 
    G4double sprob = 0.;
    if (incidentKineticEnergy > 5.)
-       sprob = min(1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
+       sprob = G4std::min(1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
 
    if( atomicWeight > 1.5 && G4UniformRand() > sprob ) 
      {
@@ -1555,7 +1555,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                          (excitationEnergyGNP+excitationEnergyDTA));
            if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
            if (verboseLevel > 1) 
-              G4cout << " evaporation " << targ << " " << nbl << " " << sprob << endl; 
+              G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
              {
@@ -1565,7 +1565,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                   {
                     if( G4UniformRand() < sprob ) 
                       {
-                        if(verboseLevel > 1) G4cout << " Particle skipped " << endl;
+                        if(verboseLevel > 1) G4cout << " Particle skipped " << G4endl;
                         continue;
                       }
                     if( ekin2 > excitationEnergyGNP) break;
@@ -1574,7 +1574,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen] = Proton;
                     else
@@ -1600,7 +1600,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = max( 0.1, eka );
+                    eka = G4std::max( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -1632,7 +1632,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                       //    nbl is the number of deutrons, tritons, and alphas produced
 
          if (verboseLevel > 1) 
-            G4cout << " evaporation " << targ << " " << nbl << " " << sprob << endl;        
+            G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl;        
          if( nbl > 0 ) 
            {
              ekin = excitationEnergyDTA/nbl;
@@ -1641,7 +1641,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                 {
                   if( G4UniformRand() < sprob ) 
                     {
-                      if(verboseLevel > 1) G4cout << " Particle skipped " << endl;
+                      if(verboseLevel > 1) G4cout << " Particle skipped " << G4endl;
                       continue;
                     } 
                   if( ekin2 > excitationEnergyDTA) break;
@@ -1650,7 +1650,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -1689,7 +1689,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
      }
 
    if(verboseLevel > 1)
-     { G4cout << "Call TuningOfHighEnergyCacsading vecLen = " << vecLen << endl;
+     { G4cout << "Call TuningOfHighEnergyCacsading vecLen = " << vecLen << G4endl;
        incidentParticle.Print(0);
        targetParticle.Print(1);
        for (i=0; i<vecLen; i++) pv[i].Print(i);
@@ -1700,7 +1700,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                 atomicWeight, atomicNumber);
 
    if(verboseLevel > 1)
-     { G4cout << " After Tuning: " << endl;
+     { G4cout << " After Tuning: " << G4endl;
        for(i=0; i<vecLen; i++) pv[i].Print(i);
      }
                                                      //  calculate time delay for nuclear reactions
@@ -1778,10 +1778,10 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
          }
        if(verboseLevel > 1)
          {
-           G4cout << "ipmax, pmax   " << ipmax  << " " << pmax   << endl;
-           G4cout << "maxpip,pmapip " << maxpip << " " << pmapip << endl;
-           G4cout << "maxpi0,pmapi0 " << maxpi0 << " " << pmapi0 << endl;
-           G4cout << "maxpim,pmapim " << maxpim << " " << pmapim << endl; 
+           G4cout << "ipmax, pmax   " << ipmax  << " " << pmax   << G4endl;
+           G4cout << "maxpip,pmapip " << maxpip << " " << pmapip << G4endl;
+           G4cout << "maxpi0,pmapi0 " << maxpi0 << " " << pmapi0 << G4endl;
+           G4cout << "maxpim,pmapim " << maxpim << " " << pmapim << G4endl; 
          }
 
        if ( vecLen > 2)
@@ -1796,7 +1796,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                     pv[i].setMomentumAndUpdate( 0., 0., 0.);
                     if(verboseLevel > 1)
                       {
-                        G4cout << "zero Momentum for particle " << endl;
+                        G4cout << "zero Momentum for particle " << G4endl;
                         pv[i].Print(i);
                       }                                  
                   } 
@@ -1813,7 +1813,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                   pv[maxpip].setMomentumAndUpdate( mompi0);
                   if(verboseLevel > 1)
                     {
-                      G4cout << " exchange Momentum for " << maxpi0 << " and " << maxpip << endl;
+                      G4cout << " exchange Momentum for " << maxpi0 << " and " << maxpip << G4endl;
                     } 
                 }
               else if ((incidentCharge < 0.) && (maxpim != 0))
@@ -1823,7 +1823,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                   pv[maxpim].setMomentumAndUpdate( mompi0);
                   if(verboseLevel > 1)
                     {
-                      G4cout << " exchange Momentum for " << maxpi0 << " and " << maxpip << endl;
+                      G4cout << " exchange Momentum for " << maxpi0 << " and " << maxpip << G4endl;
                     }   
                 }
             }
@@ -1834,7 +1834,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                0. : 1.+bntot/atomicWeight;
        if(verboseLevel > 1) 
          {
-           G4cout << " Calculated Baryon- Number " << bntot << endl;
+           G4cout << " Calculated Baryon- Number " << bntot << G4endl;
          }
 
        j = 0;
@@ -1851,7 +1851,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                  { 
                    if(verboseLevel > 1)
                      {
-                       G4cout << " skip Baryon: " << endl;
+                       G4cout << " skip Baryon: " << G4endl;
                        pv[i].Print(i);
                      }
                    continue; 
@@ -1894,7 +1894,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
 
    if(verboseLevel > 1)
      {
-       G4cout << " incidentS, incidentB " << incidentS << " " << incidentB << endl;
+       G4cout << " incidentS, incidentB " << incidentS << " " << incidentB << G4endl;
      }
 
    for (i=0; i<vecLen; i++)
@@ -1952,7 +1952,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                pv[i].Lor( pvmx[5], pvmx[4] );
                if(verboseLevel > 1) 
                  {
-                   G4cout << " Particle Momentum changed to: " << endl;
+                   G4cout << " Particle Momentum changed to: " << G4endl;
                    pv[i].Print(i); 
 		 }
              }    
@@ -1963,7 +1963,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                pvmx[7].Sub3( pvmx[9], pv[i] );
                reddec[4] = pvmx[7].Length()/incidentTotalMomentum;
                reddec[6] = reddec[4]*2./3. + reddec[5]/12.;
-               reddec[6] = max(0., 1. - reddec[6]);
+               reddec[6] = G4std::max(0., 1. - reddec[6]);
                gespar   += reddec[6];
                if ( (reddec[5] <= 3.75) && (reddec[6] > redpar) )
                  { ledpar = i;
@@ -1978,7 +1978,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
      { 
       if(verboseLevel > 1)
         {
-          G4cout << " Leading Particle found : " << ledpar << endl;
+          G4cout << " Leading Particle found : " << ledpar << G4endl;
           pv[ledpar].Print(ledpar);
         }
        pvmx[4].Sub3(pvmx[8], pvmx[9] );
@@ -2053,7 +2053,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 
    G4int i, j, k, l;
    
-   if(verboseLevel > 1) G4cout << " G4HEInelastic::HighEnergyClusterProduction " << endl;
+   if(verboseLevel > 1) G4cout << " G4HEInelastic::HighEnergyClusterProduction " << G4endl;
 
    successful = false; 
    if(incidentTotalMomentum < 25. + G4UniformRand()*25.) return;
@@ -2129,13 +2129,13 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    G4double  psup[]   = { 3. , 6. , 20., 50., 100.,1000.};   
    G4double s = centerOfMassEnergy*centerOfMassEnergy;
 
-   G4double xtarg = max(0.01, min(0.50, 0.312+0.2*log(log(s))+pow(s,1.5)/6000.) 
+   G4double xtarg = G4std::max(0.01, G4std::min(0.50, 0.312+0.2*log(log(s))+pow(s,1.5)/6000.) 
                              * (pow(atomicWeight,0.33)-1.) * tb);
    G4int momentumBin = 0;
    while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin])) momentumBin++;
-   momentumBin = min(5, momentumBin);
-   G4double xpnhmf = max(0.01,xtarg*nucsup[momentumBin]);
-   G4double xshhmf = max(0.01,xtarg-xpnhmf);
+   momentumBin = G4std::min(5, momentumBin);
+   G4double xpnhmf = G4std::max(0.01,xtarg*nucsup[momentumBin]);
+   G4double xshhmf = G4std::max(0.01,xtarg-xpnhmf);
    G4double rshhmf = 0.25*xshhmf;
    G4double rpnhmf = 0.81*xpnhmf;
    G4double xhmf;
@@ -2223,7 +2223,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
          }
 
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after initialization " << vecLen << endl;
+      { G4cout << " pv Vector after initialization " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -2312,9 +2312,9 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    G4double gpar[] = {2.6, 2.6, 1.80, 1.30, 1.20};
     
    G4double rmc = rmc0, rmd = rmd0, rme = rme0; 
-   G4int ntc1 = min(4,ntc-1);
-   G4int ntd1 = min(4,ntd-1);
-   G4int nte1 = min(4,nte-1);
+   G4int ntc1 = G4std::min(4,ntc-1);
+   G4int ntd1 = G4std::min(4,ntd-1);
+   G4int nte1 = G4std::min(4,nte-1);
    if (ntc > 1) rmc = rmc0 + pow(-log(1.-G4UniformRand()),cpar[ntc1])/gpar[ntc1];
    if (ntd > 1) rmd = rmd0 + pow(-log(1.-G4UniformRand()),cpar[ntd1])/gpar[ntd1];
    if (nte > 1) rme = rme0 + pow(-log(1.-G4UniformRand()),cpar[nte1])/gpar[nte1];
@@ -2332,7 +2332,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
           }   
       }             
    if(verboseLevel > 1) G4cout << " Cluster Masses: " << ntc << " " << rmc << " " << ntd
-                             << " " << rmd << " " << nte << " " << rme << endl;
+                             << " " << rmd << " " << nte << " " << rme << G4endl;
  
    
    G4HEVector* pvmx = new G4HEVector[11];
@@ -2345,7 +2345,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[0] );
    pvmx[2].Lor( pvmx[2], pvmx[0] );
 
-   G4double pf = sqrt(max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
+   G4double pf = sqrt(G4std::max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
                                  - 4*sqr(centerOfMassEnergy)*rmd*rmd))/(2.*centerOfMassEnergy);
    pvmx[3].setMass( rmc );
    pvmx[4].setMass( rmd );
@@ -2353,12 +2353,12 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    pvmx[4].setEnergy( sqrt(pf*pf + rmd*rmd) );
    
    G4double tvalue = -MAXFLOAT;
-   G4double bvalue = max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
+   G4double bvalue = G4std::max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
    if (bvalue != 0.0) tvalue = log(G4UniformRand())/bvalue;
    G4double pin = pvmx[1].Length();
    G4double tacmin = sqr( pvmx[1].getEnergy() - pvmx[3].getEnergy()) - sqr( pin - pf);
-   G4double ctet   = max(-1., min(1., 1.+2.*(tvalue-tacmin)/max(1.e-10, 4.*pin*pf)));
-   G4double stet   = sqrt(max(0., 1.0 - ctet*ctet));
+   G4double ctet   = G4std::max(-1., G4std::min(1., 1.+2.*(tvalue-tacmin)/G4std::max(1.e-10, 4.*pin*pf)));
+   G4double stet   = sqrt(G4std::max(0., 1.0 - ctet*ctet));
    G4double phi    = M_2PI * G4UniformRand();
    pvmx[3].setMomentum( pf * stet * sin(phi), 
                         pf * stet * cos(phi),
@@ -2383,8 +2383,8 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                    G4double ekit = pow(G4UniformRand()*(1.-gaval)/avalue +pow(ekit1, 1.-gaval),
                                        1./(1.-gaval));
                    pv[i].setKineticEnergyAndUpdate( ekit );
-                   ctet = max(-1., min(1., log(2.23*G4UniformRand()+0.383)/0.96));
-                   stet = sqrt( max( 0.0, 1. - ctet*ctet ));
+                   ctet = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                   stet = sqrt( G4std::max( 0.0, 1. - ctet*ctet ));
                    phi  = G4UniformRand()*M_2PI;
                    G4double pp = pv[i].Length();
                    pv[i].setMomentum( pp * stet * sin(phi),
@@ -2400,7 +2400,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    pvmx[6].SmulAndUpdate( pvmx[4], -1.);
 
    if (verboseLevel > 1)
-      { G4cout << " General vectors before Phase space Generation " << endl;
+      { G4cout << " General vectors before Phase space Generation " << G4endl;
         for (i=0; i<7; i++) pvmx[i].Print(i);
       }  
 
@@ -2480,7 +2480,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 
    if(verboseLevel > 1)
      {
-       G4cout << " Vectors after PhaseSpace generation " << endl;
+       G4cout << " Vectors after PhaseSpace generation " << G4endl;
        for(i=0; i<vecLen; i++) pv[i].Print(i);
      }
                                                    //  Lorentz transformation in lab system
@@ -2494,7 +2494,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 
    if(verboseLevel > 1)
      {
-       G4cout << " Transformation in Lab- System " << endl;
+       G4cout << " Transformation in Lab- System " << G4endl;
        for(i=0; i<vecLen; i++) pv[i].Print(i);
      }
 
@@ -2579,7 +2579,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
           }
        teta = pvmx[8].Ang( pvmx[4] );
        if (verboseLevel > 1) 
-           G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0 << " " << ekin1 << " " << ekin << endl;
+           G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0 << " " << ekin1 << " " << ekin << G4endl;
      }
 
    if( ekin1 != 0.0 ) 
@@ -2596,12 +2596,12 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
             pvmx[7].Add( pvmx[7], pv[i] );
           }
        teta = pvmx[7].Ang( pvmx[4] );
-       if (verboseLevel > 1) G4cout << " ekin1 != 0 " << teta << " " << ekin0 << " " << ekin1 << endl;
+       if (verboseLevel > 1) G4cout << " ekin1 != 0 " << teta << " " << ekin0 << " " << ekin1 << G4endl;
      }
 
    if(verboseLevel > 1)
      {
-       G4cout << " After energy- correction " << endl;
+       G4cout << " After energy- correction " << G4endl;
        for(i=0; i<vecLen; i++) pv[i].Print(i);
      }      
 
@@ -2633,7 +2633,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
         pvmx[7].Add( pvmx[7], pv[i] );  
       }
    teta = pvmx[7].Ang( pvmx[4] );   
-   if (verboseLevel > 1) G4cout << " After smearing " << teta << endl;
+   if (verboseLevel > 1) G4cout << " After smearing " << teta << G4endl;
 
                                //  Rotate in direction of primary particle, subtract binding energies
                                //   and make some further corrections if required
@@ -2652,7 +2652,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              xxh   = 1.;
@@ -2694,13 +2694,13 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
       }
    if (verboseLevel > 1)
-      { G4cout << " Lab-System " << ek1 << " " << npions << endl;
+      { G4cout << " Lab-System " << ek1 << " " << npions << G4endl;
         for (i=0; i<vecLen; i++) pv[i].Print(i);
       }
 
@@ -2710,11 +2710,11 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 
    if (verboseLevel > 1) 
        G4cout << " Evaporation " << atomicWeight << " " << excitationEnergyGNP
-            << " " << excitationEnergyDTA << endl;
+            << " " << excitationEnergyDTA << G4endl;
 
    G4double sprob = 0.;
    if (incidentKineticEnergy > 5. )
-       sprob = min( 1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
+       sprob = G4std::min( 1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
 
    if( atomicWeight > 1.5 && G4UniformRand() > sprob) 
      {
@@ -2731,7 +2731,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
            if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
-           if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << endl; 
+           if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
              {
@@ -2746,7 +2746,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -2772,7 +2772,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = max( 0.1, eka );
+                    eka = G4std::max( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -2816,7 +2816,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA )
-                     ekin1 = max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -2933,7 +2933,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
 
    G4int i, j, k, l;
 
-   if(verboseLevel > 1) G4cout << " G4HEInelastic::MediumEnergyCascading " << endl;
+   if(verboseLevel > 1) G4cout << " G4HEInelastic::MediumEnergyCascading " << G4endl;
 
                               // define annihilation channels.
                                  
@@ -2963,7 +2963,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    
    if (annihilation)
       {                        // do some corrections of incident particle kinematic
-        G4double ekcor = max( 1., 1./incidentKineticEnergy);
+        G4double ekcor = G4std::max( 1., 1./incidentKineticEnergy);
         incidentKineticEnergy = 2*targetMass + incidentKineticEnergy*(1.+ekcor/atomicWeight);
         G4double excitation = NuclearExcitation(incidentKineticEnergy,
                                                 atomicWeight,
@@ -2974,13 +2974,13 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if (incidentKineticEnergy < excitationEnergyDTA) incidentKineticEnergy = 0.;
         incidentEnergy = incidentKineticEnergy + incidentMass;
         incidentTotalMomentum =
-                 sqrt( max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
+                 sqrt( G4std::max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
       }  
                   
    G4HEVector pTemp;
    for(i = 2; i<vecLen; i++)
      {
-       j = min(vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen-2)));
+       j = G4std::min(vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen-2)));
        pTemp = pv[j];
        pv[j] = pv[i];
        pv[i] = pTemp;
@@ -3072,7 +3072,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        tb = (2. * ntb + vecLen)/2.;     
 
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after Randomization " << vecLen << endl;
+      { G4cout << " pv Vector after Randomization " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -3085,7 +3085,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    
    G4double s, xtarg, ran;
    s = centerOfMassEnergy*centerOfMassEnergy;
-   xtarg = max( 0.01, min( 0.75, 0.312 + 0.200 * log(log(s)) 
+   xtarg = G4std::max( 0.01, G4std::min( 0.75, 0.312 + 0.200 * log(log(s)) 
                                        + pow(s,1.5)/6000.0 ) 
                      *(pow(atomicWeight, 0.33) - 1.0) * tb);
 
@@ -3099,7 +3099,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        G4int momentumBin = 0;
        while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin]) )
              momentumBin++;
-       momentumBin = min( 5, momentumBin );
+       momentumBin = G4std::min( 5, momentumBin );
      
                               // NOTE: in GENXPT, these new particles were given negative codes
                               //       here I use  flag = true  instead
@@ -3216,7 +3216,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
 
    if (verboseLevel > 1)
       { G4cout << " pv Vector after Energy checks " << vecLen << " " << tavai1 << " " 
-             << iavai1 << " " << tavai2 << " " << iavai2 << " " << ntarg << endl;
+             << iavai1 << " " << tavai2 << " " << iavai2 << " " << ntarg << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -3243,7 +3243,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[2] );
 
    if (verboseLevel > 1)
-     { G4cout << " General Vectors after Definition " << endl;
+     { G4cout << " General Vectors after Definition " << G4endl;
        for (i=0; i<10; i++) pvmx[i].Print(i);
      }
                                                  //  main loop for 4-momentum generation
@@ -3291,7 +3291,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if ( i <= 1 ) j += 3;
         if (pv[i].getSide() <= -2) j = 6;
         if (j == 6 && pv[i].getType() == baryonType) j = 7;
-        pt    = max(0.001, sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j])));
+        pt    = G4std::max(0.001, sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j])));
         aspar = maspar[j]; 
         phi   = G4UniformRand()*M_2PI; 
         pv[i].setMomentum( pt*cos(phi), pt*sin(phi) );        // set x- and y-momentum
@@ -3330,8 +3330,8 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                       l = 1;
                       ran = G4UniformRand()*dndl[19];
                       while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-                      l = min( 19, l );
-                      xval = min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+                      l = G4std::min( 19, l );
+                      xval = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
                       if( pv[i].getSide() < 0 ) xval *= -1.;
                       pv[i].setMomentumAndUpdate( xval*et );                  // set the z-momentum
                       pvEnergy = pv[i].getEnergy();
@@ -3373,7 +3373,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                         } 
                       else 
                         {                                            // backward side
-                          xval = min(0.999,0.95+0.05*targ/20.0);
+                          xval = G4std::min(0.999,0.95+0.05*targ/20.0);
                           if( (ekin2+pvEnergy-pvMass) < xval*tavai2 ) 
                             {
                               pvmx[5].Add( pvmx[5], pv[i] );
@@ -3412,12 +3412,12 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                       ekin2 = 0.0;
                       pvmx[4].setZero();
                       pvmx[5].setZero();
-                      if (verboseLevel > 1) G4cout << " Reset energies for index " << i << endl;
+                      if (verboseLevel > 1) G4cout << " Reset energies for index " << i << G4endl;
                       for( l=i+1; l < vecLen; l++ ) 
                          {
                            if( (pv[l].getMass() < protonMass) || (pv[l].getSide() > 0) ) 
                              {
-                                pvEnergy = max( pv[l].getMass(),   0.95*pv[l].getEnergy() 
+                                pvEnergy = G4std::max( pv[l].getMass(),   0.95*pv[l].getEnergy() 
                                                                  + 0.05*pv[l].getMass() );
                                 pv[l].setEnergyAndUpdate( pvEnergy );
                                 if( pv[l].getSide() > 0) 
@@ -3439,7 +3439,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
           {                                                              // eliminate this particle
             if (verboseLevel > 1)
                {
-                  G4cout << " Eliminate particle with index " << i << endl;
+                  G4cout << " Eliminate particle with index " << i << G4endl;
                   pv[i].Print(i);
                }
             for( j=i; j < vecLen; j++ ) 
@@ -3459,7 +3459,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
           }
       }                                                                  // closes main for loop
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after lambda fragmentation " << vecLen << endl;
+      { G4cout << " pv Vector after lambda fragmentation " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -3491,7 +3491,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
      }  
    if( targ1 == 1 || npg < 2) 
      {                                                  // target particle is the only backward nucleon
-       ekin = min( tavai2-ekin2, centerOfMassEnergy/2.0-protonMass );
+       ekin = G4std::min( tavai2-ekin2, centerOfMassEnergy/2.0-protonMass );
        if( ekin < 0.04 ) ekin = 0.04 * fabs( normal() );
        pv[1].setKineticEnergyAndUpdate( ekin );
        pvmx[5].Add( pvmx[5], pv[1] );
@@ -3501,7 +3501,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        G4double cpar[] = { 0.6, 0.6, 0.35, 0.15, 0.10 };
        G4double gpar[] = { 2.6, 2.6, 1.80, 1.30, 1.20 };
 
-       G4int tempCount = min( 5, targ1 ) - 1;
+       G4int tempCount = G4std::min( 5, targ1 ) - 1;
 
        rmb = rmb0 + pow(-log(1.0-G4UniformRand()), cpar[tempCount])/gpar[tempCount];
        pvEnergy = pvmx[6].getEnergy();
@@ -3512,7 +3512,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        if (verboseLevel > 1)
           { G4cout << " General Vectors before input to NBodyPhaseSpace "
                  << targ1 << " " << tempCount << " " << rmb0 << " " << rmb << " " 
-                 << pvEnergy << endl;
+                 << pvEnergy << G4endl;
             for (i=0; i<10; i++) pvmx[i].Print(i);
           }
                                                              //  tempV contains the backward nucleons
@@ -3553,7 +3553,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if( pv[i].getType() == baryonType )targ++;
         pv[i].Lor( pv[i], pvmx[1] );
       }
-   targ = max( 1, targ );
+   targ = G4std::max( 1, targ );
 
    G4bool dum;
    if( lead ) 
@@ -3634,7 +3634,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
           }
        teta = pvmx[7].Ang( pvmx[3] );
        if (verboseLevel > 1) G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0
-                                  << " " << ekin1 << " " << ekin << endl;
+                                  << " " << ekin1 << " " << ekin << G4endl;
      }
 
    if( ekin1 != 0.0 ) 
@@ -3652,7 +3652,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
           }
        teta = pvmx[6].Ang( pvmx[3] );
        if (verboseLevel > 1) G4cout << " ekin1 != 0 " << teta << " " << ekin0 << " " 
-                                  << ekin1 << endl;
+                                  << ekin1 << G4endl;
      }
 
                           //    Rotate in direction of z-axis, this does disturb in some way our
@@ -3683,7 +3683,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         pvmx[6].Add( pvmx[6], pv[i] );  
       }
    teta = pvmx[6].Ang( pvmx[3] );   
-   if (verboseLevel > 1) G4cout << " After smearing " << teta << endl;
+   if (verboseLevel > 1) G4cout << " After smearing " << teta << G4endl;
 
                                //  Rotate in direction of primary particle, subtract binding energies
                                //   and make some further corrections if required
@@ -3702,7 +3702,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              if(incidentCode == pionPlusCode || incidentCode == pionMinusCode)
@@ -3743,13 +3743,13 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
       }
    if (verboseLevel > 1)
-      { G4cout << " Lab-System " << ek1 << " " << npions << endl;
+      { G4cout << " Lab-System " << ek1 << " " << npions << G4endl;
         for (i=0; i<vecLen; i++) pv[i].Print(i);
       }
 
@@ -3758,7 +3758,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                                        //  this may have influence on very high energies
 
    if (verboseLevel > 1) G4cout << " Evaporation " << atomicWeight << " " <<
-                     excitationEnergyGNP << " " << excitationEnergyDTA << endl;
+                     excitationEnergyGNP << " " << excitationEnergyDTA << G4endl;
 
    if( atomicWeight > 1.5 ) 
      {
@@ -3770,7 +3770,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        if( incidentKineticEnergy < 5.0 )
          sprob = 0.0;
        else
-         sprob = min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
+         sprob = G4std::min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
 
                                      //  first add protons and neutrons
 
@@ -3782,7 +3782,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
            if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
-           if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << endl; 
+           if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
              {
@@ -3797,7 +3797,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -3823,7 +3823,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = max( 0.1, eka );
+                    eka = G4std::max( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -3867,7 +3867,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -3975,7 +3975,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
 
    G4int i, j, k, l;
    
-   if(verboseLevel > 1) G4cout << " G4HEInelastic::MediumEnergyClusterProduction " << endl;
+   if(verboseLevel > 1) G4cout << " G4HEInelastic::MediumEnergyClusterProduction " << G4endl;
 
    if (incidentTotalMomentum < 0.01)
       {
@@ -4051,12 +4051,12 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    
    G4double nucsup[] = { 1.0, 0.8, 0.6, 0.5, 0.4}; 
 
-   G4double xtarg = max(0.01,  (0.312+0.2*log(log(centerOfMassEnergy*centerOfMassEnergy)))
+   G4double xtarg = G4std::max(0.01,  (0.312+0.2*log(log(centerOfMassEnergy*centerOfMassEnergy)))
                              * (pow(atomicWeight,0.33)-1.) * tb);
    G4int ntarg = Poisson(xtarg);
    if (ntarg > 0)
       {
-        G4int ipx = min(4, (G4int)(incidentTotalMomentum/3.));
+        G4int ipx = G4std::min(4, (G4int)(incidentTotalMomentum/3.));
         for (i=0; i < ntarg; i++)
             { 
                if (G4UniformRand() < nucsup[ipx] )
@@ -4116,7 +4116,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
          }
 
    if (verboseLevel > 1)
-      { G4cout << " pv Vector after initialization " << vecLen << endl;
+      { G4cout << " pv Vector after initialization " << vecLen << G4endl;
         pvI.Print(-1);
         pvT.Print(-1);
         for (i=0; i < vecLen ; i++) pv[i].Print(i);
@@ -4205,9 +4205,9 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    G4double gpar[] = {2.6, 2.6, 1.80, 1.30, 1.20};
     
    G4double rmc = rmc0, rmd = rmd0, rme = rme0; 
-   G4int ntc1 = min(4,ntc-1);
-   G4int ntd1 = min(4,ntd-1);
-   G4int nte1 = min(4,nte-1);
+   G4int ntc1 = G4std::min(4,ntc-1);
+   G4int ntd1 = G4std::min(4,ntd-1);
+   G4int nte1 = G4std::min(4,nte-1);
    if (ntc > 1) rmc = rmc0 + pow(-log(1.-G4UniformRand()),cpar[ntc1])/gpar[ntc1];
    if (ntd > 1) rmd = rmd0 + pow(-log(1.-G4UniformRand()),cpar[ntd1])/gpar[ntd1];
    if (nte > 1) rme = rme0 + pow(-log(1.-G4UniformRand()),cpar[nte1])/gpar[nte1];
@@ -4225,7 +4225,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
           }   
       }             
    if(verboseLevel > 1) G4cout << " Cluster Masses: " << ntc << " " << rmc << " " << ntd << " "
-                             << rmd << " " << nte << " " << rme << endl;
+                             << rmd << " " << nte << " " << rme << G4endl;
  
    
    G4HEVector* pvmx = new G4HEVector[11];
@@ -4238,7 +4238,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[0] );
    pvmx[2].Lor( pvmx[2], pvmx[0] );
 
-   G4double pf = sqrt(max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
+   G4double pf = sqrt(G4std::max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
                                  - 4*sqr(centerOfMassEnergy)*rmd*rmd))/(2.*centerOfMassEnergy);
    pvmx[3].setMass( rmc );
    pvmx[4].setMass( rmd );
@@ -4246,12 +4246,12 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    pvmx[4].setEnergy( sqrt(pf*pf + rmd*rmd) );
    
    G4double tvalue = -MAXFLOAT;
-   G4double bvalue = max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
+   G4double bvalue = G4std::max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
    if (bvalue != 0.0) tvalue = log(G4UniformRand())/bvalue;
    G4double pin = pvmx[1].Length();
    G4double tacmin = sqr( pvmx[1].getEnergy() - pvmx[3].getEnergy()) - sqr( pin - pf);
-   G4double ctet   = max(-1., min(1., 1.+2.*(tvalue-tacmin)/max(1.e-10, 4.*pin*pf)));
-   G4double stet   = sqrt(max(0., 1.0 - ctet*ctet));
+   G4double ctet   = G4std::max(-1., G4std::min(1., 1.+2.*(tvalue-tacmin)/G4std::max(1.e-10, 4.*pin*pf)));
+   G4double stet   = sqrt(G4std::max(0., 1.0 - ctet*ctet));
    G4double phi    = M_2PI * G4UniformRand();
    pvmx[3].setMomentum( pf * stet * sin(phi), 
                       pf * stet * cos(phi),
@@ -4276,8 +4276,8 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                    G4double ekit = pow(G4UniformRand()*(1.-gaval)/avalue +pow(ekit1, 1.-gaval),
                                        1./(1.-gaval));
                    pv[i].setKineticEnergyAndUpdate( ekit );
-                   ctet = max(-1., min(1., log(2.23*G4UniformRand()+0.383)/0.96));
-                   stet = sqrt( max( 0.0, 1. - ctet*ctet ));
+                   ctet = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                   stet = sqrt( G4std::max( 0.0, 1. - ctet*ctet ));
                    phi  = G4UniformRand()*M_2PI;
                    G4double pp = pv[i].Length();
                    pv[i].setMomentum( pp * stet * sin(phi),
@@ -4293,7 +4293,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    pvmx[6].SmulAndUpdate( pvmx[4], -1.);
 
    if (verboseLevel > 1)
-      { G4cout << " General vectors before Phase space Generation " << endl;
+      { G4cout << " General vectors before Phase space Generation " << G4endl;
         for (i=0; i<7; i++) pvmx[i].Print(i);
       }  
 
@@ -4379,7 +4379,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
 
    if(verboseLevel > 1)
      {
-       G4cout << " Vectors after PhaseSpace generation " << endl;
+       G4cout << " Vectors after PhaseSpace generation " << G4endl;
        for(i=0;i<vecLen; i++) pv[i].Print(i);
      } 
 
@@ -4394,7 +4394,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
 
    if(verboseLevel > 1)
      {
-       G4cout << " Transformation in Lab- System " << endl;
+       G4cout << " Transformation in Lab- System " << G4endl;
        for(i=0; i<vecLen; i++) pv[i].Print(i);
      }
 
@@ -4477,7 +4477,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
           }
        teta = pvmx[8].Ang( pvmx[4] );
        if (verboseLevel > 1) G4cout << " vecLen > 1 && vecLen < 19 " << teta << " " << ekin0 
-                                  << " " << ekin1 << " " << ekin << endl;
+                                  << " " << ekin1 << " " << ekin << G4endl;
      }
 
    if( ekin1 != 0.0 ) 
@@ -4495,7 +4495,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
           }
        teta = pvmx[7].Ang( pvmx[4] );
        if (verboseLevel > 1) G4cout << " ekin1 != 0 " << teta << " " << ekin0 << " " 
-                                  << ekin1 << endl;
+                                  << ekin1 << G4endl;
      }
 
                           //    Rotate in direction of z-axis, this does disturb in some way our
@@ -4526,7 +4526,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
         pvmx[7].Add( pvmx[7], pv[i] );  
       }
    teta = pvmx[7].Ang( pvmx[4] );   
-   if (verboseLevel > 1) G4cout << " After smearing " << teta << endl;
+   if (verboseLevel > 1) G4cout << " After smearing " << teta << G4endl;
 
                                //  Rotate in direction of primary particle, subtract binding energies
                                //   and make some further corrections if required
@@ -4545,7 +4545,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              xxh   = 1.;
@@ -4587,13 +4587,13 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
       }
    if (verboseLevel > 1)
-      { G4cout << " Lab-System " << ek1 << " " << npions << endl;
+      { G4cout << " Lab-System " << ek1 << " " << npions << G4endl;
         for (i=0; i<vecLen; i++) pv[i].Print(i);
       }
 
@@ -4602,7 +4602,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                                        //  this may have influence on very high energies
 
    if (verboseLevel > 1) G4cout << " Evaporation " <<  atomicWeight << " " <<
-                     excitationEnergyGNP << " " << excitationEnergyDTA << endl;
+                     excitationEnergyGNP << " " << excitationEnergyDTA << G4endl;
 
    if( atomicWeight > 1.5 ) 
      {
@@ -4614,7 +4614,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
        if( incidentKineticEnergy < 5.0 )
          sprob = 0.0;
        else
-         sprob = min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
+         sprob = G4std::min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
 
                                      //  first add protons and neutrons
 
@@ -4627,7 +4627,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                                          (excitationEnergyGNP+excitationEnergyDTA));
            if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
            if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " 
-                                      << sprob << endl; 
+                                      << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
              {
@@ -4642,7 +4642,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP )
-                    ekin1 = max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -4668,7 +4668,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = max( 0.1, eka );
+                    eka = G4std::max( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -4712,7 +4712,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -4818,7 +4818,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
 
    G4int i;
    
-   if(verboseLevel > 1) G4cout << " G4HEInelastic::QuasiElasticScattering " << endl;
+   if(verboseLevel > 1) G4cout << " G4HEInelastic::QuasiElasticScattering " << G4endl;
 
    if (incidentTotalMomentum < 0.01 || vecLen < 2 )
       {
@@ -4872,7 +4872,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
         pvmx[1].Lor( pvI, pvmx[0] );
         pvmx[2].Lor( pvT, pvmx[0] );
         G4double pin = pvmx[1].Length();
-        G4double bvalue = max(0.01 , 4.225+1.795*log(incidentTotalMomentum));
+        G4double bvalue = G4std::max(0.01 , 4.225+1.795*log(incidentTotalMomentum));
         G4double pf =   sqr( sqr(centerOfMassEnergy) + sqr(pv[1].getMass()) - sqr(pv[0].getMass()))
                       - 4 * sqr(centerOfMassEnergy) * sqr(pv[1].getMass());
         if ( pf < 0.001)
@@ -4885,7 +4885,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
         G4double exindt = -1.;
         if (btrang < 46.) exindt += exp(-btrang);
         G4double tdn = log(1. + G4UniformRand()*exindt)/btrang;
-        G4double ctet = max( -1., min(1., 1. + 2.*tdn));
+        G4double ctet = G4std::max( -1., G4std::min(1., 1. + 2.*tdn));
         G4double stet = sqrt((1.-ctet)*(1.+ctet));
         G4double phi  = M_2PI * G4UniformRand();
         pv[0].setMomentumAndUpdate( pf*stet*sin(phi),
@@ -4902,7 +4902,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                  G4double ekin =    pv[i].getKineticEnergy() 
                                  -  0.025*((atomicWeight-1.)/120.)*exp(-(atomicWeight-1.)/120.)
                                    *(1. + 0.5*normal()); 
-                 ekin = max(0.0001, ekin);
+                 ekin = G4std::max(0.0001, ekin);
                  pv[i].setKineticEnergyAndUpdate( ekin );
                }
            }
@@ -4913,7 +4913,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                                        //  this may have influence on very high energies
 
    if (verboseLevel > 1) G4cout << " Evaporation " << atomicWeight << " " << 
-                     excitationEnergyGNP << " " <<  excitationEnergyDTA << endl;
+                     excitationEnergyGNP << " " <<  excitationEnergyDTA << G4endl;
 
    if( atomicWeight > 1.5 ) 
      {
@@ -4934,7 +4934,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
        
            nbl = Poisson( excitationEnergyGNP/0.02);
            if( nbl > atomicWeight ) nbl = atomicWeight;
-           if (verboseLevel > 1) G4cout << " evaporation " << nbl << " " << sprob << endl; 
+           if (verboseLevel > 1) G4cout << " evaporation " << nbl << " " << sprob << G4endl; 
            spall = 0;
            if( nbl > 0) 
              {
@@ -4949,7 +4949,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -4975,7 +4975,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = max( 0.1, eka );
+                    eka = G4std::max( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -5016,7 +5016,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -5069,11 +5069,11 @@ G4HEInelastic::ElasticScattering(G4bool &successful,
                                  G4double atomicWeight,
                                  G4double atomicNumber)
  {
-   if(verboseLevel > 1) G4cout << " G4HEInelastic::ElasticScattering " << endl;
+   if(verboseLevel > 1) G4cout << " G4HEInelastic::ElasticScattering " << G4endl;
 
    G4double incidentTotalMomentum = incidentParticle.getTotalMomentum();
    if (verboseLevel > 1)
-      G4cout << "DoIt: Incident particle momentum=" << incidentTotalMomentum << " GeV" << endl;
+      G4cout << "DoIt: Incident particle momentum=" << incidentTotalMomentum << " GeV" << G4endl;
    if (incidentTotalMomentum < 0.01) 
       { 
         successful = false;
@@ -5108,17 +5108,17 @@ G4HEInelastic::ElasticScattering(G4bool &successful,
    rr = (aa + cc)*ran;
    if (verboseLevel > 1) 
      {
-       G4cout << "ElasticScattering: aa,bb,cc,dd,rr" << endl;
-       G4cout << aa << " " << bb << " " << cc << " " << dd << " " << rr << endl;
+       G4cout << "ElasticScattering: aa,bb,cc,dd,rr" << G4endl;
+       G4cout << aa << " " << bb << " " << cc << " " << dd << " " << rr << G4endl;
      }
    G4double t1 = -log(ran)/bb;
    G4double t2 = -log(ran)/dd;
    if (verboseLevel > 1) 
      {
        G4cout << "t1,fctcos " << t1 << " " << fctcos(t1, aa, bb, cc, dd, rr) << 
-               endl;
+               G4endl;
        G4cout << "t2,fctcos " << t2 << " " << fctcos(t2, aa, bb, cc, dd, rr) << 
-               endl;
+               G4endl;
      }
    G4double eps = 0.001;
    G4int ind1 = 10;
@@ -5127,25 +5127,25 @@ G4HEInelastic::ElasticScattering(G4bool &successful,
    ier1 = rtmi(&t, t1, t2, eps, ind1, aa, bb, cc, dd, rr);
    if (verboseLevel > 1) 
      {
-       G4cout << "From rtmi, ier1=" << ier1 << endl;
+       G4cout << "From rtmi, ier1=" << ier1 << G4endl;
        G4cout << "t, fctcos " << t << " " << fctcos(t, aa, bb, cc, dd, rr) << 
-               endl;
+               G4endl;
      }
    if (ier1 != 0) t = 0.25*(3.*t1 + t2);
    if (verboseLevel > 1) 
      {
        G4cout << "t, fctcos " << t << " " << fctcos(t, aa, bb, cc, dd, rr) << 
-               endl;
+               G4endl;
      }
    G4double phi = G4UniformRand()*2.*M_PI;
    rr = 0.5*t/sqr(incidentTotalMomentum);
    if (rr > 1.) rr = 0.;
    if (verboseLevel > 1)
-      G4cout << "rr=" << rr << endl;
+      G4cout << "rr=" << rr << G4endl;
    G4double cost = 1. - rr;
-   G4double sint = sqrt(max(rr*(2. - rr), 0.));
+   G4double sint = sqrt(G4std::max(rr*(2. - rr), 0.));
    if (verboseLevel > 1)
-      G4cout << "cos(t)=" << cost << "  sin(t)=" << sint << endl;
+      G4cout << "cos(t)=" << cost << "  sin(t)=" << sint << G4endl;
                                          // Scattered particle referred to axis of incident particle
    G4HEVector pv0;
    G4HEVector pvI;
@@ -5315,9 +5315,9 @@ G4HEInelastic::fctcos(G4double t,
     const G4double expxl = -expxu;         // lower bound for arg. of exp
     
     if( vecLen < 2 ) {
-      G4cerr << "*** Error in G4HEInelastic::GenerateNBodyEvent" << endl;
-      G4cerr << "    number of particles < 2" << endl;
-      G4cerr << "totalEnergy = " << totalEnergy << ", vecLen = " << vecLen << endl;
+      G4cerr << "*** Error in G4HEInelastic::GenerateNBodyEvent" << G4endl;
+      G4cerr << "    number of particles < 2" << G4endl;
+      G4cerr << "totalEnergy = " << totalEnergy << ", vecLen = " << vecLen << G4endl;
       return -1.0;
     }
     
@@ -5341,9 +5341,9 @@ G4HEInelastic::fctcos(G4double t,
       sm[i] = totalMass;
     }
     if( totalMass >= totalEnergy ) {
-      G4cerr << "*** Error in G4HEInelastic::GenerateNBodyEvent" << endl;
+      G4cerr << "*** Error in G4HEInelastic::GenerateNBodyEvent" << G4endl;
       G4cerr << "    total mass (" << totalMass << ") >= total energy ("
-           << totalEnergy << ")" << endl;
+           << totalEnergy << ")" << G4endl;
       delete [] mass;
       delete [] energy;
       for( i=0; i<3; ++i )delete [] pcm[i];
@@ -5421,7 +5421,7 @@ G4HEInelastic::fctcos(G4double t,
         wtmax += log( pd[i] );
     }
     G4double weight = 0.0;           // weight is returned by GenerateNBodyEvent
-    if( lzero )weight = exp( max(min(wtmax,expxu),expxl) );
+    if( lzero )weight = exp( G4std::max(G4std::min(wtmax,expxu),expxl) );
     
     G4double bang, cb, sb, s0, s1, s2, c, s, esys, a, b, gama, beta;
     pcm[0][0] = 0.0;
@@ -5545,7 +5545,7 @@ G4HEInelastic::NBodyPhaseSpace(G4int npart, G4HEVector pv[],
            cost = 1. - 2.*ranarr[npart+2*j-9];
            sint = sqrt(1.-cost*cost);
            phi  = M_2PI*ranarr[npart+2*j-8];
-           p2   = sqrt( max(0., p2));
+           p2   = sqrt( G4std::max(0., p2));
            wps *= p2;
            pv[j].setMomentumAndUpdate( p2*sint*sin(phi), p2*sint*cos(phi),p2*cost);
            pv[j].Lor(pv[j], pvcms);
@@ -5558,7 +5558,7 @@ G4HEInelastic::NBodyPhaseSpace(G4int npart, G4HEVector pv[],
        cost = 1. - 2.*ranarr[npart+2*j-9];
        sint = sqrt(1.-cost*cost);
        phi  = M_2PI*ranarr[npart+2*j-8];
-       p2   = sqrt( max(0. , p2));
+       p2   = sqrt( G4std::max(0. , p2));
        wps *= p2;
        pv[j].setMomentumAndUpdate( p2*sint*sin(phi), p2*sint*cos(phi), p2*cost);
        pv[j+1].setMomentumAndUpdate( -p2*sint*sin(phi), -p2*sint*cos(phi), -p2*cost);
@@ -5568,7 +5568,7 @@ G4HEInelastic::NBodyPhaseSpace(G4int npart, G4HEVector pv[],
        G4double wt = wps * wfcn;
        if (wt > wmax)
          { wmax = wt;
-           G4cout << "maximum weight changed to " << wmax << endl;
+           G4cout << "maximum weight changed to " << wmax << G4endl;
          }
        wt = wt/wmax;
        if (G4UniformRand() < wt) break; 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
index ab2d0cd734..8c26f22207 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEKaonMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEKaonMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEKaonMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEKaonMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEKaonMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEKaonMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -114,7 +114,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -124,7 +124,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                incidentParticle, targetParticle);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -166,7 +166,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -229,7 +229,7 @@ void
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=np+1; nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=np+1; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -293,7 +293,7 @@ void
    G4int iplab = G4int( incidentTotalMomentum*5.);
    if( (iplab < 10) && (G4UniformRand() < cech[iplab])) 
      {
-       G4int     iplab = min(19, G4int( incidentTotalMomentum*5.));
+       G4int     iplab = G4std::min(19, G4int( incidentTotalMomentum*5.));
        G4double cnk0[] = {0.17, 0.18, 0.17, 0.24, 0.26, 0.20, 0.22, 0.21, 0.34, 0.45,
                           0.58, 0.55, 0.36, 0.29, 0.29, 0.32, 0.32, 0.33, 0.33, 0.33};
        if( G4UniformRand() < cnk0[iplab] )
@@ -370,7 +370,7 @@ void
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -385,7 +385,7 @@ void
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=np+1; nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=np+1; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -394,7 +394,7 @@ void
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -425,7 +425,7 @@ void
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -601,7 +601,7 @@ void
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
index c55ba13172..4384817f7a 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEKaonPlusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEKaonPlusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEKaonPlusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEKaonPlusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEKaonPlusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEKaonPlusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -114,7 +114,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -124,7 +124,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                               incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
 
@@ -167,7 +167,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -228,7 +228,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -250,7 +250,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -286,7 +286,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-           G4int iplab = G4int( min( 9.0, incidentTotalMomentum*5. ) );
+           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*5. ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                             // charge exchange  K+ n -> K0 p
                pv[0] = KaonZero;
@@ -351,7 +351,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -366,7 +366,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-2); nm<=np; nm++ ) 
+                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -375,7 +375,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -397,7 +397,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -406,7 +406,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -509,7 +509,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
index e60660c43a..fea44e83d0 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEKaonZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEKaonZeroInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEKaonZeroInelastic: incident energy < 1 GeV" << endl;;
+        G4cout << "GHEKaonZeroInelastic: incident energy < 1 GeV" << G4endl;;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEKaonZeroInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEKaonZeroInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                               incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -284,7 +284,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
        if( targetCode == protonCode ) 
          {
            G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-           G4int iplab = G4int( min( 9.0, incidentTotalMomentum*5. ) );
+           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*5. ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                             // charge exchange  K+ n -> K0 p
                pv[0] = KaonPlus;
@@ -351,7 +351,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -366,7 +366,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -375,7 +375,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -406,7 +406,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -509,7 +509,7 @@ G4HEKaonZeroInelastic::FirstIntInCasKaonZero( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return; }
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
index 6d8b0600fb..aafcae7a59 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroLongInelastic.cc,v 1.2.8.1 1999/12/07 20:52:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
index 229e7dde6c..fd8eec2ea5 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroShortInelastic.cc,v 1.2.8.1 1999/12/07 20:52:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
index c9fc30df9a..a0dccc5e1b 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HELambdaInelastic.cc,v 1.2.8.1 1999/12/07 20:52:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HELambdaInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHELambdaInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHELambdaInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HELambdaInelastic::ApplyYourself" << endl;
+        G4cout << "G4HELambdaInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                             incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -360,7 +360,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -375,7 +375,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-2); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -384,7 +384,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -406,7 +406,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+2); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+2); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -415,7 +415,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -557,7 +557,7 @@ G4HELambdaInelastic::FirstIntInCasLambda( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
index 69c0fbe272..111055a175 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HENeutronInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HENeutronInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHENeutronInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHENeutronInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HENeutronInelastic::ApplyYourself" << endl;
+        G4cout << "G4HENeutronInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                              incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -284,7 +284,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
        if( targetCode == protonCode ) 
          {
            G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-           G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5) );
+           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                                            // charge exchange  n p -> p n
                pv[0] = Proton;
@@ -350,7 +350,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -365,7 +365,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -374,7 +374,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -405,7 +405,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -508,7 +508,7 @@ G4HENeutronInelastic::FirstIntInCasNeutron( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
index 1de39c81bd..0db67af67a 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEOmegaMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEOmegaMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEOmegaMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEOmegaMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEOmegaMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEOmegaMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                 incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -362,7 +362,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -377,7 +377,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -386,7 +386,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -417,7 +417,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -498,7 +498,7 @@ G4HEOmegaMinusInelastic::FirstIntInCasOmegaMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
index 0da44d96d7..a34613b6a1 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPionMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPionMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEPionMinusInelastic: incident energy < 1 GeV" << endl ;
+        G4cout << "GHEPionMinusInelastic: incident energy < 1 GeV" << G4endl ;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEPionMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEPionMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                incidentParticle, targetParticle);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -225,7 +225,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -294,7 +294,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
 //                                            suppress high multiplicity events at low momentum
 //                                            only one additional pion will be produced
        G4double cech[] = {1., 0.95, 0.79, 0.32, 0.19, 0.16, 0.14, 0.12, 0.10, 0.08};
-       G4int iplab = max(9, G4int( incidentTotalMomentum*5.));
+       G4int iplab = G4std::max(9, G4int( incidentTotalMomentum*5.));
        if( G4UniformRand() < cech[iplab] )
          {
            if( targetCode == protonCode )
@@ -353,7 +353,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -368,7 +368,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -377,7 +377,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -408,7 +408,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -511,7 +511,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
index e28b8b870b..8d25120456 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPionPlusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPionPlusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "G4HEPionPlusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "G4HEPionPlusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEPionPlusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEPionPlusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                               incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -227,7 +227,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -249,7 +249,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -285,7 +285,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-           G4int iplab = G4int( min( 9.0, incidentTotalMomentum*5. ) );
+           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*5. ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                             // charge exchange  pi+ n -> pi0 p
                pv[0] = PionZero;
@@ -349,7 +349,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -364,7 +364,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-2); nm<=np; nm++ ) 
+                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -373,7 +373,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -395,7 +395,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -404,7 +404,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -507,7 +507,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
index 9e4108a84c..06853047b6 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPlot.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEPlot.cc,v 1.2.8.1.2.1 1999/12/08 17:34:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -48,12 +48,12 @@ G4HEPlot::Add( G4double s1, G4double s2,
    {
      if(p1.Nbin != p2.Nbin)
        {
-         G4cout << "G4HEPlot::Add: Plots must have same number of bins !" << endl;
+         G4cout << "G4HEPlot::Add: Plots must have same number of bins !" << G4endl;
          return;
        }
      if(Nbin != p1.Nbin)
        {
-         G4cout << "G4HEPlot::Add: Plot must be initialized  before using it !" << endl;
+         G4cout << "G4HEPlot::Add: Plot must be initialized  before using it !" << G4endl;
          return;
        }  
 
@@ -76,12 +76,12 @@ G4HEPlot::Multiply( G4double s1, G4double s2,
    {
      if(p1.Nbin != p2.Nbin)
        {
-         G4cout << "G4HEPlot::Multiply: Plots must have same number of bins !" << endl;
+         G4cout << "G4HEPlot::Multiply: Plots must have same number of bins !" << G4endl;
          return;
        }
      if(Nbin != p1.Nbin)
        {
-         G4cout << "G4HEPlot::Multiply: Plot must be initialized  before using it !" << endl;
+         G4cout << "G4HEPlot::Multiply: Plot must be initialized  before using it !" << G4endl;
          return;
        }  
 
@@ -104,12 +104,12 @@ G4HEPlot::Divide( G4double s1, G4double s2,
    {
      if(p1.Nbin != p2.Nbin)
        {
-         G4cout << "G4HEPlot::Divide: Plots must have same number of bins !" << endl;
+         G4cout << "G4HEPlot::Divide: Plots must have same number of bins !" << G4endl;
          return;
        }
      if(Nbin != p1.Nbin)
        {
-         G4cout << "G4HEPlot::Divide: Plot must be defined before using it !" << endl;
+         G4cout << "G4HEPlot::Divide: Plot must be defined before using it !" << G4endl;
          return;
        }  
 
@@ -144,7 +144,7 @@ G4HEPlot::Scale( G4double s, const G4HEPlot & p)
    {
      if(Nbin != p.Nbin)
        {
-         G4cout << "G4HEPlot::Add: Plot must be defined before using it !" << endl;
+         G4cout << "G4HEPlot::Add: Plot must be defined before using it !" << G4endl;
          return;
        }  
 
@@ -196,7 +196,7 @@ G4HEPlot::Log( G4double s, const G4HEPlot & p)
    {
      if(Nbin != p.Nbin)
        {
-         G4cout << "G4HEPlot::Log: Plot must be defined before using it !" << endl;
+         G4cout << "G4HEPlot::Log: Plot must be defined before using it !" << G4endl;
          return;
        }  
 
@@ -223,7 +223,7 @@ G4HEPlot::Sqrt(G4double s, const G4HEPlot & p)
    {
      if(Nbin != p.Nbin)
        {
-         G4cout << " G4HEPlot::Sqrt: Plot must be defined before using it !" << endl;
+         G4cout << " G4HEPlot::Sqrt: Plot must be defined before using it !" << G4endl;
          return;
        }
      for (G4int i=0; i<Nbin; i++)
@@ -284,21 +284,21 @@ G4HEPlot::Print( G4String  name, G4int iplot)
    {
      G4cout << name << iplot << " = new TH1F(" << '"' << iplot 
           << '"' << "," << '"' <<  '"' << "," << Nbin << "," 
-          << Xstart << "," << Xstart+Nbin*Xbin << ");" << endl; 
-     G4cout << "for(I=1; I<=" << Nbin <<"; I++) {" << endl;
-     G4cout << "Y[I] = 0.;" << endl;
-     G4cout << "}" << endl;
+          << Xstart << "," << Xstart+Nbin*Xbin << ");" << G4endl; 
+     G4cout << "for(I=1; I<=" << Nbin <<"; I++) {" << G4endl;
+     G4cout << "Y[I] = 0.;" << G4endl;
+     G4cout << "}" << G4endl;
      for (G4int i=0; i<Nbin; i++)
        {
-         G4cout << "Y[" << i+1 << "] = " << Yvalue[i] << ";" << endl;
+         G4cout << "Y[" << i+1 << "] = " << Yvalue[i] << ";" << G4endl;
        } 
-     G4cout << "XA = " << Xstart << ";" << endl;
-     G4cout << "STEP2 = " << Xbin/2. << ";" << endl;
-     G4cout << "for(I=1; I<=" << Nbin << "; I++) {" << endl;
-     G4cout << "XA = XA + STEP2;" << endl;
-     G4cout << name << iplot << "->Fill(XA,Y[I]);" << endl;
-     G4cout << "XA = XA + STEP2;" << endl;
-     G4cout << "}" << endl;
+     G4cout << "XA = " << Xstart << ";" << G4endl;
+     G4cout << "STEP2 = " << Xbin/2. << ";" << G4endl;
+     G4cout << "for(I=1; I<=" << Nbin << "; I++) {" << G4endl;
+     G4cout << "XA = XA + STEP2;" << G4endl;
+     G4cout << name << iplot << "->Fill(XA,Y[I]);" << G4endl;
+     G4cout << "XA = XA + STEP2;" << G4endl;
+     G4cout << "}" << G4endl;
      return;                         
    }
 
@@ -343,7 +343,7 @@ G4HEPlot::GetFromFile(G4int aPlot, G4String aName)
        }
      else
        {
-         G4cout << " File " << aName << " not found " << endl;
+         G4cout << " File " << aName << " not found " << G4endl;
        }
      return;
    }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
index 4be7094c03..ebf5a36044 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEProtonInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEProtonInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -41,7 +41,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
     SetParticles();
 
     if(verboseLevel > 1)
-      G4cout << "Z , A = " << atomicNumber << "  " << atomicWeight << endl;
+      G4cout << "Z , A = " << atomicNumber << "  " << atomicWeight << G4endl;
 
     G4int    incidentCode          = incidentParticle.getCode();
     G4double incidentMass          = incidentParticle.getMass();
@@ -51,23 +51,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEProtonInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEProtonInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEProtonInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEProtonInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName() << " " 
              << "mass "              << incidentMass << " " 
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -81,7 +81,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << " " << excitationEnergyGNP << " "
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -118,7 +118,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -128,7 +128,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                             incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -170,7 +170,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -232,7 +232,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -254,7 +254,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -290,7 +290,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-           G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                                            // charge exchange  pi+ n -> pi0 p
                pv[0] = PionZero;
@@ -355,7 +355,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -370,7 +370,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-2); nm<=np; nm++ ) 
+                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -379,7 +379,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -401,7 +401,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -410,7 +410,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -513,7 +513,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
index f305e39377..ad6590a3b3 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HESigmaMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HESigmaMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHESigmaMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHESigmaMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HESigmaMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HESigmaMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                 incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -339,7 +339,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -354,7 +354,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -363,7 +363,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -394,7 +394,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -522,7 +522,7 @@ G4HESigmaMinusInelastic::FirstIntInCasSigmaMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getCode() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
index 34c0c64bad..3f7f99ea91 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HESigmaPlusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HESigmaPlusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHESigmaPlusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHESigmaPlusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HESigmaPlusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HESigmaPlusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
 
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -339,7 +339,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -354,7 +354,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -363,7 +363,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -385,7 +385,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -394,7 +394,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -522,7 +522,7 @@ G4HESigmaPlusInelastic::FirstIntInCasSigmaPlus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
index faa0177088..1e7fa79ff6 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
index 92fec409dc..f47172afd1 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEVector.cc,v 1.2.8.1 1999/12/07 20:52:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEVector.cc,v 1.2.8.1.2.3 1999/12/13 16:33:53 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -79,14 +79,14 @@ G4String G4HEVector::getParticleName(G4int aCode, G4int aBaryon)
         else if(aCode == 22) name = "Gamma";
         else
           {
-               G4cout << "particle " << aCode << "  "  <<aBaryon<< " not known in this generator!!" << endl;
+               G4cout << "particle " << aCode << "  "  <<aBaryon<< " not known in this generator!!" << G4endl;
           }
         return name;
    } 
 
 
 void 
-G4HEVector::setMomentum( G4ParticleMomentum mom ) 
+G4HEVector::setMomentum(const G4ParticleMomentum mom ) 
    {
       px  = mom.x();
       py  = mom.y();
@@ -95,13 +95,33 @@ G4HEVector::setMomentum( G4ParticleMomentum mom )
    }
 
 void 
-G4HEVector::setMomentumAndUpdate( G4ParticleMomentum mom )
+G4HEVector::setMomentum(const G4ParticleMomentum * mom ) 
+   {
+      px  = mom->x();
+      py  = mom->y();
+      pz  = mom->z(); 
+      return; 
+   }
+
+void 
+G4HEVector::setMomentumAndUpdate( const G4ParticleMomentum mom )
    {
      px = mom.x();
      py = mom.y();
      pz = mom.z();
      energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
+     return;
+   }
+
+void 
+G4HEVector::setMomentumAndUpdate( const G4ParticleMomentum * mom )
+   {
+     px = mom->x();
+     py = mom->y();
+     pz = mom->z();
+     energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
+     kineticEnergy = G4std::max(0.,energy - mass);
      return;
    }
 
@@ -137,7 +157,7 @@ G4HEVector::setMomentumAndUpdate( G4double x, G4double y, G4double z )
      py = y;
      pz = z;
      energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -155,7 +175,7 @@ G4HEVector::setMomentumAndUpdate( G4double x, G4double y )
      px = x;
      py = y;
      energy = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -171,7 +191,7 @@ G4HEVector::setMomentumAndUpdate( G4double z )
    {
      pz = z;
      energy = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -285,10 +305,10 @@ G4HEVector::setMass( G4double m )
 void 
 G4HEVector::setMassAndUpdate( G4double m )
    {
-     kineticEnergy = max(0., energy - mass);
+     kineticEnergy = G4std::max(0., energy - mass);
      mass = m;
      energy = kineticEnergy + mass;
-     G4double momnew = sqrt(max(0., energy*energy - mass*mass));
+     G4double momnew = sqrt(G4std::max(0., energy*energy - mass*mass));
      if ( momnew == 0.0) 
         {
          px = 0.;
@@ -483,7 +503,7 @@ G4HEVector::Add( const G4HEVector & p1, const G4HEVector & p2 )
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      charge        = p1.charge + p2.charge;
      code          = 0;
      particleName  = "";
@@ -503,7 +523,7 @@ G4HEVector::Sub( const G4HEVector & p1, const G4HEVector & p2 )
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      charge        = p1.charge - p2.charge;
      code          = 0;
      particleName  = "";
@@ -521,7 +541,7 @@ G4HEVector::Lor( const G4HEVector & p1, const G4HEVector & p2 )
      pz = p1.pz + a*p2.pz; 
      energy = sqrt( sqr(p1.mass) + px*px + py*py + pz*pz);
      mass = p1.mass;
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      timeOfFlight  = p1.timeOfFlight;
      side          = p1.side;
      flag          = p1.flag;
@@ -1038,7 +1058,7 @@ G4HEVector::setDefinition(G4String name)
           }
         else
           {
-               G4cout << "particle " << name << " not known in this generator!!" << endl;
+               G4cout << "particle " << name << " not known in this generator!!" << G4endl;
                return;
           }
         px = 0.;
@@ -1201,7 +1221,7 @@ G4HEVector::Print( G4int L)
           << L << " " << px << " " <<  py << " " <<  pz << " "
           << energy << " " << mass << " " << charge << " " 
           << timeOfFlight << " " << side << " " << flag << " " 
-	  << code << " " << baryon << " " << particleName << endl;
+	  << code << " " << baryon << " " << particleName << G4endl;
      /*
      printf("HEV: %3d %6f.2 %6f.2 %6f.2 %6f.2 %6f.2 %3f.0 %4f.1 %3d
              %3d %6d %6d %s \n", L, px, py, pz, energy, mass, charge,
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
index 496a0d7bce..aef714d0de 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEXiMinusInelastic.cc,v 1.2.8.1 1999/12/07 20:52:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEXiMinusInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEXiMinusInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEXiMinusInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEXiMinusInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEXiMinusInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
     
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                              incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -372,7 +372,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -387,7 +387,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -396,7 +396,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -427,7 +427,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -532,7 +532,7 @@ G4HEXiMinusInelastic::FirstIntInCasXiMinus( G4bool &inElastic,
             { 
               G4cout << pv[i].getName() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
index 0e853a6ff0..207b30a1e2 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEXiZeroInelastic.cc,v 1.2.8.1 1999/12/07 20:52:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HEXiZeroInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
@@ -47,23 +47,23 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if(incidentKineticEnergy < 1.)
       { 
-        G4cout << "GHEXiZeroInelastic: incident energy < 1 GeV" << endl;
+        G4cout << "GHEXiZeroInelastic: incident energy < 1 GeV" << G4endl;
       }
     if(verboseLevel > 1)
       {
-        G4cout << "G4HEXiZeroInelastic::ApplyYourself" << endl;
+        G4cout << "G4HEXiZeroInelastic::ApplyYourself" << G4endl;
         G4cout << "incident particle " << incidentParticle.getName()
              << "mass "              << incidentMass
              << "kinetic energy "    << incidentKineticEnergy
-             << endl;
+             << G4endl;
         G4cout << "target material with (A,Z) = (" 
-             << atomicWeight << "," << atomicNumber << ")" << endl;
+             << atomicWeight << "," << atomicNumber << ")" << G4endl;
       }
 
     G4double inelasticity  = NuclearInelasticity(incidentKineticEnergy, 
                                                  atomicWeight, atomicNumber);
     if(verboseLevel > 1)
-        G4cout << "nuclear inelasticity = " << inelasticity << endl;
+        G4cout << "nuclear inelasticity = " << inelasticity << G4endl;
     
     incidentKineticEnergy -= inelasticity;
     
@@ -76,7 +76,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                                                excitationEnergyDTA);
     if(verboseLevel > 1)
       G4cout << "nuclear excitation = " << excitation << excitationEnergyGNP 
-           << excitationEnergyDTA << endl;             
+           << excitationEnergyDTA << G4endl;             
 
 
     incidentKineticEnergy -= excitation;
@@ -113,7 +113,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
         
     if(verboseLevel > 1)
       G4cout << "ApplyYourself: CallFirstIntInCascade for particle "
-           << incidentCode << endl;
+           << incidentCode << G4endl;
 
     G4bool successful = false; 
     
@@ -123,7 +123,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
                             incidentParticle, targetParticle, atomicWeight);
 
         if(verboseLevel > 1)
-	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << endl;  
+	   G4cout << "ApplyYourself::StrangeParticlePairProduction" << G4endl;  
 
 
         if ((vecLength > 0) && (availableEnergy > 1.)) 
@@ -165,7 +165,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
 
     if (!successful)
       { 
-        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << endl;
+        G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
       FillParticleChange(pv,  vecLength);
       delete [] pv;
@@ -226,7 +226,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -247,7 +247,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -280,7 +280,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
    if( !inElastic ) 
      {                                     // quasi-elastic scattering, no pions produced
        G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-       G4int iplab = G4int( min( 9.0, incidentTotalMomentum*2.5 ) );
+       G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
        if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
          {                                           
            G4double ran = G4UniformRand();
@@ -382,7 +382,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
 
    for( nt=1; nt<=numSec; nt++ ) 
      {
-       test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+       test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
        dum = M_PI*nt/(2.0*n*n);
        if( fabs(dum) < 1.0 )
          if( test >= 1.0e-10 )anpn += dum*test;
@@ -397,7 +397,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-2); nm<=np; nm++ ) 
+            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -406,7 +406,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>0) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
@@ -428,7 +428,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -437,7 +437,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
                           nt = np+nm+nz;
                           if( (nt>=1) && (nt<=numSec) ) 
                             {
-                              test = exp( min( expxu, max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                              test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                               dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                               if( fabs(dum) < 1.0 ) 
                                   if( test >= 1.0e-10 )excs += dum*test;
@@ -542,7 +542,7 @@ G4HEXiZeroInelastic::FirstIntInCasXiZero( G4bool &inElastic,
             { 
               G4cout << pv[i].getCode() << " " ;
             }
-         G4cout << endl;
+         G4cout << G4endl;
       }
    return;
  }
diff --git a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoProdCrossSections.hh b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoProdCrossSections.hh
index 7ae441f124..aca1744a05 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoProdCrossSections.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoProdCrossSections.hh
@@ -9,7 +9,7 @@ class G4NeutronIsoProdCrossSections
 public:
   G4NeutronIsoProdCrossSections(G4String aString)
   { theProductName=aString; }
-  void Init(ifstream & aDataSet);
+  void Init(G4std::ifstream & aDataSet);
   G4double GetProductionCrossSection(G4double anEnergy);
   G4String GetProductIsotope();
 
diff --git a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
index 6b3b26a0aa..69359fbe2d 100644
--- a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
+++ b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
@@ -45,7 +45,7 @@ Init(G4int A, G4int Z, G4double frac)
   G4int total;
   if(hasInelasticData)
   {
-    ifstream aDataSet(aName, ios::in);
+    G4std::ifstream aDataSet(aName, G4std::ios::in);
     aDataSet >> dummy >> dummy >> total;
     inelasticData.Init(aDataSet, total, eV);
   }
@@ -56,7 +56,7 @@ Init(G4int A, G4int Z, G4double frac)
   G4NeutronHPVector captureData;
   if(hasCaptureData)
   {
-    ifstream aDataSet(aName, ios::in);
+    G4std::ifstream aDataSet(aName, G4std::ios::in);
     aDataSet >> dummy >> dummy >> total;
     captureData.Init(aDataSet, total, eV);
   }
@@ -67,7 +67,7 @@ Init(G4int A, G4int Z, G4double frac)
   G4NeutronHPVector elasticData;
   if(hasElasticData)
   {
-    ifstream aDataSet(aName, ios::in);
+    G4std::ifstream aDataSet(aName, G4std::ios::in);
     aDataSet >> dummy >> dummy >> total;
     elasticData.Init(aDataSet, total, eV);
   }
@@ -81,7 +81,7 @@ Init(G4int A, G4int Z, G4double frac)
   G4NeutronHPVector fissionData;
   if(hasFissionData)
   {
-    ifstream aDataSet(aName, ios::in);
+    G4std::ifstream aDataSet(aName, G4std::ios::in);
     aDataSet >> dummy >> dummy >> total;
     fissionData.Init(aDataSet, total, eV);
   }
@@ -140,7 +140,7 @@ Init(G4int A, G4int Z, G4double frac)
   aName = dataUsed.GetName();
   if(hasIsotopeProductionData)
   {
-    ifstream aDataSet(aName, ios::in);
+    G4std::ifstream aDataSet(aName, G4std::ios::in);
     aDataSet>>theNumberOfProducts;
     theProductionData = new G4NeutronIsoProdCrossSections * [theNumberOfProducts];
     for(G4int i=0; i<theNumberOfProducts; i++)
diff --git a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoProdCrossSections.cc b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoProdCrossSections.cc
index 152b3dc261..0465b0cdaf 100644
--- a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoProdCrossSections.cc
+++ b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoProdCrossSections.cc
@@ -1,7 +1,7 @@
 #include "G4NeutronIsoProdCrossSections.hh"
 
 void G4NeutronIsoProdCrossSections::
-Init(ifstream & aDataSet)
+Init(G4std::ifstream & aDataSet)
 {
   G4int aNumberOfPoints;
   aDataSet>>aNumberOfPoints;
diff --git a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
index 9138b73946..7ee28ab7b7 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LCapture.hh,v 1.3.2.1 1999/12/07 20:52:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Low energy model: neutron capture -- header file
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
index 640f30afce..82b3d35e31 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAlphaInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy Alpha Inelastic Process
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
index bda40a68e9..77190f4422 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiLambdaInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
index c8b1fb55ba..d3ca228331 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiNeutronInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
index 1f287cf004..e3fc009775 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiOmegaMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
index b648482c27..bf9ea7468b 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiProtonInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
index 1aaba8e865..b8fd924f75 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiSigmaMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
index 4645cd2c81..7cc0f1724b 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiSigmaPlusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
index 12ab21ecd4..7d545f61e0 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiXiMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
index bff6f856b4..44930d9978 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiXiZeroInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
index 5a85d77643..81208c6548 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEDeuteronInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy Deuteron Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
index e81457d613..b8cbefb818 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
index 60749d8365..959c521a22 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonPlusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
index 9c3b4874d9..2388cb2b80 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonZeroLInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonZeroL Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
index 414bc5d8f4..f61a0ee176 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonZeroSInelastic.hh,v 1.1.10.1 1999/12/07 20:52:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonZeroS Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
index e74a1f9f8f..c9a8584686 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LELambdaInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
index c849edcd81..5eb643613c 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEOmegaMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
index b39611d7ee..2577979d62 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEPionMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy PionMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
index a7f76034e4..f578853ff5 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEPionPlusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
index d08ddba472..3033c0e40f 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEProtonInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy Proton Inelastic Process
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
index 34d01873dd..9915a066d2 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LESigmaMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy SigmaMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
index 4dcf3bff5a..32aaca4855 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LESigmaPlusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy SigmaPlus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
index 7461102e48..e95a89546b 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LETritonInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
index 1fe3872c42..bf651b7bab 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEXiMinusInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy XiMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
index 968e176368..cc622ea9f2 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEXiZeroInelastic.hh,v 1.1.10.1 1999/12/07 20:52:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy XiZero Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
index d9fefb2cb4..41017ad0d4 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LElastic.hh,v 1.3.2.1 1999/12/07 20:52:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Model: Low energy elastic scattering -- header file
diff --git a/source/processes/hadronic/models/low_energy/include/G4LFission.hh b/source/processes/hadronic/models/low_energy/include/G4LFission.hh
index 7a0937c019..daaab2bf43 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LFission.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LFission.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LFission.hh,v 1.3.2.1 1999/12/07 20:52:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Low-energy Model: Fission -- header file
diff --git a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
index e910d83678..9c23103d84 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LCapture.cc,v 1.2.4.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LCapture.cc,v 1.2.4.1.2.1 1999/12/08 17:34:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Model: Low-energy Neutron Capture
@@ -61,22 +61,22 @@ G4LCapture::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    G4double Q = aParticle->GetDefinition()->GetPDGCharge();
    G4double pv6 = aParticle->GetDefinition()->GetPDGCharge();
    if (verboseLevel > 1) {
-      G4cout << "G4LCapture:ApplyYourself: incident particle:" << endl;
-      G4cout << "P      " << P << " GeV/c" << endl;
-      G4cout << "Px     " << Px << " GeV/c" << endl;
-      G4cout << "Py     " << Py << " GeV/c" << endl;
-      G4cout << "Pz     " << Pz << " GeV/c" << endl;
-      G4cout << "E      " << E << " GeV" << endl;
-      G4cout << "mass   " << E0 << " GeV" << endl;
-      G4cout << "charge " << Q << endl;
+      G4cout << "G4LCapture:ApplyYourself: incident particle:" << G4endl;
+      G4cout << "P      " << P << " GeV/c" << G4endl;
+      G4cout << "Px     " << Px << " GeV/c" << G4endl;
+      G4cout << "Py     " << Py << " GeV/c" << G4endl;
+      G4cout << "Pz     " << Pz << " GeV/c" << G4endl;
+      G4cout << "E      " << E << " GeV" << G4endl;
+      G4cout << "mass   " << E0 << " GeV" << G4endl;
+      G4cout << "charge " << Q << G4endl;
    }
 // GHEISHA ADD operation to get total energy, mass, charge:
    if (verboseLevel > 1) {
-      G4cout << "G4LCapture:ApplyYourself: material:" << endl;
-      G4cout << "A      " << N << endl;
-      G4cout << "Z   " << Z  << endl;
+      G4cout << "G4LCapture:ApplyYourself: material:" << G4endl;
+      G4cout << "A      " << N << G4endl;
+      G4cout << "Z   " << Z  << G4endl;
       G4cout << "atomic mass " << 
-        Atomas(N, Z) << "GeV" << endl;
+        Atomas(N, Z) << "GeV" << G4endl;
    }
    E = E + Atomas(N, Z);
    G4double E02 = E*E - P*P;
@@ -84,10 +84,10 @@ G4LCapture::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    if (E02 < 0) E0 = -E0;
    Q = Q + Z;
    if (verboseLevel > 1) {
-      G4cout << "G4LCapture:ApplyYourself: total:" << endl;
-      G4cout << "E      " << E << " GeV" << endl;
-      G4cout << "mass   " << E0 << " GeV" << endl;
-      G4cout << "charge " << Q << endl;
+      G4cout << "G4LCapture:ApplyYourself: total:" << G4endl;
+      G4cout << "E      " << E << " GeV" << G4endl;
+      G4cout << "mass   " << E0 << " GeV" << G4endl;
+      G4cout << "charge " << Q << G4endl;
    }
    Px = -Px;
    Py = -Py;
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
index c0e73277d3..96f18a5fe2 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAlphaInelastic.cc,v 1.1.10.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAlphaInelastic.cc,v 1.1.10.1.2.1 1999/12/08 17:34:52 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Alpha Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
@@ -29,9 +29,9 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAlphaInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAlphaInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetc energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
-      G4cout << "target material = " << targetMaterial->GetName() << endl;
+      G4cout << "target material = " << targetMaterial->GetName() << G4endl;
     }
     
     // Work-around for lack of model above 100 MeV
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
index 2a7197dab7..f249a0fe1b 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiLambdaInelastic.cc,v 1.1.10.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiLambdaInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
@@ -31,11 +31,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiLambdaInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiLambdaInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -85,7 +85,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     if( (originalIncident->GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
              originalIncident, currentParticle, targetParticle,
@@ -156,7 +156,7 @@
       G4int counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-2); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -177,7 +177,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+2); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+2); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -283,7 +283,7 @@
         G4int counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -292,7 +292,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -311,7 +311,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 4, max( 1, np-nm+2 ) );
+        G4int ncht = G4std::min( 4, G4std::max( 1, np-nm+2 ) );
         switch( ncht )
         {
          case 1:
@@ -388,7 +388,7 @@
         G4int counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -397,7 +397,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -416,7 +416,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 4, max( 1, np-nm+3 ) );
+        G4int ncht = G4std::min( 4, G4std::max( 1, np-nm+3 ) );
         switch( ncht )
         {
          case 1:
@@ -516,7 +516,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmulA[counter]*protnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -542,7 +542,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmulA[counter]*neutnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
index 5630960ede..c1d50a0309 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiNeutronInelastic.cc,v 1.1.10.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiNeutronInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
@@ -33,11 +33,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiNeutronInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiNeutronInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -87,7 +87,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1*MeV;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) ||
         (G4UniformRand() > anni) )
@@ -162,7 +162,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -183,7 +183,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -289,7 +289,7 @@
         np = nm = nz = 0;
         if( targetParticle.GetDefinition() == aProton )
         {
-          test = exp( min( expxu, max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
           w0 = test;
           wp = test;
           if( G4UniformRand() < w0/(w0+wp) )
@@ -299,10 +299,10 @@
         }
         else  // target is a neutron
         {
-          test = exp( min( expxu, max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
           w0 = test;
           wp = test;
-          test = exp( min( expxu, max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
           wm = test;
           wt = w0+wp+wm;
           wp += w0;
@@ -326,7 +326,7 @@
           counter = -1;
           for( np=0; np<numSec/3 && ran>=excs; ++np )
           {
-            for( nm=max(0,np-2); nm<=np && ran>=excs; ++nm )
+            for( nm=G4std::max(0,np-2); nm<=np && ran>=excs; ++nm )
             {
               for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
               {
@@ -335,7 +335,7 @@
                   nt = np+nm+nz;
                   if( nt > 0 )
                   {
-                    test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                    test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                     dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                     if( fabs(dum) < 1.0 )
                     {
@@ -360,7 +360,7 @@
           counter = -1;
           for( np=0; np<numSec/3 && ran>=excs; ++np )
           {
-            for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+            for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
             {
               for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
               {
@@ -369,7 +369,7 @@
                   nt = np+nm+nz;
                   if( (nt>=1) && (nt<=numSec) )
                   {
-                    test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                    test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                     dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                     if( fabs(dum) < 1.0 )
                     {
@@ -467,7 +467,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmulA[counter]*protnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -493,7 +493,7 @@
               nt = np+nm+nz;
               if( (nt>1) && (nt<=numSec) )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmulA[counter]*neutnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
index 74efe42dba..f591c7c9ed 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -39,7 +39,7 @@
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -88,7 +88,7 @@
     vec.Initialize( 0 );
         
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
@@ -161,7 +161,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -222,7 +222,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -231,7 +231,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -291,7 +291,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
index e3472713e2..7e60e43caf 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiProtonInelastic.cc,v 1.1.10.1 1999/12/07 20:52:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiProtonInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 13-Feb-1997
@@ -33,11 +33,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiProtonInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiProtonInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -86,7 +86,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*originalIncident->GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*originalIncident->GetTotalMomentum()/GeV, 0.4 );
     
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) ||
         (G4UniformRand() > anni) )
@@ -161,7 +161,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -290,10 +290,10 @@
         np = nm = nz = 0;
         if( targetParticle.GetDefinition() == aProton )
         {
-          test = exp( min( expxu, max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
           w0 = test;
           wp = test;        
-          test = exp( min( expxu, max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
           wm = test;
           wt = w0+wp+wm;
           wp += w0;
@@ -307,9 +307,9 @@
         }
         else  // target is a neutron
         {
-          test = exp( min( expxu, max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
           w0 = test;
-          test = exp( min( expxu, max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
+          test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
           wm = test;
           G4double ran = G4UniformRand();
           if( ran < w0/(w0+wm) )
@@ -329,7 +329,7 @@
           counter = -1;
           for( np=0; np<numSec/3 && ran>=excs; ++np )
           {
-            for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+            for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
             {
               for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
               {
@@ -338,7 +338,7 @@
                   nt = np+nm+nz;
                   if( (nt>0) && (nt<=numSec) )
                   {
-                    test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                    test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                     dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                     if( fabs(dum) < 1.0 )
                     {
@@ -371,7 +371,7 @@
                   nt = np+nm+nz;
                   if( (nt>0) && (nt<=numSec) )
                   {
-                    test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                    test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                     dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                     if( fabs(dum) < 1.0 )
                     {
@@ -469,7 +469,7 @@
               nt = np+nm+nz;
               if( (nt>1) && (nt<=numSec) )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmulA[counter]*protnormA[nt-1]/(2.0*n*n);
                 if( abs(dum) < 1.0 )
                 {
@@ -495,7 +495,7 @@
               nt = np+nm+nz;
               if( (nt>1) && (nt<=numSec) )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmulA[counter]*neutnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
index dc8fcdfbc1..9636db9ada 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
@@ -33,11 +33,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiSigmaMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiSigmaMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -86,7 +86,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
                originalIncident, currentParticle, targetParticle,
@@ -157,7 +157,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -178,7 +178,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -280,7 +280,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-2); nm<=np && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-2); nm<=np && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -289,7 +289,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -308,7 +308,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 3, max( 1, np-nm+1 ) );
+        G4int ncht = G4std::min( 3, G4std::max( 1, np-nm+1 ) );
         switch( ncht )
         {
          case 1:
@@ -344,7 +344,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -353,7 +353,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -372,7 +372,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 3, max( 1, np-nm+2 ) );
+        G4int ncht = G4std::min( 3, G4std::max( 1, np-nm+2 ) );
         switch( ncht )
         {
          case 1:
@@ -437,7 +437,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmulA[counter]*protnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -469,7 +469,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmulA[counter]*neutnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
index ebb58ba408..d30e1c92e2 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
@@ -32,11 +32,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiSigmaPlusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiSigmaPlusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -85,7 +85,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
                originalIncident, currentParticle, targetParticle,
@@ -156,7 +156,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -280,7 +280,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -289,7 +289,7 @@
                 nt = np+nm+nz;
                 if( (nt>0) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -308,7 +308,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 3, max( 1, np-nm+2 ) );
+        G4int ncht = G4std::min( 3, G4std::max( 1, np-nm+2 ) );
         switch( ncht )
         {
          case 1:
@@ -350,7 +350,7 @@
                 nt = np+nm+nz;
                 if( (nt>0) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -369,7 +369,7 @@
           return;
         }
         np--; nm--; nz--;
-        G4int ncht = min( 3, max( 1, np-nm+3 ) );
+        G4int ncht = G4std::min( 3, G4std::max( 1, np-nm+3 ) );
         switch( ncht )
         {
          case 1:
@@ -438,7 +438,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmulA[counter]*protnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -470,7 +470,7 @@
               nt = np+nm+nz;
               if( nt>1 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmulA[counter]*neutnormA[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
index 2e46d6b74b..5fc7a9b92a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiXiMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiXiMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -36,11 +36,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiXiMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiXiMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -89,7 +89,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
                originalIncident, currentParticle, targetParticle,
@@ -161,7 +161,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -224,7 +224,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -233,7 +233,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -310,7 +310,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
index 22b7a308f8..a936337cf8 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEAntiXiZeroInelastic.cc,v 1.1.10.1 1999/12/07 20:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEAntiXiZeroInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -35,11 +35,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEAntiXiZeroInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEAntiXiZeroInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -88,7 +88,7 @@
     vec.Initialize( 0 );
     
     const G4double cutOff = 0.1;
-    const G4double anni = min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
+    const G4double anni = G4std::min( 1.3*currentParticle.GetTotalMomentum()/GeV, 0.4 );
     if( (currentParticle.GetKineticEnergy()/MeV > cutOff) || (G4UniformRand() > anni) )
       Cascade( vec, vecLen,
                originalIncident, currentParticle, targetParticle,
@@ -160,7 +160,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-2); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -181,7 +181,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+2); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+2); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -223,7 +223,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -232,7 +232,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -300,7 +300,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -309,7 +309,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
index b810686434..2a6123bbc7 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEDeuteronInelastic.cc,v 1.1.10.1 1999/12/07 20:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEDeuteronInelastic.cc,v 1.1.10.1.2.1 1999/12/08 17:34:54 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Deuteron Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
@@ -27,7 +27,7 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEDeuteronInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEDeuteronInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
     }
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
index d8a76742ce..fec9da53da 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEKaonMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEKaonMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
@@ -35,11 +35,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEKaonMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEKaonMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy() << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     G4ReactionProduct currentParticle( originalIncident->GetDefinition() );
     currentParticle.SetMomentum( originalIncident->GetMomentum() );
@@ -155,7 +155,7 @@
       G4int counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -214,11 +214,11 @@
     G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
     G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
     const G4double cech[] = {1.,1.,1.,0.70,0.60,0.55,0.35,0.25,0.18,0.15};
-    G4int iplab = min( 9.0, pOriginal/GeV*5.0 );
+    G4int iplab = G4std::min( 9.0, pOriginal/GeV*5.0 );
     if( (pOriginal <= 2.0*GeV) && (G4UniformRand() < cech[iplab]) )
     {
       np = nm = nz = nt = 0;
-      iplab = min( 19.0, pOriginal/GeV*10.0 );
+      iplab = G4std::min( 19.0, pOriginal/GeV*10.0 );
       const G4double cnk0[] = {0.17,0.18,0.17,0.24,0.26,0.20,0.22,0.21,0.34,0.45,
                                0.58,0.55,0.36,0.29,0.29,0.32,0.32,0.33,0.33,0.33};
       if( G4UniformRand() <= cnk0[iplab] )
@@ -293,7 +293,7 @@
         G4int counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -302,7 +302,7 @@
                 nt = np+nm+nz;
                 if( nt > 0 )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -356,7 +356,7 @@
                 nt = np+nm+nz;
                 if( (nt>=1) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
index d096eb26c9..73ea4fb7d8 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEKaonPlusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEKaonPlusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Feb-1997
@@ -34,11 +34,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEKaonPlusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEKaonPlusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy() << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }    
     G4ReactionProduct currentParticle( originalIncident->GetDefinition() );
     currentParticle.SetMomentum( originalIncident->GetMomentum() );
@@ -158,7 +158,7 @@
       G4int counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -179,7 +179,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -219,7 +219,7 @@
       nm = np = nz = 0;
       if( targetParticle.GetDefinition() == aProton )
       {
-        test = exp( min( expxu, max( expxl, -sqr(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test*2.0;        
         if( G4UniformRand() < w0/(w0+wp) )
@@ -229,10 +229,10 @@
       }
       else  // target is a neutron
       {
-        test = exp( min( expxu, max( expxl, -sqr(1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test;
-        test = exp( min( expxu, max( expxl, -sqr(-1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(-1.0+b[1])/(2.0*c*c) ) ) );
         wm = test;
         wt = w0+wp+wm;
         wp += w0;
@@ -256,7 +256,7 @@
         G4int counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np )
         {
-          for( nm=max(0,np-2); (nm<=np) && (ran>=excs); ++nm )
+          for( nm=G4std::max(0,np-2); (nm<=np) && (ran>=excs); ++nm )
           {
             for( nz=0; (nz<numSec/3) && (ran>=excs); ++nz )
             {
@@ -265,7 +265,7 @@
                 nt = np+nm+nz;
                 if( nt > 0 )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -286,7 +286,7 @@
         G4int counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np )
         {
-          for( nm=max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm )
+          for( nm=G4std::max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm )
           {
             for( nz=0; (nz<numSec/3) && (ran>=excs); ++nz )
             {
@@ -295,7 +295,7 @@
                 nt = np+nm+nz;
                 if( (nt>=1) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
index d7bf5e4f9a..371f478bd0 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEKaonZeroLInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEKaonZeroLInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonZeroLong Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
@@ -31,11 +31,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEKaonZeroLInelastic::ApplyYourself called" << endl;    
+      G4cout << "G4LEKaonZeroLInelastic::ApplyYourself called" << G4endl;    
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -150,7 +150,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -171,7 +171,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -210,11 +210,11 @@
     G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
     G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
     const G4double cech[] = {1.,1.,1.,0.70,0.60,0.55,0.35,0.25,0.18,0.15};
-    G4int iplab = min( 9.0, 5.0*pOriginal*MeV/GeV );
+    G4int iplab = G4std::min( 9.0, 5.0*pOriginal*MeV/GeV );
     if( (pOriginal*MeV/GeV <= 2.0) && (G4UniformRand() < cech[iplab]) )
     {
       np = nm = nz = nt = 0;
-      iplab = min( 19.0, pOriginal*MeV/GeV*10.0 );
+      iplab = G4std::min( 19.0, pOriginal*MeV/GeV*10.0 );
       const G4double cnk0[] = {0.17,0.18,0.17,0.24,0.26,0.20,0.22,0.21,0.34,0.45,
                                0.58,0.55,0.36,0.29,0.29,0.32,0.32,0.33,0.33,0.33};
       if( G4UniformRand() > cnk0[iplab] )
@@ -289,7 +289,7 @@
         counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np )
         {
-          for( nm=max(0,np-2); nm<=np && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-2); nm<=np && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -298,7 +298,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -345,7 +345,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -354,7 +354,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
index 35e6162b2f..874c8b7e91 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEKaonZeroSInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEKaonZeroSInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Low Energy KaonZeroShort Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
@@ -31,11 +31,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEKaonZeroSInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEKaonZeroSInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -153,7 +153,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -174,7 +174,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -216,9 +216,9 @@
       nm = np = nz = 0;
       if( targetParticle.GetDefinition() == aNeutron )
       {
-        test = exp( min( expxu, max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test/2.0;
-        test = exp( min( expxu, max( expxl, -(-1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
         wm = test*1.5;
         if( G4UniformRand() < w0/(w0+wm) )
           nz = 1;
@@ -227,10 +227,10 @@
       }
       else  // target is a proton
       {
-        test = exp( min( expxu, max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test;
-        test = exp( min( expxu, max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
         wm = test;
         wt = w0+wp+wm;
         wp += w0;
@@ -254,7 +254,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -263,7 +263,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -288,7 +288,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-2); nm<=np && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-2); nm<=np && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -297,7 +297,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
index da66e89e7e..ce875d5967 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LELambdaInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LELambdaInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
@@ -31,11 +31,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LELambdaInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LELambdaInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }    
     //
     // Fermi motion and evaporation
@@ -153,7 +153,7 @@
       for( i=0; i<numSec; ++i )protnorm[i] = 0.0;
       counter = -1;
       for( np=0; np<(numSec/3); ++np ) {
-        for( nm=max(0,np-2); nm<=(np+1); ++nm ) {
+        for( nm=G4std::max(0,np-2); nm<=(np+1); ++nm ) {
           for( nz=0; nz<numSec/3; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
@@ -169,7 +169,7 @@
       for( i=0; i<numSec; ++i )neutnorm[i] = 0.0;
       counter = -1;
       for( np=0; np<numSec/3; ++np ) {
-        for( nm=max(0,np-1); nm<=(np+2); ++nm ) {
+        for( nm=G4std::max(0,np-1); nm<=(np+2); ++nm ) {
           for( nz=0; nz<numSec/3; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
@@ -205,12 +205,12 @@
     if( targetParticle.GetDefinition() == aProton ) {
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np ) {
-        for( nm=max(0,np-2); nm<=(np+1) && ran>=excs; ++nm ) {
+        for( nm=G4std::max(0,np-2); nm<=(np+1) && ran>=excs; ++nm ) {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec ) {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 ) {
                   if( test >= 1.0e-10 )excs += dum*test;
@@ -228,7 +228,7 @@
         return;
       }
       np--; nm--; nz--;
-      G4int ncht = max( 1, np-nm );
+      G4int ncht = G4std::max( 1, np-nm );
       switch( ncht ) {
        case 1:
          currentParticle.SetDefinitionAndUpdateE( aSigmaPlus );
@@ -272,12 +272,12 @@
     {
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np ) {
-        for( nm=max(0,np-1); nm<=(np+2) && ran>=excs; ++nm ) {
+        for( nm=G4std::max(0,np-1); nm<=(np+2) && ran>=excs; ++nm ) {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec ) {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 ) {
                   if( test >= 1.0e-10 )excs += dum*test;
@@ -295,7 +295,7 @@
         return;
       }
       np--; nm--; nz--;
-      G4int ncht = max( 1, np-nm+3 );
+      G4int ncht = G4std::max( 1, np-nm+3 );
       switch( ncht ) {
        case 1:
          currentParticle.SetDefinitionAndUpdateE( aSigmaPlus );
diff --git a/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
index e5c0a443a4..f18905c68a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LENeutronInelastic.cc,v 1.2.8.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LENeutronInelastic.cc,v 1.2.8.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Low Energy Neutron Inelastic Process
 // J.L. Chuma, TRIUMF, 04-Feb-1997
@@ -31,11 +31,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LENeutronInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LENeutronInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     if( originalIncident->GetKineticEnergy()/MeV < 0.000001 )
       G4Exception("G4LENeutronInelastic: should be capture process!");
@@ -155,7 +155,7 @@
         cost1 = -1.0 + 2.0*G4UniformRand();
         eka = 1.0 + 2.0*cost1*A + A*A;
       }
-      G4double cost = min( 1.0, max( -1.0, (A*cost1+1.0)/sqrt(eka) ) );
+      G4double cost = G4std::min( 1.0, G4std::max( -1.0, (A*cost1+1.0)/sqrt(eka) ) );
       eka /= (1.0+A)*(1.0+A);
       G4double ek = currentKinetic*MeV/GeV;
       G4double amas = currentMass*MeV/GeV;
@@ -292,7 +292,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -355,7 +355,7 @@
       nm = np = nz = 0;
       if( targetParticle.GetDefinition() == aNeutron )
       {
-        test = exp( min( expxu, max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test/2.0;
         wm = test;
         if( G4UniformRand() < w0/(w0+wm) )
@@ -363,10 +363,10 @@
         else
           nm = 1;
       } else { // target is a proton
-        test = exp( min( expxu, max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test/2.0;        
-        test = exp( min( expxu, max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
         wm = test/2.0;
         wt = w0+wp+wm;
         wp += w0;
@@ -388,7 +388,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -397,7 +397,7 @@
                 nt = np+nm+nz;
                 if( nt > 0 )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 ) {
                     if( test >= 1.0e-10 )excs += dum*test;
@@ -428,7 +428,7 @@
                 nt = np+nm+nz;
                 if( (nt>=1) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 ) {
                     if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
index b4ef700006..3f165b22ff 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEOmegaMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEOmegaMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -34,11 +34,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEOmegaMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEOmegaMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy() << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     G4ReactionProduct currentParticle( originalIncident->GetDefinition() );
     currentParticle.SetMomentum( originalIncident->GetMomentum() );
@@ -159,7 +159,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -223,7 +223,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -232,7 +232,7 @@
               nt = np+nm+nz;
               if( nt > 0 )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -266,7 +266,7 @@
               nt = np+nm+nz;
               if( (nt>=1) && (nt<=numSec) )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
index 78332a009f..b52e20fc6a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEPionMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEPionMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: PionMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -34,11 +34,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4PionMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4PionMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy() << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     G4ReactionProduct currentParticle( originalIncident->GetDefinition() );
     currentParticle.SetMomentum( originalIncident->GetMomentum() );
@@ -159,7 +159,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -219,7 +219,7 @@
       // charge exchange reaction is included in inelastic cross section
         
       const G4double cech[] = {1.,0.95,0.79,0.32,0.19,0.16,0.14,0.12,0.10,0.08};
-      G4int iplab = min( 9.0, pOriginal/GeV*5.0 );
+      G4int iplab = G4std::min( 9.0, pOriginal/GeV*5.0 );
       if( G4UniformRand() <= cech[iplab] )
       {
         if( targetParticle.GetDefinition() == aProton )
@@ -235,10 +235,10 @@
       nm = np = nz = 0;
       if( targetParticle.GetDefinition() == aProton )
       {
-        test = exp( min( expxu, max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test;
         wp = 10.0*test;        
-        test = exp( min( expxu, max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[0])*(-1.0+b[0])/(2.0*c*c) ) ) );
         wm = test;
         wt = w0+wp+wm;
         wp += w0;
@@ -252,9 +252,9 @@
       }
       else  // target is a neutron
       {
-        test = exp( min( expxu, max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test;
-        test = exp( min( expxu, max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
         wm = test;
         G4double ran = G4UniformRand();
         if( ran < w0/(w0+wm) )
@@ -274,7 +274,7 @@
         counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np )
         {
-          for( nm=max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm )
+          for( nm=G4std::max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm )
           {
             for( nz=0; (nz<numSec/3) && (ran>=excs); ++nz )
             {
@@ -283,7 +283,7 @@
                 nt = np+nm+nz;
                 if( nt > 0 )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -317,7 +317,7 @@
                 nt = np+nm+nz;
                 if( (nt>=1) && (nt<=numSec) )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
index 2725f37b7f..11308575c5 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEPionPlusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEPionPlusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -34,11 +34,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEPionPlusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEPionPlusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy() << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     G4ReactionProduct currentParticle( originalIncident->GetDefinition() );
     currentParticle.SetMomentum( originalIncident->GetMomentum() );
@@ -156,7 +156,7 @@
       for( i=0; i<numSec; ++i )protnorm[i] = 0.0;
       counter = -1;
       for( np=0; np<(numSec/3); ++np ) {
-        for( nm=max(0,np-2); nm<=np; ++nm ) {
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm ) {
           for( nz=0; nz<numSec/3; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
@@ -172,7 +172,7 @@
       for( i=0; i<numSec; ++i )neutnorm[i] = 0.0;
       counter = -1;
       for( np=0; np<numSec/3; ++np ) {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm ) {
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm ) {
           for( nz=0; nz<numSec/3; ++nz ) {
             if( ++counter < numMul ) {
               nt = np+nm+nz;
@@ -205,7 +205,7 @@
       
       nm = np = nz = 0;
       if( targetParticle.GetDefinition() == aProton ) {
-        test = exp( min( expxu, max( expxl, -sqr(1.0+b[0])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test;        
         if( G4UniformRand() < w0/(w0+wp) )
@@ -213,10 +213,10 @@
         else
           np = 1;
       } else { // target is a neutron
-        test = exp( min( expxu, max( expxl, -sqr(1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test;        
-        test = exp( min( expxu, max( expxl, -sqr(-1.0+b[1])/(2.0*c*c) ) ) );
+        test = exp( G4std::min( expxu, G4std::max( expxl, -sqr(-1.0+b[1])/(2.0*c*c) ) ) );
         wm = test;
         wt = w0+wp+wm;
         wp = w0+wp;
@@ -236,12 +236,12 @@
       if( targetParticle.GetDefinition() == aProton ) {
         counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np ) {
-          for( nm=max(0,np-2); (nm<=np) && (ran>=excs); ++nm ) {
+          for( nm=G4std::max(0,np-2); (nm<=np) && (ran>=excs); ++nm ) {
             for( nz=0; (nz<numSec/3) && (ran>=excs); ++nz ) {
               if( ++counter < numMul ) {
                 nt = np+nm+nz;
                 if( nt > 0 ) {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 ) {
                     if( test >= 1.0e-10 )excs += dum*test;
@@ -262,12 +262,12 @@
       } else { // target must be a neutron
         counter = -1;
         for( np=0; (np<numSec/3) && (ran>=excs); ++np ) {
-          for( nm=max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm ) {
+          for( nm=G4std::max(0,np-1); (nm<=(np+1)) && (ran>=excs); ++nm ) {
             for( nz=0; (nz<numSec/3) && (ran>=excs); ++nz ) {
               if( ++counter < numMul ) {
                 nt = np+nm+nz;
                 if( (nt>=1) && (nt<=numSec) ) {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 ) {
                     if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
index 2136598907..446098337d 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEProtonInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEProtonInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Hadronic Process: Low Energy Proton Inelastic Process
 // J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -29,11 +29,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEProtonInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEProtonInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     if( originalIncident->GetKineticEnergy()/GeV < 0.01+2.*G4UniformRand()/9. )
     {
@@ -209,7 +209,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=np; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=np; ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -232,7 +232,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -272,7 +272,7 @@
       np = nm = nz = 0;
       if( targetParticle.GetDefinition() == aProton )
       {
-        test = exp( min( expxu, max(
+        test = exp( G4std::min( expxu, G4std::max(
          expxl, -(1.0+b[0])*(1.0+b[0])/(2.0*c*c) ) ) );
         w0 = test/2.0;
         wp = test;
@@ -283,11 +283,11 @@
       }
       else // target is a neutron
       {
-        test = exp( min( expxu, max(
+        test = exp( G4std::min( expxu, G4std::max(
          expxl, -(1.0+b[1])*(1.0+b[1])/(2.0*c*c) ) ) );
         w0 = test;
         wp = test/2.0;        
-        test = exp( min( expxu, max(
+        test = exp( G4std::min( expxu, G4std::max(
          expxl, -(-1.0+b[1])*(-1.0+b[1])/(2.0*c*c) ) ) );
         wm = test/2.0;
         wt = w0+wp+wm;
@@ -312,7 +312,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-2); nm<=np && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-2); nm<=np && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -321,7 +321,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
@@ -345,7 +345,7 @@
         counter = -1;
         for( np=0; np<numSec/3 && ran>=excs; ++np )
         {
-          for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+          for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
           {
             for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
             {
@@ -354,7 +354,7 @@
                 nt = np+nm+nz;
                 if( nt>0 && nt<=numSec )
                 {
-                  test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                  test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                   dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                   if( fabs(dum) < 1.0 )
                   {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
index 9ac568a3dc..02569a6442 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LESigmaMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LESigmaMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: SigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
@@ -32,11 +32,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LESigmaMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LESigmaMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -155,7 +155,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -217,7 +217,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -226,7 +226,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -245,7 +245,7 @@
         return;
       }
       np--; nm--; nz--;
-      G4int ncht = max( 1, np-nm+2 );
+      G4int ncht = G4std::max( 1, np-nm+2 );
       switch( ncht )
       {
        case 1:
@@ -287,7 +287,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -306,7 +306,7 @@
         return;
       }
       np--; nm--; nz--;
-      G4int ncht = max( 1, np-nm+3 );
+      G4int ncht = G4std::max( 1, np-nm+3 );
       switch( ncht )
       {
        case 1:
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
index ce7e79b7ce..e95fd9c031 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LESigmaPlusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LESigmaPlusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: SigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
@@ -32,11 +32,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LESigmaPlusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LESigmaPlusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -176,7 +176,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -226,7 +226,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -245,7 +245,7 @@
         return;
       }
       np--; nm--; nz--;
-      switch( min( 3, max( 1, np-nm+3 ) ) )
+      switch( G4std::min( 3, G4std::max( 1, np-nm+3 ) ) )
       {
        case 1:
          if( G4UniformRand() < 0.5 )
@@ -280,7 +280,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -289,7 +289,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -308,7 +308,7 @@
         return;
       }
       np--; nm--; nz--;
-      switch( min( 3, max( 1, np-nm+2 ) ) )
+      switch( G4std::min( 3, G4std::max( 1, np-nm+2 ) ) )
       {
        case 1:
          targetParticle.SetDefinitionAndUpdateE( aProton );
diff --git a/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
index 3b1ab31173..48922c00a7 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LETritonInelastic.cc,v 1.1.10.1 1999/12/07 20:52:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LETritonInelastic.cc,v 1.1.10.1.2.1 1999/12/08 17:34:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
@@ -28,7 +28,7 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LETritonInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LETritonInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
     }
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
index 8f064c82bc..7ec50267a4 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEXiMinusInelastic.cc,v 1.1.10.1 1999/12/07 20:52:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEXiMinusInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: XiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -32,11 +32,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEXiMinusInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEXiMinusInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -155,7 +155,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -218,7 +218,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -227,7 +227,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -304,7 +304,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
index ec933ddf14..e1eaa1a526 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LEXiZeroInelastic.cc,v 1.1.10.1 1999/12/07 20:52:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LEXiZeroInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: XiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
@@ -32,11 +32,11 @@
     if( verboseLevel > 1 )
     {
       G4Material *targetMaterial = aTrack.GetMaterial();
-      G4cout << "G4LEXiZeroInelastic::ApplyYourself called" << endl;
+      G4cout << "G4LEXiZeroInelastic::ApplyYourself called" << G4endl;
       G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
       G4cout << "target material = " << targetMaterial->GetName() << ", ";
       G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
-           << endl;
+           << G4endl;
     }
     //
     // Fermi motion and evaporation
@@ -155,7 +155,7 @@
       counter = -1;
       for( np=0; np<(numSec/3); ++np )
       {
-        for( nm=max(0,np-2); nm<=(np+1); ++nm )
+        for( nm=G4std::max(0,np-2); nm<=(np+1); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -176,7 +176,7 @@
       counter = -1;
       for( np=0; np<numSec/3; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+2); ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+2); ++nm )
         {
           for( nz=0; nz<numSec/3; ++nz )
           {
@@ -218,7 +218,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-2); nm<=(np+1) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -227,7 +227,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
@@ -295,7 +295,7 @@
       counter = -1;
       for( np=0; np<numSec/3 && ran>=excs; ++np )
       {
-        for( nm=max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
+        for( nm=G4std::max(0,np-1); nm<=(np+2) && ran>=excs; ++nm )
         {
           for( nz=0; nz<numSec/3 && ran>=excs; ++nz )
           {
@@ -304,7 +304,7 @@
               nt = np+nm+nz;
               if( nt>0 && nt<=numSec )
               {
-                test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
+                test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
                 dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                 if( fabs(dum) < 1.0 )
                 {
diff --git a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
index b7cc2ba74d..1c4beb5e49 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LElastic.cc,v 1.2.4.1 1999/12/07 20:52:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LElastic.cc,v 1.2.4.1.2.2 1999/12/10 15:42:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Physics model class G4LElastic
 //
@@ -96,7 +96,7 @@ G4LElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
 
    G4double p = aParticle->GetTotalMomentum()/GeV;
    if (verboseLevel > 1)
-      G4cout << "G4LElastic::DoIt: Incident particle p=" << p << " GeV" << endl;
+      G4cout << "G4LElastic::DoIt: Incident particle p=" << p << " GeV" << G4endl;
 
    if (p < 0.01) return &theParticleChange;
 
@@ -122,17 +122,17 @@ G4LElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    cc = cc/dd;
    rr = (aa + cc)*ran;
    if (verboseLevel > 1) {
-      G4cout << "DoIt: aa,bb,cc,dd,rr" << endl;
-      G4cout << aa << " " << bb << " " << cc << " " << dd << " " << rr << endl;
+      G4cout << "DoIt: aa,bb,cc,dd,rr" << G4endl;
+      G4cout << aa << " " << bb << " " << cc << " " << dd << " " << rr << G4endl;
    }
    G4double t1 = -log(ran)/bb;
    G4double t2 = -log(ran)/dd;
    if (verboseLevel > 1) {
-      G4cout << "log(FLT_MAX)=" << log(FLT_MAX) << endl;
+      G4cout << "log(FLT_MAX)=" << log(FLT_MAX) << G4endl;
       G4cout << "t1,Fctcos " << t1 << " " << Fctcos(t1, aa, bb, cc, dd, rr) << 
-              endl;
+              G4endl;
       G4cout << "t2,Fctcos " << t2 << " " << Fctcos(t2, aa, bb, cc, dd, rr) << 
-              endl;
+              G4endl;
    }
    G4double eps = 0.001;
    G4int ind1 = 10;
@@ -141,25 +141,25 @@ G4LElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    ier1 = Rtmi(&t, t1, t2, eps, ind1,
                aa, bb, cc, dd, rr);
    if (verboseLevel > 1) {
-      G4cout << "From Rtmi, ier1=" << ier1 << endl;
+      G4cout << "From Rtmi, ier1=" << ier1 << G4endl;
       G4cout << "t, Fctcos " << t << " " << Fctcos(t, aa, bb, cc, dd, rr) << 
-              endl;
+              G4endl;
    }
    if (ier1 != 0) t = 0.25*(3.*t1 + t2);
    if (verboseLevel > 1) {
       G4cout << "t, Fctcos " << t << " " << Fctcos(t, aa, bb, cc, dd, rr) << 
-              endl;
+              G4endl;
    }
    G4double phi = G4UniformRand()*twopi;
    rr = 0.5*t/(p*p);
    if (rr > 1.) rr = 0.;
    if (verboseLevel > 1)
-      G4cout << "rr=" << rr << endl;
+      G4cout << "rr=" << rr << G4endl;
    G4double cost = 1. - rr;
-   G4double sint = sqrt(max(rr*(2. - rr), 0.));
+   G4double sint = sqrt(G4std::max(rr*(2. - rr), 0.));
    if (sint == 0.) return &theParticleChange;
    if (verboseLevel > 1)
-      G4cout << "cos(t)=" << cost << "  sin(t)=" << sint << endl;
+      G4cout << "cos(t)=" << cost << "  sin(t)=" << sint << G4endl;
 // Scattered particle referred to axis of incident particle
    G4double px = p*sint*sin(phi);
    G4double py = p*sint*cos(phi);
@@ -169,8 +169,8 @@ G4LElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    G4double pyinc = p*(aParticle->GetMomentumDirection().y());
    G4double pzinc = p*(aParticle->GetMomentumDirection().z());
    if (verboseLevel > 1) {
-      G4cout << "NOM SCAT " << px << " " << py << " " << pz << endl;
-      G4cout << "INCIDENT " << pxinc << " " << pyinc << " " << pzinc << endl;
+      G4cout << "NOM SCAT " << px << " " << py << " " << pz << G4endl;
+      G4cout << "INCIDENT " << pxinc << " " << pyinc << " " << pzinc << G4endl;
    }
 
 // Transform scattered particle to reflect direction of incident particle
@@ -181,8 +181,8 @@ G4LElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& targetNucleus)
    pynew = pynew/p;
    pznew = pznew/p;
    if (verboseLevel > 1) {
-      G4cout << "DoIt: returning new momentum vector" << endl;
-      G4cout << pxnew << " " << pynew << " " << pznew << endl;
+      G4cout << "DoIt: returning new momentum vector" << G4endl;
+      G4cout << pxnew << " " << pynew << " " << pznew << G4endl;
    }
 
    if (aSecondary)
@@ -348,8 +348,8 @@ G4LElastic::Defs1(G4double p, G4double px, G4double py, G4double pz,
       G4double cosp = cos(ph);
       G4double sinp = sin(ph);
       if (verboseLevel > 1) {
-         G4cout << "cost sint " << cost << " " << sint << endl;
-         G4cout << "cosp sinp " << cosp << " " << sinp << endl;
+         G4cout << "cost sint " << cost << " " << sint << G4endl;
+         G4cout << "cosp sinp " << cosp << " " << sinp << G4endl;
       }
       *pxnew = cost*cosp*px - sinp*py + sint*cosp*pz;
       *pynew = cost*sinp*px + cosp*py + sint*sinp*pz;
diff --git a/source/processes/hadronic/models/low_energy/src/G4LFission.cc b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
index f7fe053808..003e207a3f 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LFission.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LFission.cc,v 1.2.4.1 1999/12/07 20:52:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LFission.cc,v 1.2.4.1.2.1 1999/12/08 17:34:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Model: Low Energy Fission
@@ -59,7 +59,7 @@ G4LFission::init()
    for (i = 1; i <= 10; i++) {
       spneut[i-1] = spneut[i-1]/spneut[9];
       if (verboseLevel > 1) G4cout << "G4LFission::init: i=" << i << 
-         " spneut=" << spneut[i-1] << endl;
+         " spneut=" << spneut[i-1] << G4endl;
    }
 }
 
@@ -85,22 +85,22 @@ G4LFission::ApplyYourself(const G4Track & aTrack,G4Nucleus & targetNucleus)
    G4double E0 = aParticle->GetDefinition()->GetPDGMass()/MeV;
    G4double Q = aParticle->GetDefinition()->GetPDGCharge();
    if (verboseLevel > 1) {
-      G4cout << "G4LFission:ApplyYourself: incident particle:" << endl;
-      G4cout << "P      " << P << " MeV/c" << endl;
-      G4cout << "Px     " << Px << " MeV/c" << endl;
-      G4cout << "Py     " << Py << " MeV/c" << endl;
-      G4cout << "Pz     " << Pz << " MeV/c" << endl;
-      G4cout << "E      " << E << " MeV" << endl;
-      G4cout << "mass   " << E0 << " MeV" << endl;
-      G4cout << "charge " << Q << endl;
+      G4cout << "G4LFission:ApplyYourself: incident particle:" << G4endl;
+      G4cout << "P      " << P << " MeV/c" << G4endl;
+      G4cout << "Px     " << Px << " MeV/c" << G4endl;
+      G4cout << "Py     " << Py << " MeV/c" << G4endl;
+      G4cout << "Pz     " << Pz << " MeV/c" << G4endl;
+      G4cout << "E      " << E << " MeV" << G4endl;
+      G4cout << "mass   " << E0 << " MeV" << G4endl;
+      G4cout << "charge " << Q << G4endl;
    }
 // GHEISHA ADD operation to get total energy, mass, charge:
    if (verboseLevel > 1) {
-      G4cout << "G4LFission:ApplyYourself: material:" << endl;
-      G4cout << "A      " << N << endl;
-      G4cout << "Z      " << Z << endl;
+      G4cout << "G4LFission:ApplyYourself: material:" << G4endl;
+      G4cout << "A      " << N << G4endl;
+      G4cout << "Z      " << Z << G4endl;
       G4cout << "atomic mass " << 
-        Atomas(N, Z) << "MeV" << endl;
+        Atomas(N, Z) << "MeV" << G4endl;
    }
    E = E + Atomas(N, Z);
    G4double E02 = E*E - P*P;
@@ -108,10 +108,10 @@ G4LFission::ApplyYourself(const G4Track & aTrack,G4Nucleus & targetNucleus)
    if (E02 < 0) E0 = -E0;
    Q = Q + Z;
    if (verboseLevel > 1) {
-      G4cout << "G4LFission:ApplyYourself: total:" << endl;
-      G4cout << "E      " << E << " MeV" << endl;
-      G4cout << "mass   " << E0 << " MeV" << endl;
-      G4cout << "charge " << Q << endl;
+      G4cout << "G4LFission:ApplyYourself: total:" << G4endl;
+      G4cout << "E      " << E << " MeV" << G4endl;
+      G4cout << "mass   " << E0 << " MeV" << G4endl;
+      G4cout << "charge " << Q << G4endl;
    }
    Px = -Px;
    Py = -Py;
@@ -184,15 +184,15 @@ G4LFission::ApplyYourself(const G4Track & aTrack,G4Nucleus & targetNucleus)
       G4double cost = -1. + 2.*ran1;
       G4double sint = sqrt(abs(1. - cost*cost));
       G4double phi = ran2*twopi;
-      //      G4cout << ran1 << " " << ran2 << endl;
-      //      G4cout << cost << " " << sint << " " << phi << endl;
+      //      G4cout << ran1 << " " << ran2 << G4endl;
+      //      G4cout << cost << " " << sint << " " << phi << G4endl;
       theSecondary = theParticleChange.GetSecondary(i - 1);
       G4double pp = theSecondary->GetDynamicParticle()->GetTotalMomentum()/MeV;
       G4double px = pp*sint*sin(phi);
       G4double py = pp*sint*cos(phi);
       G4double pz = pp*cost;
-      //      G4cout << pp << endl;
-      //      G4cout << px << " " << py << " " << pz << endl;
+      //      G4cout << pp << G4endl;
+      //      G4cout << px << " " << py << " " << pz << G4endl;
       G4double e = theSecondary->GetTotalEnergy()/MeV;
       G4double e0 = theSecondary->GetDefinition()->GetPDGMass()/MeV;
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
index df2a2511c2..aba77dd630 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4InterpolationIterator.hh,v 1.3 1999/07/02 09:58:02 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4InterpolationIterator_h
 #define G4InterpolationIterator_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
index d435e0129d..09b0c00476 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4InterpolationManager.hh,v 1.4 1999/08/27 07:42:56 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4InterpolationManager.hh,v 1.5 1999/12/15 14:53:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4InterpolationManager_h
 #define G4InterpolationManager_h 1
@@ -16,7 +16,7 @@
 #include "globals.hh"
 #include "G4InterpolationScheme.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4InterpolationManager
 {
@@ -82,7 +82,7 @@ class G4InterpolationManager
      nEntries = aRange;
    }
    
-   inline void Init(ifstream & aDataFile)
+   inline void Init(G4std::ifstream & aDataFile)
    {
      delete [] start;
      delete [] range;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
index 727e420ad8..c44ed276e8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4InterpolationScheme.hh,v 1.2 1999/07/02 09:58:05 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4InterpolationScheme_h
 #define G4InterpolationScheme_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
index 7439bcf3c8..667aabdd70 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2AInelasticFS.hh,v 1.3 1999/07/02 09:58:07 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2AInelasticFS_h
 #define G4NeutronHP2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
index 19b9d92efa..81cbd3c2c2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.3 1999/07/02 09:58:08 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2N2AInelasticFS_h
 #define G4NeutronHP2N2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
index e3adb7da73..63812b838b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2NAInelasticFS.hh,v 1.3 1999/07/02 09:58:09 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2NAInelasticFS_h
 #define G4NeutronHP2NAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
index 459ded3e7d..211bfc479a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2NDInelasticFS.hh,v 1.3 1999/07/02 09:58:10 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2NDInelasticFS_h
 #define G4NeutronHP2NDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
index 21011ae69c..ab2eddc3f8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2NInelasticFS.hh,v 1.3 1999/07/02 09:58:11 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2NInelasticFS_h
 #define G4NeutronHP2NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
index c91736aa4a..3f21ecad29 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2NPInelasticFS.hh,v 1.3 1999/07/02 09:58:13 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2NPInelasticFS_h
 #define G4NeutronHP2NPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
index a7a1cbf805..53f11a6ad9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP2PInelasticFS.hh,v 1.3 1999/07/02 09:58:14 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP2PInelasticFS_h
 #define G4NeutronHP2PInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
index d0057aa728..fc35d66803 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP3AInelasticFS.hh,v 1.3 1999/07/02 09:58:15 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP3AInelasticFS_h
 #define G4NeutronHP3AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
index 858a65746f..73eddfd64c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP3NAInelasticFS.hh,v 1.3 1999/07/02 09:58:16 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP3NAInelasticFS_h
 #define G4NeutronHP3NAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
index fdd44070ba..af8d555872 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP3NInelasticFS.hh,v 1.3 1999/07/02 09:58:17 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP3NInelasticFS_h
 #define G4NeutronHP3NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
index 390ca820f3..07da91c995 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP3NPInelasticFS.hh,v 1.3 1999/07/02 09:58:19 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP3NPInelasticFS_h
 #define G4NeutronHP3NPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
index c6b63a7308..ff7c7eae04 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHP4NInelasticFS.hh,v 1.3 1999/07/02 09:58:20 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHP4NInelasticFS_h
 #define G4NeutronHP4NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
index 6c402eccc8..a30e311d2c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPAInelasticFS.hh,v 1.3 1999/07/02 09:58:21 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPAInelasticFS_h
 #define G4NeutronHPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
index ae09e5317a..e6bee8de97 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPAngular.hh,v 1.3 1999/07/02 09:58:23 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPAngular.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPAngular_h
 #define G4NeutronHPAngular_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4ReactionProduct.hh"
 #include "Randomize.hh"
 #include "G4NeutronHPLegendreStore.hh"
@@ -32,7 +32,7 @@ class G4NeutronHPAngular
   } 
   ~G4NeutronHPAngular(){}
   
-  void Init(ifstream & aDataFile);
+  void Init(G4std::ifstream & aDataFile);
   
   void SampleAndUpdate(G4ReactionProduct & aNeutron);
     
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
index 8b5cf55113..73f48ab513 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPAngularP.hh,v 1.3 1999/07/02 09:58:25 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPAngularP.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPAngularP_h
 #define G4NeutronHPAngularP_h 1
@@ -31,7 +31,7 @@ class G4NeutronHPAngularP
     if(theProb!=NULL) delete [] theProb;
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     G4double eNeu, cosTheta, probDist;
     G4int nProb;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
index a90cfe3fdc..3fe18c3a1e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPArbitaryTab.hh,v 1.3 1999/07/02 09:58:26 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPArbitaryTab.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPArbitaryTab_h
 #define G4NeutronHPArbitaryTab_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VNeutronHPEDis.hh"
 #include "G4InterpolationManager.hh"
 
@@ -35,7 +35,7 @@ class G4NeutronHPArbitaryTab : public G4VNeutronHPEDis
    if(theDistFunc!=NULL) delete [] theDistFunc;
   }
   
-  inline void Init(ifstream & theData)
+  inline void Init(G4std::ifstream & theData)
   {
     G4int i, total;
     theFractionalProb.Init(theData, eV);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
index 7d782ade7d..964273261f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPCapture.hh,v 1.2 1999/07/02 09:58:27 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
index c5b2a56042..5d0c7986bf 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPCaptureData.hh,v 1.2 1999/07/02 09:58:28 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPCaptureData_h
 #define G4NeutronHPCaptureData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
index 4c31977a42..037703010c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPCaptureFS.hh,v 1.4 1999/07/06 14:16:55 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPCaptureFS_h
 #define G4NeutronHPCaptureFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
index ee60a82353..ab5277a3f2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPChannel.hh,v 1.4 1999/07/06 16:56:21 stesting Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
index 9029500a39..c2d2887a4a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPChannelList.hh,v 1.2 1999/07/02 09:58:32 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
index c86f86c6d2..6b5862b149 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPContAngularPar.hh,v 1.3 1999/07/02 09:58:33 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPContAngularPar.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPContAngularPar_h
 #define G4NeutronHPContAngularPar_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4NeutronHPList.hh"
 #include "G4ReactionProduct.hh"
@@ -35,7 +35,7 @@ class G4NeutronHPContAngularPar
     if(theAngular!=NULL) delete [] theAngular;
   }
   
-  void Init(ifstream & aDataFile);
+  void Init(G4std::ifstream & aDataFile);
   
   G4ReactionProduct * Sample(G4double anEnergy, G4double massCode, G4double mass, 
                              G4int angularRep, G4int interpol);
@@ -79,7 +79,7 @@ class G4NeutronHPContAngularPar
       {
 //        G4cout <<"test "<<i<<" "<<store1.theEnergy<<" "<<store2.theEnergy<<" "
 //             << store1.theAngular[i].GetValue(ii)<<" "<<
-//             store2.theAngular[i].GetValue(ii)<<endl;
+//             store2.theAngular[i].GetValue(ii)<<G4endl;
         value = theInt.Interpolate(aScheme, anEnergy, 
                                    store1.theEnergy, store2.theEnergy,
                                    store1.theAngular[i].GetValue(ii),
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
index 25eae62c23..4bbb51564c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPContEnergyAngular.hh,v 1.3 1999/07/02 09:58:34 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPContEnergyAngular.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPContEnergyAngular_h
 #define G4NeutronHPContEnergyAngular_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4NeutronHPContAngularPar.hh"
@@ -39,7 +39,7 @@ class G4NeutronHPContEnergyAngular : public G4VNeutronHPEnergyAngular
   
   public:
   
-  void Init(ifstream & aDataFile)
+  void Init(G4std::ifstream & aDataFile)
   {
     aDataFile >> theTargetCode >> theAngularRep >> theInterpolation >> nEnergy;
     theAngular = new G4NeutronHPContAngularPar[nEnergy];
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
index dcd97c1e04..9b73b3d05d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPD2AInelasticFS.hh,v 1.3 1999/07/02 09:58:35 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPD2AInelasticFS_h
 #define G4NeutronHPD2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
index a8fa2e6872..d3fee98791 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPDAInelasticFS.hh,v 1.3 1999/07/02 09:58:36 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPDAInelasticFS_h
 #define G4NeutronHPDAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
index 84eae4e6e8..14098f3f00 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPDInelasticFS.hh,v 1.3 1999/07/02 09:58:38 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPDInelasticFS_h
 #define G4NeutronHPDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
index e93f53cde6..4cc13a4846 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPData.hh,v 1.2 1999/07/02 09:58:39 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPData.hh,v 1.3 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -46,8 +46,8 @@ public:
   }
   inline G4PhysicsVector * MakePhysicsVector(G4Element * thE, G4NeutronHPInelasticData * theP)
   {
-//     G4cout << "entered G4NeutronHPData::MakePhysicsVector!!!"<<endl;
-//     G4cout << "thE->GetIndex()="<<thE->GetIndex()<<endl;
+//     G4cout << "entered G4NeutronHPData::MakePhysicsVector!!!"<<G4endl;
+//     G4cout << "thE->GetIndex()="<<thE->GetIndex()<<G4endl;
      return DoPhysicsVector(theData[thE->GetIndex()].GetData(theP));
   }
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
index 981530f897..c332ddce8c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPDataPoint.hh,v 1.3 1999/07/02 09:58:40 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPDataPoint_h
 #define G4NeutronHPDataPoint_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
index a868e8c89a..55991cb25b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPDeExGammas.hh,v 1.3 1999/07/02 09:58:42 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPDeExGammas.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPDeExGammas_h
 #define G4NeutronHPDeExGammas_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4ReactionProductVector.hh"
 #include "G4Gamma.hh"
 #include "G4NeutronHPLevel.hh"
@@ -40,7 +40,7 @@ class G4NeutronHPDeExGammas
     if(theLevels!=NULL) delete [] theLevels;
   }
   
-  void Init(ifstream & aDataFile);
+  void Init(G4std::ifstream & aDataFile);
 
   inline G4ReactionProductVector * GetDecayGammas(G4int aLevel)
   {
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
index 1ae85ab6c9..f0cf85e550 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.3 1999/07/02 09:58:44 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPDiscreteTwoBody_h
 #define G4NeutronHPDiscreteTwoBody_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4NeutronHPLegendreTable.hh"
@@ -34,7 +34,7 @@ class G4NeutronHPDiscreteTwoBody : public G4VNeutronHPEnergyAngular
     if(theCoeff!=NULL) delete [] theCoeff;
   }
   
-  void Init(ifstream & aDataFile)
+  void Init(G4std::ifstream & aDataFile)
   {
     aDataFile >> nEnergy;
     theManager.Init(aDataFile);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
index b335b1f7e9..de9c91bf78 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPElastic.hh,v 1.2 1999/07/02 09:58:45 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
index 9d107d5c73..173d4fccbc 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPElasticData.hh,v 1.2 1999/07/02 09:58:46 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPElasticData_h
 #define G4NeutronHPElasticData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
index b1bd0e3c04..f2db4391c9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPElasticFS.hh,v 1.3 1999/07/02 09:58:48 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPElasticFS_h
 #define G4NeutronHPElasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
index 35ab1ad7a7..12e74fb4b2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPElementData.hh,v 1.3 1999/10/22 08:24:57 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
index 2e4fcb7694..d8999cc438 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPEnAngCorrelation.hh,v 1.3 1999/07/02 09:58:50 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPEnAngCorrelation.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPEnAngCorrelation_h
 #define G4NeutronHPEnAngCorrelation_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4NeutronHPProduct.hh"
 #include "G4ReactionProduct.hh"
@@ -36,7 +36,7 @@ class G4NeutronHPEnAngCorrelation
     if(theProducts!=NULL) delete [] theProducts;
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     inCharge = true;
     aDataFile>>targetMass>>frameFlag>>nProducts;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
index 81414eb9fb..1cc29f858c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPEnergyDistribution.hh,v 1.3 1999/07/02 09:58:51 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPEnergyDistribution.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPEnergyDistribution_h
 #define G4NeutronHPEnergyDistribution_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4NeutronHPArbitaryTab.hh"
 #include "G4NeutronHPEvapSpectrum.hh"
 #include "G4NeutronHPSimpleEvapSpectrum.hh"
@@ -48,7 +48,7 @@ class G4NeutronHPEnergyDistribution
     }
   }
   
-  inline void Init(ifstream & theData)
+  inline void Init(G4std::ifstream & theData)
   {
     G4double dummy;
     theData >> dummy >> theNumberOfPartials;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
index 00a2c740cf..a611ce4ed7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPEvapSpectrum.hh,v 1.3 1999/07/02 09:58:53 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPEvapSpectrum.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPEvapSpectrum_h
 #define G4NeutronHPEvapSpectrum_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VNeutronHPEDis.hh"
 
 // we will need a List of these .... one per term.
@@ -32,7 +32,7 @@ class G4NeutronHPEvapSpectrum : public G4VNeutronHPEDis
   {
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     theFractionalProb.Init(aDataFile);
     theThetaDist.Init(aDataFile);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
index 49387d71cb..4451b567e0 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFCFissionFS.hh,v 1.3 1999/07/02 09:58:54 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFCFissionFS_h
 #define G4NeutronHPFCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
index f785feb496..48c8b5735f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFSFissionFS.hh,v 1.3 1999/07/02 09:58:55 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFSFissionFS_h
 #define G4NeutronHPFSFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
index a8201921d8..be3f968f5d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPFastLegendre.hh,v 1.4 1999/12/03 10:59:07 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPFastLegendre.hh,v 1.5 1999/12/15 14:53:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFastLegendre_h
 #define G4NeutronHPFastLegendre_h 1
@@ -100,10 +100,10 @@ class G4NeutronHPFastLegendre
   {
     G4int bin = GetBin(l, costh);
     G4double y1, y2;
-//    G4cout <<"Testhpw G4NeutronHPFastLegendre::Integrate "<<l<<" "<<bin<<endl;
+//    G4cout <<"Testhpw G4NeutronHPFastLegendre::Integrate "<<l<<" "<<bin<<G4endl;
     y1 = integral[l][bin];
     y2 = integral[l][bin+1];
-//    G4cout <<"Testhpw G4NeutronHPFastLegendre::Integrate exit"<<endl;
+//    G4cout <<"Testhpw G4NeutronHPFastLegendre::Integrate exit"<<G4endl;
     return Interpolate(bin, l, y1, y2, costh);
   }
   
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
index 0f9ff10e52..54d4696b2e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPField.hh,v 1.3 1999/07/02 09:58:58 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPField_h
 #define G4NeutronHPField_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
index 589fc9d338..593c381c7d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFieldPoint.hh,v 1.3 1999/07/02 09:58:59 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFieldPoint_h
 #define G4NeutronHPFieldPoint_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
index dc801f414b..42c3cc9491 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFinalState.hh,v 1.3 1999/07/02 09:59:00 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFinalState_h
 #define G4NeutronHPFinalState_h
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
index 3452829a15..8f3aa14d89 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFission.hh,v 1.2 1999/07/02 09:59:01 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
index 751f51075c..3a98190ccc 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFissionBaseFS.hh,v 1.3 1999/07/02 09:59:02 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFissionBaseFS_h
 #define G4NeutronHPFissionBaseFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
index f16bfc384e..002e80e347 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFissionData.hh,v 1.2 1999/07/02 09:59:03 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFissionData_h
 #define G4NeutronHPFissionData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
index 26ca7315ad..0cb54f8121 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPFissionERelease.hh,v 1.3 1999/07/02 09:59:05 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPFissionERelease.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFissionERelease_h
 #define G4NeutronHPFissionERelease_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4NeutronHPFissionERelease
 {
@@ -23,7 +23,7 @@ class G4NeutronHPFissionERelease
   G4NeutronHPFissionERelease(){}
   ~G4NeutronHPFissionERelease(){}
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     G4double dummy;
     
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
index e0b3d8ebdc..b46c935687 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFissionFS.hh,v 1.3 1999/07/02 09:59:06 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFissionFS_h
 #define G4NeutronHPFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
index 55a3885649..6490ccc5c7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPFissionSpectrum.hh,v 1.3 1999/07/02 09:59:07 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPFissionSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPFissionSpectrum_h
 #define G4NeutronHPFissionSpectrum_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VNeutronHPEDis.hh"
 
 // we will need a List of these .... one per term.
@@ -33,7 +33,7 @@ class G4NeutronHPFissionSpectrum : public G4VNeutronHPEDis
   {
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     theFractionalProb.Init(aDataFile, eV);
     theThetaDist.Init(aDataFile, eV);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
index a25873a9c2..05c7ca42d9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPGamma.hh,v 1.3 1999/07/02 09:59:08 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPGamma.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPGamma_h
 #define G4NeutronHPGamma_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4DynamicParticleVector.hh"
 #include "G4DynamicParticle.hh"
 #include "G4Gamma.hh"
@@ -31,7 +31,7 @@ class G4NeutronHPGamma
   }
   ~G4NeutronHPGamma() {}
   
-  G4bool Init(ifstream & aDataFile);
+  G4bool Init(G4std::ifstream & aDataFile);
   
   inline void SetNext(G4NeutronHPLevel * aLevel)
   {
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
index 34645a7520..46d8b5f320 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPHe3InelasticFS.hh,v 1.3 1999/07/02 09:59:09 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPHe3InelasticFS_h
 #define G4NeutronHPHe3InelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
index 3e460b2861..19dec3d1d8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInelastic.hh,v 1.2 1999/07/02 09:59:10 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
index 56ef160969..4565e4e40e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInelasticBaseFS.hh,v 1.3 1999/07/02 09:59:11 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPInelasticBaseFS_h
 #define G4NeutronHPInelasticBaseFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
index 2748775700..4a448cdc1d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInelasticCompFS.hh,v 1.3 1999/07/02 09:59:12 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPInelasticCompFS_h
 #define G4NeutronHPInelasticCompFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
index 6447b482fd..55a67b0212 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInelasticData.hh,v 1.2 1999/07/02 09:59:14 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPInelasticData_h
 #define G4NeutronHPInelasticData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
index 3c138cd2dc..4d8846132b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPInterpolator.hh,v 1.4 1999/08/27 07:42:57 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPInterpolator.hh,v 1.5 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPInterpolator_h
 #define G4NeutronHPInterpolator_h 1
@@ -26,7 +26,7 @@ class G4NeutronHPInterpolator
   G4NeutronHPInterpolator(){}
   ~G4NeutronHPInterpolator()
    {
-    //  G4cout <<"deleted the interpolator"<<endl;
+    //  G4cout <<"deleted the interpolator"<<G4endl;
    }
   
   inline G4double Lin(G4double x,G4double x1,G4double x2,G4double y1,G4double y2)
@@ -89,7 +89,7 @@ Interpolate(G4InterpolationScheme aScheme,
       result = Random(x, x1, x2, y1, y2);
       break;
     default:
-      G4cout << "theScheme = "<<theScheme<<endl;
+      G4cout << "theScheme = "<<theScheme<<G4endl;
       G4Exception("G4NeutronHPInterpolator::Carthesian Invalid InterpolationScheme");
       break;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
index 5ac64bd566..0f7d0d220d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPIsoData.hh,v 1.5 1999/11/19 18:07:38 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPIsoData.hh,v 1.6 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPIsoData_h
 #define G4NeutronHPIsoData_h 1
@@ -19,12 +19,8 @@
  
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
-#ifdef WIN32
-  #include <strstrea.h>
-#else
-  #include <strstream.h>
-#endif
+#include "g4std/fstream"
+#include "g4std/strstream"
 #include <stdlib.h>
 #include "G4NeutronHPVector.hh"
 #include "G4NeutronHPNames.hh"
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
index 114b33e60b..e68dae819e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPIsotropic.hh,v 1.3 1999/07/02 09:59:17 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPIsotropic.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPIsotropic_h
 #define G4NeutronHPIsotropic_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4ReactionProduct.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
@@ -29,7 +29,7 @@ class G4NeutronHPIsotropic : public G4VNeutronHPEnergyAngular
   
   public:
   
-  void Init(ifstream & aDataFile);
+  void Init(G4std::ifstream & aDataFile);
   G4ReactionProduct * Sample(G4double anEnergy, G4double massCode, G4double mass);
   G4double MeanEnergyOfThisInteraction()
   {
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
index 7fcbb601c5..d259750fd2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPKallbachMannSyst.hh,v 1.3 1999/07/02 09:59:18 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPKallbachMannSyst_h
 #define G4NeutronHPKallbachMannSyst_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
index 9056549227..5f6db6288d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPLCFissionFS.hh,v 1.3 1999/07/02 09:59:19 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPLCFissionFS_h
 #define G4NeutronHPLCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
index 5b684d4922..38c8dc5d55 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPLabAngularEnergy.hh,v 1.3 1999/07/02 09:59:20 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPLabAngularEnergy.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPLabAngularEnergy_h
 #define G4NeutronHPLabAngularEnergy_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4Neutron.hh"
 #include "G4NeutronHPInterpolator.hh"
@@ -49,7 +49,7 @@ class G4NeutronHPLabAngularEnergy : public G4VNeutronHPEnergyAngular
   
   public:
   
-  void Init(ifstream & aDataFile);
+  void Init(G4std::ifstream & aDataFile);
      G4ReactionProduct * Sample(G4double anEnergy, G4double massCode, G4double mass);
   G4double MeanEnergyOfThisInteraction()
   {
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
index 54f542662b..f92d401fff 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPLegendreStore.hh,v 1.3 1999/07/02 09:59:21 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPLegendreStore.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPLegendreStore_h
 #define G4NeutronHPLegendreStore_h 1
@@ -16,7 +16,7 @@
 #include "G4NeutronHPLegendreTable.hh"
 #include "G4InterpolationManager.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4NeutronHPLegendreStore
 {
@@ -59,7 +59,7 @@ class G4NeutronHPLegendreStore
   G4double SampleMax (G4double energy);
   G4double Integrate(G4int k, G4double costh);
   
-  void InitInterpolation(ifstream & aDataFile)
+  void InitInterpolation(G4std::ifstream & aDataFile)
   {
     theManager.Init(aDataFile);
   }
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
index b452ae3666..a11a448cd9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPLegendreTable.hh,v 1.3 1999/07/02 09:59:22 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPLegendreTable.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPLegendreTable_h
 #define G4NeutronHPLegendreTable_h 1
 
 #include "globals.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4ios.hh"
 #include "G4InterpolationManager.hh"
 
@@ -46,7 +46,7 @@ class G4NeutronHPLegendreTable
     }
   }
   
-  inline void Init(ifstream & aDataFile) 
+  inline void Init(G4std::ifstream & aDataFile) 
   {
     G4double eNeu, coeff;
     G4int nPoly;
@@ -66,7 +66,7 @@ class G4NeutronHPLegendreTable
     theCoeff[0]=1.;
     theEnergy = e;
     nCoeff = n+1;
-//    G4cout << "G4NeutronHPLegendreTable::Init called "<<e<<" "<<n<<endl;
+//    G4cout << "G4NeutronHPLegendreTable::Init called "<<e<<" "<<n<<G4endl;
   }
   inline void SetEnergy(G4double energy){ theEnergy = energy; }
   inline void SetTemperature(G4double temp){ theTemp = temp; }
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
index a53e42c0de..e9cf4159e9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPLevel.hh,v 1.3 1999/07/02 09:59:24 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPLevel.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPLevel_h
 #define G4NeutronHPLevel_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4DynamicParticleVector.hh"
 #include "Randomize.hh"
 #include "G4Gamma.hh"
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
index 98412d9577..f22c3438bd 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPList.hh,v 1.3 1999/07/02 09:59:25 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPList.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPList_h
 #define G4NeutronHPList_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4NeutronHPList
 {
@@ -44,9 +44,9 @@ class G4NeutronHPList
 
   void Dump();
   
-  void Init(ifstream & aDataFile, G4int nPar, G4double unit=1.);
+  void Init(G4std::ifstream & aDataFile, G4int nPar, G4double unit=1.);
   
-  void Init(ifstream & aDataFile, G4double unit=1.);
+  void Init(G4std::ifstream & aDataFile, G4double unit=1.);
 
   inline void SetLabel(G4double aLabel) { theLabel = aLabel; }
   
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
index 02b2bd072b..c17bec1cb6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.3 1999/07/02 09:59:26 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPMadlandNixSpectrum_h
 #define G4NeutronHPMadlandNixSpectrum_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include <math.h>
 #include "G4VNeutronHPEDis.hh"
 
@@ -38,7 +38,7 @@ class G4NeutronHPMadlandNixSpectrum : public G4VNeutronHPEDis
   {
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     theFractionalProb.Init(aDataFile);
     aDataFile>> theAvarageKineticPerNucleonForLightFragments;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
index 48740fa09d..b6c59a8b62 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPN2AInelasticFS.hh,v 1.3 1999/07/02 09:59:27 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPN2AInelasticFS_h
 #define G4NeutronHPN2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
index bf596e7774..a3fd762b8b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPN2PInelasticFS.hh,v 1.3 1999/07/02 09:59:28 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPN2PInelasticFS_h
 #define G4NeutronHPN2PInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
index f7051da1b8..5dca212432 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPN3AInelasticFS.hh,v 1.3 1999/07/02 09:59:29 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPN3AInelasticFS_h
 #define G4NeutronHPN3AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
index 01f8084b8e..48d5fc4895 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNAInelasticFS.hh,v 1.3 1999/07/02 09:59:30 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNAInelasticFS_h
 #define G4NeutronHPNAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
index 360056eb93..06c9d45485 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.3 1999/07/02 09:59:31 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNBodyPhaseSpace_h
 #define G4NeutronHPNBodyPhaseSpace_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4Neutron.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
@@ -35,7 +35,7 @@ class G4NeutronHPNBodyPhaseSpace : public G4VNeutronHPEnergyAngular
     theTotalCount=aCount;
   }
 
-  void Init(ifstream & aDataFile)
+  void Init(G4std::ifstream & aDataFile)
   {
     aDataFile >> theTotalMass >> theTotalCount;
     theTotalMass *= G4Neutron::Neutron()->GetPDGMass();
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
index 1be7a5eb03..ea449ebb9d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPND2AInelasticFS.hh,v 1.3 1999/07/02 09:59:33 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPND2AInelasticFS_h
 #define G4NeutronHPND2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
index ad176ad47a..bac7186953 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNDInelasticFS.hh,v 1.3 1999/07/02 09:59:34 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNDInelasticFS_h
 #define G4NeutronHPNDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
index e2568a3350..02ff541dde 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.3 1999/07/02 09:59:35 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNHe3InelasticFS_h
 #define G4NeutronHPNHe3InelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
index 4501ab997a..7895ff0e3d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNInelasticFS.hh,v 1.3 1999/07/02 09:59:36 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNInelasticFS_h
 #define G4NeutronHPNInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
index 7bc6721255..d7e5c1cf19 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNPAInelasticFS.hh,v 1.3 1999/07/02 09:59:37 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNPAInelasticFS_h
 #define G4NeutronHPNPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
index 0c5a4277fe..d53f9f4dd8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNPInelasticFS.hh,v 1.3 1999/07/02 09:59:38 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNPInelasticFS_h
 #define G4NeutronHPNPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
index 7ec20dd49b..2fe1fdf178 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.3 1999/07/02 09:59:40 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNT2AInelasticFS_h
 #define G4NeutronHPNT2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
index 8a234ccb0c..e7f431f175 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNTInelasticFS.hh,v 1.3 1999/07/02 09:59:41 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNTInelasticFS_h
 #define G4NeutronHPNTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
index 0f4fbd03a1..50abfc4de7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNXInelasticFS.hh,v 1.3 1999/07/02 09:59:42 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNXInelasticFS_h
 #define G4NeutronHPNXInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
index 3ef1984b7e..8a1567629c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
@@ -7,19 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPNames.hh,v 1.5 1999/12/03 10:59:07 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPNames.hh,v 1.6 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNames_h
 #define G4NeutronHPNames_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
-#ifdef WIN32
-  #include <strstrea.h>
-#else
-  #include <strstream.h>
-#endif
+#include "g4std/fstream"
+#include "g4std/strstream"
 #include <stdlib.h>
 #include "globals.hh"
 #include "G4NeutronHPDataUsed.hh"
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
index 9bb487a803..30e89931ae 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPNeutronYield.hh,v 1.3 1999/07/02 09:59:44 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPNeutronYield.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPNeutronYield_h
 #define G4NeutronHPNeutronYield_h 1
@@ -32,7 +32,7 @@ class G4NeutronHPNeutronYield
   
   G4double GetTargetMass() { return targetMass; }
   
-  void InitMean(ifstream & aDataFile)
+  void InitMean(G4std::ifstream & aDataFile)
   {
     G4int iflag;
     aDataFile >> targetMass >>iflag;
@@ -47,7 +47,7 @@ class G4NeutronHPNeutronYield
     }
   }
 
-  void InitPrompt(ifstream & aDataFile)
+  void InitPrompt(G4std::ifstream & aDataFile)
   { 
     hasPromptData = true;
     G4int iflag;
@@ -63,7 +63,7 @@ class G4NeutronHPNeutronYield
     }
   }
  
-  void InitDelayed(ifstream & aDataFile)
+  void InitDelayed(G4std::ifstream & aDataFile)
   {
     hasDelayedData = true;
     G4int iflag;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
index bb147e7469..1a42401b2d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPAInelasticFS.hh,v 1.3 1999/07/02 09:59:45 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPAInelasticFS_h
 #define G4NeutronHPPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
index 8e94c2e9ad..afe1f27c2b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPDInelasticFS.hh,v 1.3 1999/07/02 09:59:46 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPDInelasticFS_h
 #define G4NeutronHPPDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
index 9e40a489a0..bcc78bac24 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPInelasticFS.hh,v 1.3 1999/07/02 09:59:47 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPInelasticFS_h
 #define G4NeutronHPPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
index 732b94c003..97ada93cda 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPTInelasticFS.hh,v 1.3 1999/07/02 09:59:49 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPTInelasticFS_h
 #define G4NeutronHPPTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
index db5fd38921..537c66f263 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPPartial.hh,v 1.3 1999/07/02 09:59:50 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPPartial.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPartial_h
 #define G4NeutronHPPartial_h 1
@@ -35,20 +35,20 @@ class G4NeutronHPPartial
     T = new G4double[n2];
     X = new G4double[n1];
     data = new G4NeutronHPVector[n1];
-    nData = max(n1,n2);
+    nData = G4std::max(n1,n2);
   }  
   
-  void InitInterpolation(G4int i, ifstream & aDataFile)
+  void InitInterpolation(G4int i, G4std::ifstream & aDataFile)
   {
     data[i].InitInterpolation(aDataFile);
   }
   
-  void InitInterpolation(ifstream & aDataFile)
+  void InitInterpolation(G4std::ifstream & aDataFile)
   {
     theManager.Init(aDataFile);
   }
   
-  void Init(ifstream & aDataFile)
+  void Init(G4std::ifstream & aDataFile)
   {
     G4int i;
     G4double e;
@@ -62,7 +62,7 @@ class G4NeutronHPPartial
     }  
   }
   
-  void InitData(G4int i, ifstream & aDataFile, G4double unit=1.)
+  void InitData(G4int i, G4std::ifstream & aDataFile, G4double unit=1.)
   {
     G4int ii;
     G4double eg, pg;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
index 3d1f9f50bf..f46ee131f3 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPPhotonDist.hh,v 1.3 1999/07/02 09:59:51 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPPhotonDist.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -16,7 +16,7 @@
 #ifndef G4NeutronHPPhotonDist_h
 #define G4NeutronHPPhotonDist_h 1
 #include "globals.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4ios.hh"
 #include "globals.hh"
 #include "G4NeutronHPVector.hh"
@@ -78,13 +78,13 @@ public:
      if(thePhotonTransitionFraction != NULL) delete thePhotonTransitionFraction;
   }
   
-  G4bool InitMean(ifstream & aDataFile);
+  G4bool InitMean(G4std::ifstream & aDataFile);
     
-  void InitAngular(ifstream & aDataFile);
+  void InitAngular(G4std::ifstream & aDataFile);
   
-  void InitEnergies(ifstream & aDataFile);
+  void InitEnergies(G4std::ifstream & aDataFile);
   
-  void InitPartials(ifstream & aDataFile);
+  void InitPartials(G4std::ifstream & aDataFile);
   
   G4ReactionProductVector * GetPhotons(G4double anEnergy);
   
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
index 85b880d5f1..b4ded77d46 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPPhotonXSection.hh,v 1.3 1999/07/02 09:59:52 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPPhotonXSection.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPhotonXSection_h
 #define G4NeutronHPPhotonXSection_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4VNeutronVector.hh"
 
@@ -43,7 +43,7 @@ class G4NeutronHPPhotonXSection
     if(theExDisFlag != NULL) delete [] theExDisFlag;
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     aDataFile  >> nChannels >> targetMass;
     if(nChannels!=1) 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
index f08c642b34..958fc2fd1b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
@@ -7,15 +7,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPPolynomExpansion.hh,v 1.3 1999/07/02 09:59:53 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPPolynomExpansion.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPPolynomExpansion_h
 #define G4NeutronHPPolynomExpansion_h 1
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4NeutronHPPolynomExpansion
 {
@@ -30,7 +30,7 @@ class G4NeutronHPPolynomExpansion
     if(theCoeff!=NULL) delete [] theCoeff;
   }
   
-  inline void Init(ifstream & theData)
+  inline void Init(G4std::ifstream & theData)
   {
     theData >> nPoly;
     theCoeff = new G4double[nPoly];
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
index a9302abad1..72d7a37e9d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPProduct.hh,v 1.3 1999/07/02 09:59:54 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPProduct.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPProduct_h
 #define G4NeutronHPProduct_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4ReactionProductVector.hh"
@@ -40,7 +40,7 @@ class G4NeutronHPProduct
     if(theDist != NULL) delete theDist;
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     aDataFile >> theMassCode>>theMass>>theIsomerFlag>>theDistLaw
               >> theGroundStateQValue>>theActualStateQValue;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
index 4ac2ad72c4..fa19143466 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPSCFissionFS.hh,v 1.3 1999/07/02 09:59:56 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPSCFissionFS_h
 #define G4NeutronHPSCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
index 69e565545b..0926ffb5ed 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.3 1999/07/02 09:59:57 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPSimpleEvapSpectrum_h
 #define G4NeutronHPSimpleEvapSpectrum_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VNeutronHPEDis.hh"
 
 // we will need a List of these .... one per term.
@@ -33,7 +33,7 @@ class G4NeutronHPSimpleEvapSpectrum : public G4VNeutronHPEDis
   {
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     theFractionalProb.Init(aDataFile,eV);
     theThetaDist.Init(aDataFile, eV);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
index 4332dacc54..d4b3cf10e6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPT2AInelasticFS.hh,v 1.3 1999/07/02 09:59:58 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPT2AInelasticFS_h
 #define G4NeutronHPT2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
index 7427231fb3..80fb5ebdcf 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPTCFissionFS.hh,v 1.3 1999/07/02 09:59:59 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPTCFissionFS_h
 #define G4NeutronHPTCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
index 323872ca87..a26f00585c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPTInelasticFS.hh,v 1.3 1999/07/02 10:00:00 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPTInelasticFS_h
 #define G4NeutronHPTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
index 2afb2f0350..92f947e9e4 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPVector.hh,v 1.7 1999/11/19 18:47:39 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPVector.hh,v 1.8 1999/12/15 14:53:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPVector_h
 #define G4NeutronHPVector_h 1
@@ -18,7 +18,7 @@
 #include "G4NeutronHPInterpolator.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4InterpolationManager.hh"
 #include "G4NeutronHPInterpolator.hh"
 #include <math.h>
@@ -63,7 +63,7 @@ class G4NeutronHPVector
     
   inline void SetData(G4int i, G4double x, G4double y) 
   { 
-//    G4cout <<"G4NeutronHPVector::SetData called"<<nPoints<<" "<<nEntries<<endl;
+//    G4cout <<"G4NeutronHPVector::SetData called"<<nPoints<<" "<<nEntries<<G4endl;
     Check(i);
     theData[i].SetData(x, y);
   }
@@ -110,12 +110,12 @@ class G4NeutronHPVector
 
   void Dump();
   
-  inline void InitInterpolation(ifstream & aDataFile)
+  inline void InitInterpolation(G4std::ifstream & aDataFile)
   {
     theManager.Init(aDataFile);
   }
   
-  void Init(ifstream & aDataFile, G4int total, G4double ux=1., G4double uy=1.)
+  void Init(G4std::ifstream & aDataFile, G4int total, G4double ux=1., G4double uy=1.)
   {
     G4double x,y;
     for (G4int i=0;i<total;i++)
@@ -127,7 +127,7 @@ class G4NeutronHPVector
     }
   }
   
-  void Init(ifstream & aDataFile,G4double ux=1., G4double uy=1.)
+  void Init(G4std::ifstream & aDataFile,G4double ux=1., G4double uy=1.)
   {
     if(theData!=NULL) delete [] theData;
     theData = new G4NeutronHPDataPoint[100]; 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
index edc477e864..7db079927c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPWattSpectrum.hh,v 1.3 1999/07/02 10:00:03 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPWattSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NeutronHPWattSpectrum_h
 #define G4NeutronHPWattSpectrum_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VNeutronHPEDis.hh"
 
 // we will need a List of these .... one per term.
@@ -33,7 +33,7 @@ class G4NeutronHPWattSpectrum : public G4VNeutronHPEDis
   {
   }
   
-  inline void Init(ifstream & aDataFile)
+  inline void Init(G4std::ifstream & aDataFile)
   {
     theFractionalProb.Init(aDataFile, eV);
     theApar.Init(aDataFile, eV);
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
index cfe5a8613a..7f6ad4481e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VNeutronHPEDis.hh,v 1.3 1999/07/02 10:00:04 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VNeutronHPEDis.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VNeutronHPEDis_h
 #define G4VNeutronHPEDis_h 1
@@ -17,7 +17,7 @@
 #include "G4NeutronHPVector.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 class G4VNeutronHPEDis
 {
@@ -29,7 +29,7 @@ class G4VNeutronHPEDis
   {
   }
   
-  virtual void Init(ifstream & theData) = 0;
+  virtual void Init(G4std::ifstream & theData) = 0;
   
   virtual G4double GetFractionalProbability(G4double anEnergy) = 0;
   
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
index b3d6a365a0..593b51fd2f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
@@ -7,14 +7,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VNeutronHPEnergyAngular.hh,v 1.3 1999/07/02 10:00:05 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VNeutronHPEnergyAngular.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VNeutronHPEnergyAngular_h
 #define G4VNeutronHPEnergyAngular_h 1
 
 #include "G4ios.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 #include "globals.hh"
 #include "G4ReactionProduct.hh"
 
@@ -32,7 +32,7 @@ class G4VNeutronHPEnergyAngular
   
   public:
   
-  virtual void Init(ifstream & aDataFile) = 0;
+  virtual void Init(G4std::ifstream & aDataFile) = 0;
   virtual G4ReactionProduct * Sample(G4double anEnergy, 
                                      G4double massCode, 
                                      G4double mass) = 0;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc b/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
index 59f95837b9..0702eed18b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
@@ -65,7 +65,7 @@
    {
      if(aPoint!=nEntries) 
      {
-       G4cout <<"G4InterpolationManager::AppendScheme - "<<aPoint<<" "<<nEntries<<endl;
+       G4cout <<"G4InterpolationManager::AppendScheme - "<<aPoint<<" "<<nEntries<<G4endl;
        G4Exception("Wrong usage of G4InterpolationManager::AppendScheme");
      }
      if(nEntries==0)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
index d1564adea2..07b9844abd 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
@@ -4,9 +4,9 @@
 //
 #include "G4NeutronHPAngular.hh"
 
-void G4NeutronHPAngular::Init(ifstream & aDataFile)
+void G4NeutronHPAngular::Init(G4std::ifstream & aDataFile)
 {
-//  G4cout << "here we are entering the Angular Init"<<endl;
+//  G4cout << "here we are entering the Angular Init"<<G4endl;
   G4int dummy;
   aDataFile >> theAngularDistributionType >> targetMass;
   aDataFile >> frameFlag;
@@ -57,7 +57,7 @@ void G4NeutronHPAngular::Init(ifstream & aDataFile)
   else
   {
     theIsoFlag = false;
-    G4cout << "unknown distribution found for Angular"<<endl;
+    G4cout << "unknown distribution found for Angular"<<G4endl;
     G4Exception("unknown distribution needs implementation!!!");
   }    
 }
@@ -146,5 +146,5 @@ void G4NeutronHPAngular::SampleAndUpdate(G4ReactionProduct & aHadron)
   }
   aHadron.Lorentz(aHadron, -1.*theTarget); 
 //  G4cout << aHadron.GetMomentum()<<" ";
-//  G4cout << aHadron.GetTotalMomentum()<<endl;
+//  G4cout << aHadron.GetTotalMomentum()<<G4endl;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
index 184ddc13a9..258daffea3 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
@@ -23,7 +23,7 @@
       if(nDistFunc==0)
       {
         G4cerr << "No distribution functions to sample "
-             << "from in G4NeutronHPArbitaryTab::Sample"<<endl;
+             << "from in G4NeutronHPArbitaryTab::Sample"<<G4endl;
         G4Exception();
       } 
       else 
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
index ef90646f53..b6f027a488 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
@@ -7,33 +7,33 @@
 
   G4NeutronHPCapture::G4NeutronHPCapture()
   {
-//    G4cout << "Capture : start of construction!!!!!!!!"<<endl;
+//    G4cout << "Capture : start of construction!!!!!!!!"<<G4endl;
     if(!getenv("NeutronHPCrossSections")) 
        G4Exception("Please setenv NeutronHPCrossSections to point to the neutron cross-section files.");
     dirName = getenv("NeutronHPCrossSections");
     G4String tString = "/Capture/";
     dirName = dirName + tString;
     numEle = G4Element::GetNumberOfElements();
-//    G4cout << "+++++++++++++++++++++++++++++++++++++++++++++++++"<<endl;
-//    G4cout <<"Disname="<<dirName<<" numEle="<<numEle<<endl;
+//    G4cout << "+++++++++++++++++++++++++++++++++++++++++++++++++"<<G4endl;
+//    G4cout <<"Disname="<<dirName<<" numEle="<<numEle<<G4endl;
     theCapture = new G4NeutronHPChannel[numEle];
-//    G4cout <<"G4NeutronHPChannel constructed"<<endl;
+//    G4cout <<"G4NeutronHPChannel constructed"<<G4endl;
     G4NeutronHPCaptureFS * theFS = new G4NeutronHPCaptureFS;
     for (G4int i=0; i<numEle; i++)
     {
-//      G4cout << "initializing theCapture "<<i<<" "<< numEle<<endl;
+//      G4cout << "initializing theCapture "<<i<<" "<< numEle<<G4endl;
       theCapture[i].Init((*(G4Element::GetElementTable()))(i), dirName);
       theCapture[i].Register(theFS);
     }
     delete theFS;
-//    G4cout << "-------------------------------------------------"<<endl;
-//    G4cout << "Leaving G4NeutronHPCapture::G4NeutronHPCapture"<<endl;
+//    G4cout << "-------------------------------------------------"<<G4endl;
+//    G4cout << "Leaving G4NeutronHPCapture::G4NeutronHPCapture"<<G4endl;
   }
   
   G4NeutronHPCapture::~G4NeutronHPCapture()
   {
     delete [] theCapture;
-//    G4cout << "Leaving G4NeutronHPCapture::~G4NeutronHPCapture"<<endl;
+//    G4cout << "Leaving G4NeutronHPCapture::~G4NeutronHPCapture"<<G4endl;
   }
   
   G4VParticleChange * G4NeutronHPCapture::ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
index a5b579053d..4a8a85a1c5 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
@@ -45,7 +45,7 @@ void G4NeutronHPCaptureData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4cout << "G4NeutronHPCaptureData::DumpPhysicsTable still to be implemented"<<endl;
+  G4cout << "G4NeutronHPCaptureData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
 G4double G4NeutronHPCaptureData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
index d65d579e1f..63a4a344ae 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
@@ -107,7 +107,7 @@
       hasXsec = false;
       return;
     }
-    ifstream theData(filename, ios::in);
+    G4std::ifstream theData(filename, G4std::ios::in);
     
     hasFSData = theFinalStatePhotons.InitMean(theData); 
     if(hasFSData)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
index d5ddfb2bc9..ee6e6ca57b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
@@ -65,7 +65,7 @@
     {
       for (G4int i1=0; i1<nIsos; i1++)
       {
-//        G4cout <<" Init: normal case"<<endl;
+//        G4cout <<" Init: normal case"<<G4endl;
         G4int A = theElement->GetIsotope(i1)->GetN();
         G4double frac = theElement->GetRelativeAbundanceVector()[i1]/perCent;
         UpdateData(A, Z, count++, frac);
@@ -142,7 +142,7 @@
     }
     while (p!=aPassive->GetVectorLength())
     {
-      if(abs(theMerge->GetEnergy(max(0,m-1))-aPassive->GetEnergy(p))/aPassive->GetEnergy(p)>0.001)
+      if(abs(theMerge->GetEnergy(G4std::max(0,m-1))-aPassive->GetEnergy(p))/aPassive->GetEnergy(p)>0.001)
         theMerge->SetData(m++, aPassive->GetEnergy(p), aPassive->GetXsec(p));
       p++;
     }
@@ -152,7 +152,7 @@
 
   G4ParticleChange * G4NeutronHPChannel::ApplyYourself(const G4Track & theTrack, G4int anIsotope)
   {
-//    G4cout << "G4NeutronHPChannel::ApplyYourself+"<<niso<<endl;
+//    G4cout << "G4NeutronHPChannel::ApplyYourself+"<<niso<<G4endl;
     if(anIsotope != -1) return theFinalStates[anIsotope]->ApplyYourself(theTrack);
     G4double sum=0;
     G4int it=0;
@@ -171,18 +171,18 @@
     } 
     if(sum == 0) 
     {
-//      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize+"<<endl;
-//      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize-"<<endl;
+//      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize+"<<G4endl;
+//      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize-"<<G4endl;
       it = niso*G4UniformRand();
     }
     else
     {
-//      G4cout << "Are we still here? "<<sum<<endl;
-//      G4cout << "TESTHP 23 NISO="<<niso<<endl;
+//      G4cout << "Are we still here? "<<sum<<G4endl;
+//      G4cout << "TESTHP 23 NISO="<<niso<<G4endl;
       G4double random = G4UniformRand();
       G4double running=0;
-//      G4cout << "G4NeutronHPChannel::ApplyYourself Done the sum"<<niso<<endl;
-//      G4cout << "TESTHP 24 NISO="<<niso<<endl;
+//      G4cout << "G4NeutronHPChannel::ApplyYourself Done the sum"<<niso<<G4endl;
+//      G4cout << "TESTHP 24 NISO="<<niso<<G4endl;
       for (G4int ix=0; ix<niso; ix++)
       {
         running += xsec[ix];
@@ -199,10 +199,10 @@
     G4ParticleChange * theFinalState=NULL;
     while(theFinalState==NULL)
     {
-//    G4cout << "TESTHP 24 it="<<it<<endl;
+//    G4cout << "TESTHP 24 it="<<it<<G4endl;
       theFinalState = theFinalStates[it]->ApplyYourself(theTrack);
     }
-//    G4cout <<"THE IMPORTANT RETURN"<<endl;
+//    G4cout <<"THE IMPORTANT RETURN"<<G4endl;
     return theFinalState;
   }
 
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
index 1d660bdec5..26a658a6e7 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
@@ -95,9 +95,9 @@
   void G4NeutronHPChannelList::Init(G4Element * anElement, const G4String & dirName)
   {
     theDir = dirName;
-//    G4cout << theDir << endl;
+//    G4cout << theDir << G4endl;
     theElement = anElement;
-//    G4cout << theElement << endl;
+//    G4cout << theElement << G4endl;
     ;
   }
   
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
index 5c93866f64..7dcf46761b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
@@ -18,7 +18,7 @@
 #include "G4NeutronHPKallbachMannSyst.hh"
 #include "G4ParticleTable.hh"
  
-  void G4NeutronHPContAngularPar::Init(ifstream & aDataFile)
+  void G4NeutronHPContAngularPar::Init(G4std::ifstream & aDataFile)
   {
     aDataFile >> theEnergy >> nEnergies >> nDiscreteEnergies >> nAngularParameters;
     theEnergy *= eV;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
index b6edf46563..971fe4e0f5 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
@@ -11,7 +11,7 @@
   {
      numEle = G4Element::GetNumberOfElements();
      theData = new G4NeutronHPElementData[numEle];
-//     G4cout << "G4NeutronHPData::G4NeutronHPData(): numEle="<<numEle<<endl;
+//     G4cout << "G4NeutronHPData::G4NeutronHPData(): numEle="<<numEle<<G4endl;
      for (G4int i=0; i<numEle; i++)
      {
        theData[i].Init((*(G4Element::GetElementTable()))(i));
@@ -25,15 +25,15 @@
   
   G4PhysicsVector * G4NeutronHPData::DoPhysicsVector(G4NeutronHPVector * theVector)
   {
-//    G4cout << "Entered G4NeutronHPData::DoPhysicsVector."<<endl;
+//    G4cout << "Entered G4NeutronHPData::DoPhysicsVector."<<G4endl;
     G4int len = theVector->GetVectorLength();
-//    G4cout <<"zahl der energie-punkte "<< len<<endl;
+//    G4cout <<"zahl der energie-punkte "<< len<<G4endl;
     if(len==0) return new G4LPhysicsFreeVector(0, 0, 0);
     G4double emin = theVector->GetX(0);
     G4double emax = theVector->GetX(len-1);
-//    G4cout <<"zahl der energie-punkte "<< len<<" "<<emin<<" "<<emax<<endl;
+//    G4cout <<"zahl der energie-punkte "<< len<<" "<<emin<<" "<<emax<<G4endl;
     
-   //  G4int dummy; cin >> dummy; 
+   //  G4int dummy; G4cin >> dummy; 
     G4bool flag;
     
     G4LPhysicsFreeVector * theResult = new G4LPhysicsFreeVector(len, emin, emax);
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
index 90503a46dd..c2fb74e189 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
@@ -4,7 +4,7 @@
 //
 #include "G4NeutronHPDeExGammas.hh"
 
-void G4NeutronHPDeExGammas::Init(ifstream & aDataFile)
+void G4NeutronHPDeExGammas::Init(G4std::ifstream & aDataFile)
 {
   G4NeutronHPGamma ** theGammas = new G4NeutronHPGamma * [50];
   G4int nGammas = 0;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
index a33e1b81ce..79ed390b0d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
@@ -13,7 +13,7 @@
     dirName = getenv("NeutronHPCrossSections");
     G4String tString = "/Elastic/";
     dirName = dirName + tString;
-//    G4cout <<"G4NeutronHPElastic::G4NeutronHPElastic testit "<<dirName<<endl;
+//    G4cout <<"G4NeutronHPElastic::G4NeutronHPElastic testit "<<dirName<<G4endl;
     numEle = G4Element::GetNumberOfElements();
     theElastic = new G4NeutronHPChannel[numEle];
     for (G4int i=0; i<numEle; i++)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
index 0125796f41..143d1889e6 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
@@ -45,7 +45,7 @@ void G4NeutronHPElasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-//  G4cout << "G4NeutronHPElasticData::DumpPhysicsTable still to be implemented"<<endl;
+//  G4cout << "G4NeutronHPElasticData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
 G4double G4NeutronHPElasticData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
index d73d74e434..e6d8a8f29a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
@@ -29,7 +29,7 @@
       hasXsec = false;
       return;
     }
-    ifstream theData(filename, ios::in);
+    G4std::ifstream theData(filename, G4std::ios::in);
     theData >> repFlag >> targetMass >> frameFlag;
     if(repFlag==1)
     {
@@ -86,22 +86,22 @@
     }
     else
     {
-      G4cout << "unusable number for repFlag: repFlag="<<repFlag<<endl;
+      G4cout << "unusable number for repFlag: repFlag="<<repFlag<<G4endl;
       G4Exception("G4NeutronHPElasticFS::Init -- unusable number for repFlag");
     }
   }
   G4ParticleChange * G4NeutronHPElasticFS::ApplyYourself(const G4Track & theTrack)
   {  
     G4int i, ii, iii;
-//    G4cout << "G4NeutronHPElasticFS::ApplyYourself+"<<endl;
+//    G4cout << "G4NeutronHPElasticFS::ApplyYourself+"<<G4endl;
     theResult.Initialize(theTrack);   
     G4double eKinetic = theTrack.GetKineticEnergy();
     const G4DynamicParticle *incidentParticle = theTrack.GetDynamicParticle();
     G4ReactionProduct theNeutron( incidentParticle->GetDefinition() );
     theNeutron.SetMomentum( incidentParticle->GetMomentum() );
     theNeutron.SetKineticEnergy( eKinetic );
-//    G4cout << "G4NeutronHPElasticFS::ApplyYourself++"<<eKinetic<<" "<<endl;
-//    G4cout << "CMSVALUES 0 "<<theNeutron.GetTotalMomentum()<<endl;
+//    G4cout << "G4NeutronHPElasticFS::ApplyYourself++"<<eKinetic<<" "<<G4endl;
+//    G4cout << "CMSVALUES 0 "<<theNeutron.GetTotalMomentum()<<G4endl;
     G4double pold = theNeutron.GetTotalMomentum();
     
     G4ReactionProduct theTarget; 
@@ -110,7 +110,7 @@
 //     G4cout << "Nucleus-test"<<" "<<targetMass<<" ";
 //     G4cout << theTarget.GetMomentum().x()<<" ";
 //     G4cout << theTarget.GetMomentum().y()<<" ";
-//     G4cout << theTarget.GetMomentum().z()<<endl;
+//     G4cout << theTarget.GetMomentum().z()<<G4endl;
     
     // neutron and target defined as reaction products.
 
@@ -119,7 +119,7 @@
     G4ThreeVector the3Neutron = theNeutron.GetMomentum();
     G4double nEnergy = theNeutron.GetTotalEnergy();
     G4ThreeVector the3Target = theTarget.GetMomentum();
-//    cout << "@@@" << the3Target<<endl;
+//    cout << "@@@" << the3Target<<G4endl;
     G4double tEnergy = theTarget.GetTotalEnergy();
     G4ReactionProduct theCMS;
     G4double totE = nEnergy+tEnergy;
@@ -150,7 +150,7 @@
     }
     else
     {
-      G4cout << "unusable number for repFlag: repFlag="<<repFlag<<endl;
+      G4cout << "unusable number for repFlag: repFlag="<<repFlag<<G4endl;
       G4Exception("G4NeutronHPElasticFS::Init -- unusable number for repFlag");
     }
     if(cosTh<-1.1) return NULL;
@@ -246,7 +246,7 @@
     theRecoil->SetMomentum(theTarget.GetMomentum());
     theResult.SetNumberOfSecondaries(1);
     theResult.AddSecondary(theRecoil);
-//    G4cout << "G4NeutronHPElasticFS::ApplyYourself 10+"<<endl;
+//    G4cout << "G4NeutronHPElasticFS::ApplyYourself 10+"<<G4endl;
     // postpone the tracking of the primary neutron
      theResult.SetStatusChange(fSuspend);
     return &theResult;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
index c1953fefa9..968a2ecfe3 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
@@ -38,23 +38,23 @@
     {
       for (i1=0; i1<nIso; i1++)
       {
-//        G4cout <<" Init: normal case"<<endl;
+//        G4cout <<" Init: normal case"<<G4endl;
         G4int A = theElement->GetIsotope(i1)->GetN();
         G4double frac = theElement->GetRelativeAbundanceVector()[i1]/perCent;
         UpdateData(A, Z, count++, frac);
       }
     }else{
-//      G4cout <<" Init: theStableOnes case: Z="<<Z<<endl;
+//      G4cout <<" Init: theStableOnes case: Z="<<Z<<G4endl;
       G4int first = theStableOnes.GetFirstIsotope(Z);
-//      G4cout <<"first="<<first<<" "<<theStableOnes.GetNumberOfIsotopes(theElement->GetZ())<<endl;
+//      G4cout <<"first="<<first<<" "<<theStableOnes.GetNumberOfIsotopes(theElement->GetZ())<<G4endl;
       for(G4int i1=0; 
         i1<theStableOnes.GetNumberOfIsotopes(theElement->GetZ());
         i1++)
       {
-//        G4cout <<" Init: theStableOnes in the loop"<<endl;
+//        G4cout <<" Init: theStableOnes in the loop"<<G4endl;
         G4int A = theStableOnes.GetIsotopeNucleonCount(first+i1);
         G4double frac = theStableOnes.GetAbundance(first+i1);
-//        G4cout <<" Init: theStableOnes in the loop: "<<A<<endl;
+//        G4cout <<" Init: theStableOnes in the loop: "<<A<<G4endl;
         UpdateData(A, Z, count++, frac);
       }
     }
@@ -67,40 +67,40 @@
   void G4NeutronHPElementData::UpdateData(G4int A, G4int Z, G4int index, G4double abundance)
   {
     //Reads in the Data, using G4NeutronHPIsoData[], and its Init
-//    G4cout << "entered: ElementWiseData::UpdateData"<<endl;
+//    G4cout << "entered: ElementWiseData::UpdateData"<<G4endl;
     theIsotopeWiseData[index].Init(A, Z, abundance);
-//    G4cout << "ElementWiseData::UpdateData Init finished"<<endl;
+//    G4cout << "ElementWiseData::UpdateData Init finished"<<G4endl;
 
     theBuffer = theIsotopeWiseData[index].MakeElasticData();
 //    G4cout << "ElementWiseData::UpdateData MakeElasticData finished: "
-//         <<theBuffer->GetVectorLength()<<endl;
+//         <<theBuffer->GetVectorLength()<<G4endl;
     Harmonise(theElasticData, theBuffer);
 //    G4cout << "ElementWiseData::UpdateData Harmonise finished: "
-//         <<theElasticData->GetVectorLength()<<endl;
+//         <<theElasticData->GetVectorLength()<<G4endl;
     delete theBuffer;
     
     theBuffer = theIsotopeWiseData[index].MakeInelasticData();
 //    G4cout << "ElementWiseData::UpdateData MakeInelasticData finished: "
-//         <<theBuffer->GetVectorLength()<<endl;
+//         <<theBuffer->GetVectorLength()<<G4endl;
     Harmonise(theInelasticData, theBuffer);
 //    G4cout << "ElementWiseData::UpdateData Harmonise finished: "
-//         <<theInelasticData->GetVectorLength()<<endl;
+//         <<theInelasticData->GetVectorLength()<<G4endl;
     delete theBuffer;
     
     theBuffer = theIsotopeWiseData[index].MakeCaptureData();
 //    G4cout << "ElementWiseData::UpdateData MakeCaptureData finished: "
-//         <<theBuffer->GetVectorLength()<<endl;
+//         <<theBuffer->GetVectorLength()<<G4endl;
     Harmonise(theCaptureData, theBuffer);
 //    G4cout << "ElementWiseData::UpdateData Harmonise finished: "
-//         <<theCaptureData->GetVectorLength()<<endl;
+//         <<theCaptureData->GetVectorLength()<<G4endl;
     delete theBuffer;
     
     theBuffer = theIsotopeWiseData[index].MakeFissionData();
 //    G4cout << "ElementWiseData::UpdateData MakeFissionData finished: "
-//         <<theBuffer->GetVectorLength()<<endl;
+//         <<theBuffer->GetVectorLength()<<G4endl;
     Harmonise(theFissionData, theBuffer);
 //    G4cout << "ElementWiseData::UpdateData Harmonise finished: "
-//         <<theFissionData->GetVectorLength()<<endl;
+//         <<theFissionData->GetVectorLength()<<G4endl;
     delete theBuffer;
     
 //    G4cout << "ElementWiseData::UpdateData finished"<endl;
@@ -112,7 +112,7 @@
     G4int s = 0, n=0, i=0, m=0;
     G4NeutronHPVector * theMerge = new G4NeutronHPVector;
     G4bool flag;
-//    G4cout << "Harmonise 1: "<<theStore->GetEnergy(s)<<" "<<theNew->GetEnergy(0)<<endl;
+//    G4cout << "Harmonise 1: "<<theStore->GetEnergy(s)<<" "<<theNew->GetEnergy(0)<<G4endl;
     while ( theStore->GetEnergy(s)<theNew->GetEnergy(0)&&s<theStore->GetVectorLength() )
     {
       theMerge->SetData(m++, theStore->GetEnergy(s), theStore->GetXsec(s));
@@ -122,7 +122,7 @@
     G4NeutronHPVector * passive = theNew;
     G4NeutronHPVector * tmp;
     G4int a = s, p = n, t;
-//    G4cout << "Harmonise 2: "<<active->GetVectorLength()<<" "<<passive->GetVectorLength()<<endl;
+//    G4cout << "Harmonise 2: "<<active->GetVectorLength()<<" "<<passive->GetVectorLength()<<G4endl;
     while (a<active->GetVectorLength()&&p<passive->GetVectorLength())
     {
       if(active->GetEnergy(a) <= passive->GetEnergy(p))
@@ -134,28 +134,28 @@
         m++;
         a++;
       } else {
-//        G4cout << "swapping in Harmonise"<<endl;
+//        G4cout << "swapping in Harmonise"<<G4endl;
         tmp = active; t=a;
         active = passive; a=p;
         passive = tmp; p=t;
       }
     }
-//    G4cout << "Harmonise 3: "<< a <<" "<<active->GetVectorLength()<<" "<<m<<endl;
+//    G4cout << "Harmonise 3: "<< a <<" "<<active->GetVectorLength()<<" "<<m<<G4endl;
     while (a!=active->GetVectorLength())
     {
       theMerge->SetData(m++, active->GetEnergy(a), active->GetXsec(a));
       a++;
     }
-//    G4cout << "Harmonise 4: "<< p <<" "<<passive->GetVectorLength()<<" "<<m<<endl;
+//    G4cout << "Harmonise 4: "<< p <<" "<<passive->GetVectorLength()<<" "<<m<<G4endl;
     while (p!=passive->GetVectorLength())
     {
       theMerge->SetData(m++, passive->GetEnergy(p), passive->GetXsec(p));
       p++;
     }
-//    G4cout <<"Harmonise 5: "<< theMerge->GetVectorLength() << " " << m << endl;
+//    G4cout <<"Harmonise 5: "<< theMerge->GetVectorLength() << " " << m << G4endl;
     delete theStore;
     theStore = theMerge;
-//    G4cout <<"Harmonise 6: "<< theStore->GetVectorLength() << " " << m << endl;
+//    G4cout <<"Harmonise 6: "<< theStore->GetVectorLength() << " " << m << G4endl;
   }
 
   G4NeutronHPVector * G4NeutronHPElementData::MakePhysicsVector(G4Element * theElement,
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
index def6c3b832..576e654d8b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
@@ -79,7 +79,7 @@ G4ReactionProductVector * G4NeutronHPEnAngCorrelation::Sample(G4double anEnergy)
 #ifdef G4_NHP_DEBUG
           cout <<"G4NeutronHPEnAngCorrelation: "<<
         	 it->at(ii)->GetTotalEnergy()<<" "<<
-        	 it->at(ii)->GetMomentum()<<endl;
+        	 it->at(ii)->GetMomentum()<<G4endl;
 #endif
           it->at(ii)->Lorentz(*(it->at(ii)), -1.*theCMS);
 	}
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
index 5a59e6f842..0863f9712a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
@@ -13,7 +13,7 @@
   G4DynamicParticleVector * G4NeutronHPFCFissionFS::ApplyYourself(G4int nNeutrons)
   {  
     G4DynamicParticleVector * aResult;
-//    G4cout <<"G4NeutronHPFCFissionFS::ApplyYourself +"<<endl;
+//    G4cout <<"G4NeutronHPFCFissionFS::ApplyYourself +"<<G4endl;
     aResult = G4NeutronHPFissionBaseFS::ApplyYourself(nNeutrons);    
     return aResult;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
index 567a503666..eefc2c4114 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
@@ -26,8 +26,8 @@
       hasXsec = false;
       return;
     }
-#ifndef WIN32
-    ifstream theData(filename, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+    G4std::ifstream theData(filename, G4std::ios::in);
 #else
     ifstream theData(filename, ios::in|ios::nocreate);
 #endif
@@ -61,7 +61,7 @@
           if(dataType==1) theEnergyRelease.Init(theData); 
           break;
         default:
-          G4cout << "G4NeutronHPFSFissionFS::Init: unknown data type"<<dataType<<endl;
+          G4cout << "G4NeutronHPFSFissionFS::Init: unknown data type"<<dataType<<G4endl;
           G4Exception("G4NeutronHPFSFissionFS::Init: unknown data type");
           break;
       }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
index 94ae900285..a7c1273480 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
@@ -62,7 +62,7 @@
 
   void G4NeutronHPField::Dump()
   {
-    G4cout << nEntries<<endl;
+    G4cout << nEntries<<G4endl;
     for(G4int i=0; i<nEntries; i++)
     {
       G4cout << theData[i].GetX()<<" ";
@@ -70,7 +70,7 @@
       {
         G4cout << theData[i].GetY(j)<<" ";
       }
-      G4cout << endl;
+      G4cout << G4endl;
     }
   }
   
@@ -81,12 +81,12 @@
     {
       nPoints += 50;
       G4NeutronHPFieldPoint * buff = new G4NeutronHPFieldPoint[nPoints];
-//      G4cout << "copying 1"<<endl;
+//      G4cout << "copying 1"<<G4endl;
       for (G4int j=0; j<nEntries; j++) 
       {
         buff[j] = theData[j];
       }
-//      G4cout << "copying 2"<<endl;
+//      G4cout << "copying 2"<<G4endl;
       delete [] theData;
       theData = buff;
     }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
index 34986ce90a..cbc3c6f25c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
@@ -28,8 +28,8 @@
       hasXsec = false;
       return; // no data for exactly this isotope.
     }
-#ifndef WIN32
-    ifstream theData(filename, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+    G4std::ifstream theData(filename, G4std::ios::in);
 #else
     ifstream theData(filename, ios::in|ios::nocreate);
 #endif
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
index db815dcb2a..c02c6d612a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
@@ -46,7 +46,7 @@ void G4NeutronHPFissionData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4cout << "G4NeutronHPFissionData::DumpPhysicsTable still to be implemented"<<endl;
+  G4cout << "G4NeutronHPFissionData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
 G4double G4NeutronHPFissionData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
index 31e62eab1c..6ae501e343 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
@@ -129,7 +129,7 @@
     }
     else
     {
-//    cout << " all = "<<all<<endl;
+//    cout << " all = "<<all<<G4endl;
       theFS.SampleNeutronMult(all, Prompt, delayed, eKinetic, 0);
       theDecayConstants = new G4double[delayed];
       if(Prompt==0&&delayed==0) Prompt=all;
@@ -150,7 +150,7 @@
       delete theNeutrons;   
     }
     delete [] theDecayConstants;
-//    cout << "all delayed "<<delayed<<endl; 
+//    cout << "all delayed "<<delayed<<G4endl; 
     G4int nPhotons = 0;
     if(thePhotons!=NULL)
     {
@@ -165,15 +165,15 @@
 // do some rotating, if that helps to conserve momentum @@@@
          
 // finally deal with local energy depositions.
-//    G4cout <<"Number of secondaries = "<<theResult.GetNumberOfSecondaries()<< endl;
-//    G4cout <<"Number of Prompt = "<<Prompt<<endl;
-//    G4cout <<"Number of delayed = "<<delayed<<endl;
-//    G4cout <<"Number of photons = "<<nPhotons<<endl;
+//    G4cout <<"Number of secondaries = "<<theResult.GetNumberOfSecondaries()<< G4endl;
+//    G4cout <<"Number of Prompt = "<<Prompt<<G4endl;
+//    G4cout <<"Number of delayed = "<<delayed<<G4endl;
+//    G4cout <<"Number of photons = "<<nPhotons<<G4endl;
     G4NeutronHPFissionERelease * theERelease;
     theERelease = theFS.GetEnergyRelease();
     G4double eDepByFragments = theERelease->GetFragmentKinetic();
     theResult.SetLocalEnergyDeposit(eDepByFragments);
-//    cout << "local energy deposit" << eDepByFragments<<endl;
+//    cout << "local energy deposit" << eDepByFragments<<G4endl;
 // clean up the primary neutron
     theResult.SetStatusChange(fStopAndKill);
     return &theResult;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
index cb450ea775..b4e0fb9a94 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
@@ -4,7 +4,7 @@
 //
 #include "G4NeutronHPGamma.hh"
 
-G4bool G4NeutronHPGamma::Init(ifstream & aDataFile)
+G4bool G4NeutronHPGamma::Init(G4std::ifstream & aDataFile)
 {
   G4bool theResult = true;
   if(aDataFile >> levelEnergy)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
index 8bd9d84f28..67eb427c10 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
@@ -7,8 +7,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPInelastic.cc,v 1.3 1999/07/02 12:27:15 hpw Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronHPInelastic.cc,v 1.4 1999/12/15 14:53:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4NeutronHPInelastic.hh"
 
@@ -17,7 +17,7 @@
     SetMinEnergy( 0.0 );
     SetMaxEnergy( 20.*MeV );
     system("echo $NeutronHPCrossSections");
-//    G4cout << " entering G4NeutronHPInelastic constructor"<<endl;
+//    G4cout << " entering G4NeutronHPInelastic constructor"<<G4endl;
     if(!getenv("NeutronHPCrossSections")) 
        G4Exception("Please setenv NeutronHPCrossSections to point to the neutron cross-section files.");
     dirName = getenv("NeutronHPCrossSections");
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
index 2b889bf6ac..70b7809368 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
@@ -13,16 +13,16 @@
 void G4NeutronHPInelasticBaseFS::InitGammas(G4double AR, G4double ZR)
 {
    char the[100] = {""};
-   ostrstream ost(the, 100, ios::out);
+   G4std::ostrstream ost(the, 100, G4std::ios::out);
    ost <<gammaPath<<"z"<<ZR<<".a"<<AR;
    G4String * aName = new G4String(the);
-#ifndef WIN32
-   ifstream from(*aName, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+   G4std::ifstream from(*aName, G4std::ios::in);
 #else
    ifstream from(*aName, ios::in|ios::nocreate);
 #endif
    if(!from) return; // no data found for this isotope
-   ifstream theGammaData(*aName, ios::in);
+   G4std::ifstream theGammaData(*aName, G4std::ios::in);
     
    G4double eps = 0.001;
    theNuclearMassDifference = 
@@ -52,10 +52,10 @@ void G4NeutronHPInelasticBaseFS::Init (G4double A, G4double Z, G4String & dirNam
     hasXsec = false;
     return;
   }
-#ifndef WIN32
-  ifstream theData(filename, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+  G4std::ifstream theData(filename, G4std::ios::in);
 #else
-  ifstream theData(filename, ios::in|ios::nocreate);
+  G4std::ifstream theData(filename, G4std::ios::in|G4std::ios::nocreate);
 #endif
   if(!(theData))
   {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
index c997f1716d..b90c693e86 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
@@ -13,16 +13,16 @@
 void G4NeutronHPInelasticCompFS::InitGammas(G4double AR, G4double ZR)
 {
    char the[100] = {""};
-   ostrstream ost(the, 100, ios::out);
+   G4std::ostrstream ost(the, 100, G4std::ios::out);
    ost <<gammaPath<<"z"<<ZR<<".a"<<AR;
    G4String * aName = new G4String(the);
-#ifndef WIN32
-   ifstream from(*aName, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+   G4std::ifstream from(*aName, G4std::ios::in);
 #else
    ifstream from(*aName, ios::in|ios::nocreate);
 #endif
    if(!from) return; // no data found for this isotope
-   ifstream theGammaData(*aName, ios::in);
+   G4std::ifstream theGammaData(*aName, G4std::ios::in);
     
    theGammas.Init(theGammaData);
    delete aName;
@@ -48,8 +48,8 @@ void G4NeutronHPInelasticCompFS::Init (G4double A, G4double Z, G4String & dirNam
     hasXsec = false;
     return;
   }
-#ifndef WIN32
-  ifstream theData(filename, ios::in);
+#ifdef G4USE_STD_NAMESPACE
+  G4std::ifstream theData(filename, G4std::ios::in);
 #else
   ifstream theData(filename, ios::in|ios::nocreate);
 #endif
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
index e5cf73cd0b..661524cac7 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
@@ -45,7 +45,7 @@ void G4NeutronHPInelasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4cout << "G4NeutronHPInelasticData::DumpPhysicsTable still to be implemented"<<endl;
+  G4cout << "G4NeutronHPInelasticData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
 G4double G4NeutronHPInelasticData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
index f32f6f1f38..5a91023ae2 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
@@ -14,8 +14,8 @@
     G4NeutronHPDataUsed aFile = theNames.GetName(A, Z, dirName, aFSType, result);
     filename = aFile.GetName();
 //    if(filename=="") return false;
-#ifndef WIN32
-    ifstream theChannel(filename);
+#ifdef G4USE_STD_NAMESPACE
+    G4std::ifstream theChannel(filename);
 #else
     ifstream theChannel(filename,ios::in|ios::nocreate);
 #endif
@@ -31,10 +31,10 @@
     G4int nData;
     theChannel >> nData;
     theChannelData->Init(theChannel, nData, eV, abundance*barn);
-//    G4cout << "Channel Data Statistics: "<<theChannelData->GetVectorLength()<<endl;
-//    G4cout << "Channel data"<<endl;
+//    G4cout << "Channel Data Statistics: "<<theChannelData->GetVectorLength()<<G4endl;
+//    G4cout << "Channel data"<<G4endl;
 //     G4int hpw;
-//     cin >> hpw;
+//     G4cin >> hpw;
 //    theChannelData->Dump();
     return result;
   }
@@ -69,17 +69,17 @@
     theInelasticData = theChannelData;
     theChannelData = NULL;
     
-//    if(theInelasticData!=NULL) G4cout << "Inelastic Data Statistics: "<<theInelasticData->GetVectorLength()<<endl;
-//    if(theElasticData!=NULL) G4cout << "Elastic Data Statistics: "<<theElasticData->GetVectorLength()<<endl;
-//    if(theCaptureData!=NULL) G4cout << "Capture Data Statistics: "<<theCaptureData->GetVectorLength()<<endl;
-//    if(theFissionData!=NULL) G4cout << "Fission Data Statistics: "<<theFissionData->GetVectorLength()<<endl;
-//  G4cout << "Inelastic data"<<endl;
+//    if(theInelasticData!=NULL) G4cout << "Inelastic Data Statistics: "<<theInelasticData->GetVectorLength()<<G4endl;
+//    if(theElasticData!=NULL) G4cout << "Elastic Data Statistics: "<<theElasticData->GetVectorLength()<<G4endl;
+//    if(theCaptureData!=NULL) G4cout << "Capture Data Statistics: "<<theCaptureData->GetVectorLength()<<G4endl;
+//    if(theFissionData!=NULL) G4cout << "Fission Data Statistics: "<<theFissionData->GetVectorLength()<<G4endl;
+//  G4cout << "Inelastic data"<<G4endl;
 //  if(theInelasticData!=NULL) theInelasticData->Dump();
-//  G4cout << "Elastic data"<<endl;
+//  G4cout << "Elastic data"<<G4endl;
 //  if(theElasticData!=NULL) theElasticData->Dump();
-//  G4cout << "Capture data"<<endl;
+//  G4cout << "Capture data"<<G4endl;
 //  if(theCaptureData!=NULL) theCaptureData->Dump();
-//  G4cout << "Fission data"<<endl;
+//  G4cout << "Fission data"<<G4endl;
 //  if(theFissionData!=NULL) theFissionData->Dump();
 
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
index a8f032c0e0..45caca2794 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
@@ -14,7 +14,7 @@
 #include "G4He3.hh"
 #include "G4Alpha.hh"
 
-void G4NeutronHPIsotropic::Init(ifstream & aDataFile)
+void G4NeutronHPIsotropic::Init(G4std::ifstream & aDataFile)
 {
 }
 
@@ -63,7 +63,7 @@ G4ReactionProduct * G4NeutronHPIsotropic::Sample(G4double anEnergy, G4double mas
    G4double sinth = sin(theta);
    
 // we need the the Q value of the reaction
-   result->SetKineticEnergy(max(0.001*MeV, anEnergy+GetQValue()));
+   result->SetKineticEnergy(G4std::max(0.001*MeV, anEnergy+GetQValue()));
    G4double mtot = result->GetTotalMomentum(); 
    G4ThreeVector tempVector(mtot*sinth*cos(phi), mtot*sinth*sin(phi), mtot*cos(theta) );
    result->SetMomentum(tempVector);
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
index 1a1cac0e76..e1a12ca8c8 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
@@ -60,7 +60,7 @@ G4double G4NeutronHPKallbachMannSyst::A(G4double anEnergy)
     G4int ZA = theTargetZ;
     G4double ea = epsa+SeparationEnergy(Ac, Nc, AA, ZA);
     G4double Et1 = 130*MeV;
-    G4double R1 = min(ea, Et1);
+    G4double R1 = G4std::min(ea, Et1);
     // theProductEnergy is still in CMS!!!
     G4double epsb = theProductEnergy*(theProductMass+theResidualMass)/theResidualMass;
     G4int AB = theResidualA;
@@ -68,7 +68,7 @@ G4double G4NeutronHPKallbachMannSyst::A(G4double anEnergy)
     G4double eb = epsb+SeparationEnergy(Ac, Nc, AB, ZB );
   G4double X1 = R1*eb/ea; 
     G4double Et3 = 41*MeV;
-    G4double R3 = min(ea, Et3);
+    G4double R3 = G4std::min(ea, Et3);
   G4double X3 = R3*eb/ea;
   G4double Ma = 1;
   G4double mb;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
index 6068ac17e2..d8eaa8a659 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
@@ -13,7 +13,7 @@
   G4DynamicParticleVector * G4NeutronHPLCFissionFS::ApplyYourself(G4int NNeutrons)
   {  
     G4DynamicParticleVector * aResult;
-//    G4cout <<"G4NeutronHPLCFissionFS::ApplyYourself +"<<endl;
+//    G4cout <<"G4NeutronHPLCFissionFS::ApplyYourself +"<<G4endl;
     aResult = G4NeutronHPFissionBaseFS::ApplyYourself(NNeutrons);    
     return aResult;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
index efd3b17be8..52811be3b8 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
@@ -14,7 +14,7 @@
 #include "G4Alpha.hh"
 #include "Randomize.hh"
 
-void G4NeutronHPLabAngularEnergy::Init(ifstream & aDataFile)
+void G4NeutronHPLabAngularEnergy::Init(G4std::ifstream & aDataFile)
 {
   aDataFile >> nEnergies;
   theManager.Init(aDataFile);
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
index 3a71b93818..074156c9cc 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
@@ -7,7 +7,7 @@
 #include "G4NeutronHPInterpolator.hh"
 #include "G4NeutronHPFastLegendre.hh"
 #include "Randomize.hh"
-#include <iostream.h>
+#include "g4std/iostream"
 
 G4double G4NeutronHPLegendreStore::SampleMax (G4double anEnergy)
 {
@@ -21,7 +21,7 @@ G4double G4NeutronHPLegendreStore::SampleMax (G4double anEnergy)
     high = i0;
     if(theCoeff[i0].GetEnergy()>anEnergy) break;
   }
-  low = max(0, high-1);
+  low = G4std::max(0, high-1);
   G4NeutronHPInterpolator theInt;
   G4double lim=0.005;
   G4double x, x1, x2, y1, y2, y;
@@ -89,7 +89,7 @@ G4double G4NeutronHPLegendreStore::SampleElastic (G4double anEnergy)
     high = i0;
     if(theCoeff[i0].GetEnergy()>anEnergy) break;
   }
-  low = max(0, high-1);
+  low = G4std::max(0, high-1);
   G4NeutronHPInterpolator theInt;
   G4double lim=0.005;
   G4double x, x1, x2, y1, y2, y;
@@ -112,7 +112,7 @@ G4double G4NeutronHPLegendreStore::SampleElastic (G4double anEnergy)
   } 
   try1 = theInt.Interpolate(theManager.GetScheme(high), x, x1, x2, try01, try02);
   try2 = theInt.Interpolate(theManager.GetScheme(high), x, x1, x2, try11, try12);
-  theNorm = max(try1, try2);
+  theNorm = G4std::max(try1, try2);
   
   G4double value, random;
   G4double v1, v2;
@@ -143,22 +143,22 @@ G4double G4NeutronHPLegendreStore::Sample (G4double energy) // still in interpol
 {
   G4int i0, i1, i2, i3, i4;
   G4int low, high;
-//  G4cout << "G4NeutronHPLegendreStore::Sample "<<energy<<" "<<energy<<" "<<nEnergy<<endl;
+//  G4cout << "G4NeutronHPLegendreStore::Sample "<<energy<<" "<<energy<<" "<<nEnergy<<G4endl;
   for (i0=0; i0<nEnergy; i0++)
   {
-//     G4cout <<"theCoeff["<<i0<<"].GetEnergy() = "<<theCoeff[i0].GetEnergy()<<endl;
+//     G4cout <<"theCoeff["<<i0<<"].GetEnergy() = "<<theCoeff[i0].GetEnergy()<<G4endl;
     high = i0;
     if(theCoeff[i0].GetEnergy()>energy) break;
   }
-  low = max(0, high-1);
-//  G4cout << "G4NeutronHPLegendreStore::Sample high, low: "<<high<<", "<<low<<endl;
+  low = G4std::max(0, high-1);
+//  G4cout << "G4NeutronHPLegendreStore::Sample high, low: "<<high<<", "<<low<<G4endl;
   G4NeutronHPVector theBuffer;
   G4NeutronHPInterpolator theInt;
   G4double lim=0.005;
   G4double x1, x2, y1, y2, y;
   x1 = theCoeff[low].GetEnergy();
   x2 = theCoeff[high].GetEnergy();
-//  G4cout << "the xes "<<x1<<" "<<x2<<endl;
+//  G4cout << "the xes "<<x1<<" "<<x2<<G4endl;
   G4double costh=0;
   for(i0=0; i0<601; i0++)
   {
@@ -167,7 +167,7 @@ G4double G4NeutronHPLegendreStore::Sample (G4double energy) // still in interpol
     y2 = Integrate(high, costh);
     y = theInt.Interpolate(theManager.GetScheme(high), energy, x1, x2, y1, y2);
     theBuffer.SetData(i0, costh, y);
-//     G4cout << "Integration "<<low<<" "<<costh<<" "<<y1<<" "<<y2<<" "<<y<<endl;
+//     G4cout << "Integration "<<low<<" "<<costh<<" "<<y1<<" "<<y2<<" "<<y<<G4endl;
   }
   G4double rand = G4UniformRand();
   G4int it;
@@ -179,17 +179,17 @@ G4double G4NeutronHPLegendreStore::Sample (G4double energy) // still in interpol
 //         << theBuffer.GetY(i0)<<" "
 //         << theBuffer.GetY(600)<<" "
 //         << rand<<" "
-//         << theBuffer.GetY(i0)/theBuffer.GetY(600)<<endl;;
+//         << theBuffer.GetY(i0)/theBuffer.GetY(600)<<G4endl;;
   }
   if(it==601) it=600;
-//  G4cout << "G4NeutronHPLegendreStore::Sample it "<<rand<<" "<<it<<endl;
+//  G4cout << "G4NeutronHPLegendreStore::Sample it "<<rand<<" "<<it<<G4endl;
   G4double norm = theBuffer.GetY(600);
   if(norm==0) return -DBL_MAX; 
   x1 = theBuffer.GetY(it)/norm;
   x2 = theBuffer.GetY(it-1)/norm;
   y1 = theBuffer.GetX(it);
   y2 = theBuffer.GetX(it-1);
-//  G4cout << "G4NeutronHPLegendreStore::Sample x y "<<x1<<" "<<y1<<" "<<x2<<" "<<y2<<endl;
+//  G4cout << "G4NeutronHPLegendreStore::Sample x y "<<x1<<" "<<y1<<" "<<x2<<" "<<y2<<G4endl;
   return theInt.Interpolate(theManager.GetScheme(high), rand, x1, x2, y1, y2);
 }
 
@@ -204,6 +204,6 @@ G4double G4NeutronHPLegendreStore::Integrate(G4int k, G4double costh) // still i
     result += theCoeff[k].GetCoeff(l)*theLeg.Integrate(l, costh);
 //    G4cout << theCoeff[k].GetCoeff(l)<<" ";
   } 
-//  G4cout <<endl;
+//  G4cout <<G4endl;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
index 0ca121f4ef..74d515b6b3 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
@@ -23,7 +23,7 @@
     if(i==nEntries) nEntries++;
   }
   
-  void G4NeutronHPList::Init(ifstream & aDataFile, G4int nPar, G4double unit)
+  void G4NeutronHPList::Init(G4std::ifstream & aDataFile, G4int nPar, G4double unit)
   {
     G4int i;
     G4double y;
@@ -34,7 +34,7 @@
     }
   }
 
-  void G4NeutronHPList::Init(ifstream & aDataFile, G4double unit)
+  void G4NeutronHPList::Init(G4std::ifstream & aDataFile, G4double unit)
   {
     G4int total, i;
     aDataFile >> total;
@@ -48,12 +48,12 @@
   
   G4double G4NeutronHPList::GetValue(G4int i) 
   { 
-//    G4cout << "TestList "<<i<<" "<<nEntries<<endl;
+//    G4cout << "TestList "<<i<<" "<<nEntries<<G4endl;
     if(nEntries<0)
     {
-//      G4cout <<nPoints<<" "<<nEntries<<" "<<theData<<endl;
+//      G4cout <<nPoints<<" "<<nEntries<<" "<<theData<<G4endl;
 //      for(G4int ii=0; ii<2; ii++) G4cout << theData[ii]<<" ";
-//      G4cout << endl;
+//      G4cout << G4endl;
     }
     if (i<0) i=0;
     if(i>=GetListLength()) i=GetListLength()-1;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
index da56ec8d76..9a0bdc0c6f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.2 1999/07/02 10:01:14 johna Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4NeutronHPNBodyPhaseSpace.hh"
 #include "G4Gamma.hh"
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
index 64eb893389..032461c7d1 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
@@ -8,12 +8,8 @@
 #include "G4Proton.hh"
 #include "G4Gamma.hh"
 #include "G4ios.hh"
-#include <fstream.h>
-#ifdef WIN32
-  #include <strstrea.h>
-#else
-  #include <strstream.h>
-#endif
+#include "g4std/fstream"
+#include "g4std/strstream"
 
 void G4NeutronHPNInelasticFS::Init (G4double A, G4double Z, G4String & dirName, G4String & aFSType)
 {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
index 46121be905..0e12d24128 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
@@ -28,21 +28,21 @@
   {
     G4NeutronHPDataUsed result;
     aFlag = true;
-//    G4cout << "Names::GetName entered"<<endl;
+//    G4cout << "Names::GetName entered"<<G4endl;
     G4int myA = A;
     G4int myZ = Z;
     G4String * theName = NULL;
     G4String theFileName("");
     G4int offA = 0, offZ = 0, inc = 1;
     
-    ifstream check;
+    G4std::ifstream check;
     G4bool first = true;
-//    G4cout << "entered GetName!!!"<<endl;
+//    G4cout << "entered GetName!!!"<<G4endl;
      do   
      {
       aFlag = true;
-      char the1[100] = {""};
-      ostrstream ost1(the1, 100, ios::out);
+      char the1[1000] = {""};
+      G4std::ostrstream ost1(the1, 1000, G4std::ios::out);
       ost1 <<base<<"/"<<"CrossSection/"<<myZ<<"_"<<myA<<"_"<<theString[myZ-1];
       G4String * biff = new G4String(the1); // delete here as theName
       if(theName!=NULL) delete theName;
@@ -50,7 +50,7 @@
       result.SetName(*theName);
       result.SetA(myA);
       result.SetZ(myZ);
-#ifndef WIN32
+#ifdef G4USE_STD_NAMESPACE
       check.open(*theName);
 #else
       check.open(*theName,ios::in|ios::nocreate);
@@ -63,8 +63,8 @@
         {
           aFlag = true;
           first = false;
-          char the1[100] = {""};
-          ostrstream ost1(the1, 100, ios::out);
+          char the1[1000] = {""};
+          G4std::ostrstream ost1(the1, 1000, G4std::ios::out);
           ost1 <<base<<"/"<<"CrossSection/"<<myZ<<"_"<<"nat"<<"_"<<theString[myZ-1];
           biff = new G4String(the1); // delete here as theName
           if(theName!=NULL) delete theName;
@@ -73,7 +73,7 @@
           G4double natA = myZ/G4SandiaTable::GetZtoA(myZ);
           result.SetA(natA);
           result.SetZ(myZ);
-#ifndef WIN32
+#ifdef G4USE_STD_NAMESPACE
           check.open(*theName);
 #else
           check.open(*theName,ios::in|ios::nocreate);
@@ -85,8 +85,8 @@
           }
           else
           {
-            char the1[100] = {""};
-            ostrstream ost1(the1, 100, ios::out);
+            char the1[1000] = {""};
+            G4std::ostrstream ost1(the1, 1000, G4std::ios::out);
             ost1 <<base<<"/"<<rest<<myZ<<"_"<<"nat"<<"_"<<theString[myZ-1];  
             biff = new G4String(the1); // delete here as theName
             if(theName!=NULL) delete theName;
@@ -100,8 +100,8 @@
       }
       else
       {
-        char the1[100] = {""};
-        ostrstream ost1(the1, 100, ios::out);
+        char the1[1000] = {""};
+        G4std::ostrstream ost1(the1, 1000, G4std::ios::out);
         ost1 <<base<<"/"<<rest<<myZ<<"_"<<myA<<"_"<<theString[myZ-1];  
         biff = new G4String(the1); // delete here as theName
         if(theName!=NULL) delete theName;
@@ -117,10 +117,10 @@
           myZ = Z;
           myA = A;
         }else{
-          G4cout <<"G4NeutronHPNames: Sorry, this material does not come near to any data."<<endl;
-          G4cout <<"G4NeutronHPNames: Please make sure NeutronHPCrossSections points to the" << endl;
-          G4cout <<"                  directory, the neutron scattering data are located in." << endl;
-          G4cout << "G4NeutronHPNames: The material was: A="<<A<<", Z="<<Z<<endl;
+          G4cout <<"G4NeutronHPNames: Sorry, this material does not come near to any data."<<G4endl;
+          G4cout <<"G4NeutronHPNames: Please make sure NeutronHPCrossSections points to the" << G4endl;
+          G4cout <<"                  directory, the neutron scattering data are located in." << G4endl;
+          G4cout << "G4NeutronHPNames: The material was: A="<<A<<", Z="<<Z<<G4endl;
           G4Exception("In case the data sets are at present not available in the neutron data library, please contact Hans-Peter.Wellisch@cern.ch");
           delete theName;
           theFileName = "";
@@ -136,8 +136,8 @@
       }
     }
     while(!(check));
-//    G4cout << "Names::GetName: last theName proposal = "<< *theName <<" "<<A<<" "<<Z<<endl;
-//    G4cout << "File-name: "<<*theName<<endl;
+//    G4cout << "Names::GetName: last theName proposal = "<< *theName <<" "<<A<<" "<<Z<<G4endl;
+//    G4cout << "File-name: "<<*theName<<G4endl;
     delete theName;
     return result;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
index 76d5b4116a..80522eaa2c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
@@ -30,7 +30,7 @@ G4NeutronHPVector * G4NeutronHPPartial::GetY(G4double e1)
     G4double E2 = X[i];
     for(G4int ii=0; ii<data[i].GetVectorLength(); ii++)
     {
-      x1 = data[i-1].GetX(min(i1, data[i-1].GetVectorLength()-1));
+      x1 = data[i-1].GetX(G4std::min(i1, data[i-1].GetVectorLength()-1));
       x2 = data[i].GetX(ii);
       if(x1<x2&&i1<data[i-1].GetVectorLength())
       {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
index b4e5c92e4d..a0ba0cc63c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
@@ -8,7 +8,7 @@
 #include "G4NeutronHPLegendreStore.hh"
 #include "G4Electron.hh"
 
-G4bool G4NeutronHPPhotonDist::InitMean(ifstream & aDataFile)
+G4bool G4NeutronHPPhotonDist::InitMean(G4std::ifstream & aDataFile)
 {
   G4bool result = true;
   if(aDataFile >> repFlag)
@@ -63,7 +63,7 @@ G4bool G4NeutronHPPhotonDist::InitMean(ifstream & aDataFile)
     }
     else
     {
-      G4cout << "Data representation in G4NeutronHPPhotonDist: "<<repFlag<<endl;
+      G4cout << "Data representation in G4NeutronHPPhotonDist: "<<repFlag<<G4endl;
       G4Exception("G4NeutronHPPhotonDist: This data representation is not implemented.");
     }
   }
@@ -74,7 +74,7 @@ G4bool G4NeutronHPPhotonDist::InitMean(ifstream & aDataFile)
   return result;
 }
 
-void G4NeutronHPPhotonDist::InitAngular(ifstream & aDataFile)
+void G4NeutronHPPhotonDist::InitAngular(G4std::ifstream & aDataFile)
 {
   G4int i, ii;
   //angular distributions
@@ -122,7 +122,7 @@ void G4NeutronHPPhotonDist::InitAngular(ifstream & aDataFile)
       }
       else
       {
-        G4cout << "tabulation type: tabulationType"<<endl;
+        G4cout << "tabulation type: tabulationType"<<G4endl;
         G4Exception("cannot deal with this tabulation type for angular distributions.");
       }
     }
@@ -130,7 +130,7 @@ void G4NeutronHPPhotonDist::InitAngular(ifstream & aDataFile)
 }
 
 
-void G4NeutronHPPhotonDist::InitEnergies(ifstream & aDataFile)
+void G4NeutronHPPhotonDist::InitEnergies(G4std::ifstream & aDataFile)
 {
   G4int i, energyDistributionsNeeded = 0;
   for (i=0; i<nDiscrete; i++)
@@ -155,7 +155,7 @@ void G4NeutronHPPhotonDist::InitEnergies(ifstream & aDataFile)
   }
 }
 
-void G4NeutronHPPhotonDist::InitPartials(ifstream & aDataFile)
+void G4NeutronHPPhotonDist::InitPartials(G4std::ifstream & aDataFile)
 {
   aDataFile >> nDiscrete >> targetMass;
   if(nDiscrete != 1)
@@ -253,7 +253,7 @@ G4ReactionProductVector * G4NeutronHPPhotonDist::GetPhotons(G4double anEnergy)
 	G4double en = thePhotons->at(i)->GetTotalEnergy();
 	G4ThreeVector temp(en*sinth*cos(phi), en*sinth*sin(phi), en*cos(theta) );
 	thePhotons->at(i)->SetMomentum( temp ) ;
-  //      G4cout << "Isotropic distribution in PhotonDist"<<temp<<endl;
+  //      G4cout << "Isotropic distribution in PhotonDist"<<temp<<G4endl;
       }
     }
     else
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
index f8b826026b..d2466f05e3 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
@@ -12,7 +12,7 @@
   G4DynamicParticleVector * G4NeutronHPSCFissionFS::ApplyYourself(G4int NNeutrons)
   {  
     G4DynamicParticleVector * aResult;
-//    G4cout <<"G4NeutronHPSCFissionFS::ApplyYourself +"<<endl;
+//    G4cout <<"G4NeutronHPSCFissionFS::ApplyYourself +"<<G4endl;
     aResult = G4NeutronHPFissionBaseFS::ApplyYourself(NNeutrons);    
     return aResult;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
index 932352c7cd..a2c1aadbce 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
@@ -12,7 +12,7 @@
   G4DynamicParticleVector * G4NeutronHPTCFissionFS::ApplyYourself(G4int NNeutrons)
   {  
     G4DynamicParticleVector * aResult;
-//    G4cout <<"G4NeutronHPTCFissionFS::ApplyYourself +"<<endl;
+//    G4cout <<"G4NeutronHPTCFissionFS::ApplyYourself +"<<G4endl;
     aResult = G4NeutronHPFissionBaseFS::ApplyYourself(NNeutrons);    
     return aResult;
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
index 0d4607fb31..e5fdceb70d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
@@ -58,14 +58,14 @@
   
   G4NeutronHPVector::~G4NeutronHPVector()
   {
-//    if(Verbose==1)G4cout <<"G4NeutronHPVector::~G4NeutronHPVector"<<endl;
+//    if(Verbose==1)G4cout <<"G4NeutronHPVector::~G4NeutronHPVector"<<G4endl;
     if(theData!=NULL)     
     {
       delete [] theData;
     }
-//    if(Verbose==1)G4cout <<"Vector: delete theData"<<endl;
+//    if(Verbose==1)G4cout <<"Vector: delete theData"<<G4endl;
     if(theIntegral!=NULL) delete [] theIntegral;
-//    if(Verbose==1)G4cout <<"Vector: delete theIntegral"<<endl;
+//    if(Verbose==1)G4cout <<"Vector: delete theIntegral"<<G4endl;
     isFreed = 1;
   }
   
@@ -124,7 +124,7 @@
     }
     else
     {
-      i=max(0,10*(i-1));
+      i=G4std::max(0,10*(i-1));
       while (i<nEntries)
       {
         if(theData[i].GetX()>e) break;
@@ -173,39 +173,39 @@
 
   void G4NeutronHPVector::Dump()
   {
-    G4cout << nEntries<<endl;
+    G4cout << nEntries<<G4endl;
     for(G4int i=0; i<nEntries; i++)
     {
       G4cout << theData[i].GetX()<<" ";
       G4cout << theData[i].GetY()<<" ";
-//      if (i!=1&&i==5*(i/5)) G4cout << endl;
-      G4cout << endl;
+//      if (i!=1&&i==5*(i/5)) G4cout << G4endl;
+      G4cout << G4endl;
     }
-    G4cout << endl;
+    G4cout << G4endl;
   }
   
   void G4NeutronHPVector::Check(G4int i)
   {
-//    G4cout << "1: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<endl;
+//    G4cout << "1: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<G4endl;
     if(i>nEntries) G4Exception("Skipped some index numbers in G4NeutronHPVector");
     if(i==nPoints)
     {
       nPoints += 50;
-//    G4cout << "2a: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<endl;
+//    G4cout << "2a: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<G4endl;
       G4NeutronHPDataPoint * buff = new G4NeutronHPDataPoint[nPoints];
-//    G4cout << "2b: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<endl;
+//    G4cout << "2b: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<G4endl;
       if(nPoints!=50)
       {
-//        G4cout << "copying 1: nEntries="<<nEntries<<" nPoints="<<nPoints<<endl;
+//        G4cout << "copying 1: nEntries="<<nEntries<<" nPoints="<<nPoints<<G4endl;
         for (G4int j=0; j<nEntries; j++) buff[j] = theData[j];
-//        G4cout << "copying 2"<<endl;
+//        G4cout << "copying 2"<<G4endl;
         delete [] theData;
-//    G4cout << "3: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<endl;
+//    G4cout << "3: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<G4endl;
       }
       theData = buff;
     }
     if(i==nEntries) nEntries=i+1;
-//    G4cout << "4: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<endl;
+//    G4cout << "4: i: "<<i<<" nEntries: "<<nEntries<<" nPoints: "<<nPoints<<G4endl;
   }
 
   void G4NeutronHPVector::
diff --git a/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
index a7d97b7dfd..dbdadc8b6d 100644
--- a/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AlphaInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Alpha Inelastic Process
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
index a4598a1799..479971f3e1 100644
--- a/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiLambdaInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
index 9350d42d7f..6785226007 100644
--- a/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutronInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
index e3266edd07..4bbdf09bc8 100644
--- a/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiOmegaMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
index 057e087925..f7780bfb40 100644
--- a/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiProtonInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
index 1e6732847a..29b1e24681 100644
--- a/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
index 49d7e75445..e975623b60 100644
--- a/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaPlusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
index e1e95469fc..cc8c5808e0 100644
--- a/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
index 56f469637e..e9acd5f54f 100644
--- a/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiZeroInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
index c959687e1d..fb9ea6c270 100644
--- a/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DeuteronInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Deuteron Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh b/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
index d3425cf7a6..1043de968c 100644
--- a/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronCaptureProcess.hh,v 1.1.8.1.2.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Neutron capture process -- header file
diff --git a/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh b/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
index f2aea20e01..20fdacdcdd 100644
--- a/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronElasticProcess.hh,v 1.1.8.1.2.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Hadron Elastic Scattering Process -- header file
diff --git a/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh b/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
index 01b0a20c7e..1d66943b95 100644
--- a/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronFissionProcess.hh,v 1.1.8.1.2.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Fission Process -- header file
diff --git a/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
index 99ad637b14..520de7f18e 100644
--- a/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
index 876ee4d4d4..ae6dcb0e91 100644
--- a/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonPlusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
index 5075616836..b62d3c4cd6 100644
--- a/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroLInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: KaonZeroL Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
index 8d897078e5..7e8bc202de 100644
--- a/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroSInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: KaonZeroS InelasticProcess Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
index 915bd5715f..cfd073e8d3 100644
--- a/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LambdaInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process : Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
index ba7ca8b417..24adbf9c37 100644
--- a/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Neutron Inelastic Process
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
index 2ccdebc9c1..32af724cb1 100644
--- a/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OmegaMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
index a70bb9e2f5..afdb966405 100644
--- a/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // PionMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
index 8a43af775e..a87b019313 100644
--- a/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionPlusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
index 53a4a6f71c..6e0e82d465 100644
--- a/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProtonInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Proton Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
index 02accc6fb5..85eb1190de 100644
--- a/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: SigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
index 0b5bed89c1..2c13004110 100644
--- a/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaPlusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: SigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
index 2a16cbd056..c94b5a4e33 100644
--- a/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TritonInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
index d13358c39a..5571136ca1 100644
--- a/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiMinusInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: XiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh b/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
index 0a32b821c7..71696034eb 100644
--- a/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiZeroInelasticProcess.hh,v 1.1.10.1 1999/12/07 20:52:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // G4 Process: XiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc b/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
index c0724d5b92..9abff4cc38 100644
--- a/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronCaptureProcess.cc,v 1.1.10.1 1999/12/07 20:52:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronCaptureProcess.cc,v 1.1.10.1.2.1 1999/12/08 17:35:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Process: Low-energy Neutron Capture
@@ -64,19 +64,19 @@ BuildThePhysicsTable(G4ParticleDefinition& aParticleType)
    //   theElementTable = G4Element::GetElementTable();
    //   G4int numOfElements = G4Element::GetNumberOfElements();
    //   if (verboseLevel > 1) {
-   //      G4cout << "BuildThePhysicsTable: numOfElements " << numOfElements << endl;
-   //      G4cout << "BuildThePhysicsTable: thePhysicsTable " << thePhysicsTable << endl;
+   //      G4cout << "BuildThePhysicsTable: numOfElements " << numOfElements << G4endl;
+   //      G4cout << "BuildThePhysicsTable: thePhysicsTable " << thePhysicsTable << G4endl;
    //      G4cout << "  for particle: " << aParticleType.GetParticleName() << " " <<
-   //              aParticleType.GetPDGEncoding() << endl;
+   //              aParticleType.GetPDGEncoding() << G4endl;
    //   }
    //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
    //   if (verboseLevel > 1) {
-   //      G4cout << "exists=" << exists << endl;
+   //      G4cout << "exists=" << exists << G4endl;
    //   }
    //   if (exists) {
    //      thePhysicsTable = thePhysicsDictionary.findValue(&aParticleType);
    //      if (verboseLevel > 1) {
-   //         G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+   //         G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
    //      }
    //// Remove any previous items from table
    //      thePhysicsTable->clearAndDestroy();
@@ -85,8 +85,8 @@ BuildThePhysicsTable(G4ParticleDefinition& aParticleType)
    //   else {
    //      thePhysicsTable = new G4PhysicsTable(numOfElements);
    //      if (verboseLevel > 1) {
-   //         G4cout << "  make new tPT=" << thePhysicsTable << endl;
-   //         G4cout << "  entries() = " << thePhysicsTable->entries() << endl;
+   //         G4cout << "  make new tPT=" << thePhysicsTable << G4endl;
+   //         G4cout << "  entries() = " << thePhysicsTable->entries() << G4endl;
    //      }
    //      thePhysicsDictionary.insertKeyAndValue(&aParticleType, thePhysicsTable);
    //   }
@@ -127,7 +127,7 @@ GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
    //   thePhysicsTable = 
    //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
    //   if (verboseLevel > 1) {
-   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
    //   }
    //
    //   J = anElement->GetIndex();
@@ -161,7 +161,7 @@ GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronCaptureProcess::GetMeanFreePathBasic: sigma=" 
-          << sigma << endl;
+          << sigma << G4endl;
    if (sigma > 0.)
       return 1./sigma;
    else
@@ -188,11 +188,11 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
 
    //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
    //   if (verboseLevel > 1) {
-   //      G4cout << "DumpPhysicsTable: exists=" << exists << endl;
+   //      G4cout << "DumpPhysicsTable: exists=" << exists << G4endl;
    //   }
    //   if (!exists) {
    //      G4cout << "DumpPhysicsTable: no phyics table for " << 
-   //              aParticleType.GetParticleName() << endl;
+   //              aParticleType.GetParticleName() << G4endl;
    //      return;
    //   }
    //   G4PhysicsTable* pt = thePhysicsDictionary.findValue(&aParticleType);
@@ -200,13 +200,13 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
    //   const G4ElementTable* et = G4Element::GetElementTable();
    //   G4int numOfElements = G4Element::GetNumberOfElements();
    //   if (verboseLevel > 1)
-   //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << endl;
+   //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << G4endl;
    //   G4LPhysicsFreeVector* pv;
    //   for (G4int J = 0; J < numOfElements; J++) { 
-   //      G4cout << endl << "Capture cross section data for " << 
+   //      G4cout << G4endl << "Capture cross section data for " << 
    //              aParticleType.GetParticleName() << " on " <<
-   //              ((*et)[J])->GetName() << endl << endl;
-   //      G4cout << endl << "Ek(GeV)    sigma(mb)" << endl << endl;
+   //              ((*et)[J])->GetName() << G4endl << G4endl;
+   //      G4cout << G4endl << "Ek(GeV)    sigma(mb)" << G4endl << G4endl;
    //      pv = (G4LPhysicsFreeVector*)(*thePhysicsTable)(J);
    //      pv->DumpValues();
    //   }
diff --git a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
index d7f7106d93..80570cdd4a 100644
--- a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronElasticProcess.cc,v 1.1.10.1 1999/12/07 20:52:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronElasticProcess.cc,v 1.1.10.1.2.1 1999/12/08 17:35:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // G4 Process: Low-energy Elastic scattering
@@ -72,20 +72,20 @@ BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
   //   theElementTable = G4Element::GetElementTable();
   //   G4int numOfElements = G4Element::GetNumberOfElements();
   //   if (verboseLevel > 1) {
-  //      G4cout << "BuildPhysicsTable: numOfElements " << numOfElements << endl;
-  //      G4cout << "BuildPhysicsTable: thePhysicsTable " << thePhysicsTable << endl;
+  //      G4cout << "BuildPhysicsTable: numOfElements " << numOfElements << G4endl;
+  //      G4cout << "BuildPhysicsTable: thePhysicsTable " << thePhysicsTable << G4endl;
   //      G4cout << "  for particle: " << aParticleType.GetParticleName() << " " <<
-  //              aParticleType.GetPDGEncoding() << endl;
+  //              aParticleType.GetPDGEncoding() << G4endl;
   //   }
   //
   //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
   //   if (verboseLevel > 1) {
-  //      G4cout << "exists=" << exists << endl;
+  //      G4cout << "exists=" << exists << G4endl;
   //   }
   //   if (exists) {
   //      thePhysicsTable = thePhysicsDictionary.findValue(&aParticleType);
   //      if (verboseLevel > 1) {
-  //         G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+  //         G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
   //      }
 // Remove any previous items from table
   //      thePhysicsTable->clearAndDestroy();
@@ -94,8 +94,8 @@ BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
   //   else {
   //      thePhysicsTable = new G4PhysicsTable(numOfElements);
   //      if (verboseLevel > 1) {
-  //         G4cout << "  make new tPT=" << thePhysicsTable << endl;
-  //         G4cout << "  entries() = " << thePhysicsTable->entries() << endl;
+  //         G4cout << "  make new tPT=" << thePhysicsTable << G4endl;
+  //         G4cout << "  entries() = " << thePhysicsTable->entries() << G4endl;
   //      }
   //      thePhysicsDictionary.insertKeyAndValue(&aParticleType, thePhysicsTable);
   //   }
@@ -106,7 +106,7 @@ BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
      //                                               aParticleType,
      //                                               (*theElementTable)[J]);
   //      if (verboseLevel > 1)
-  //         G4cout << "  added PhysicsVector " << (*thePhysicsTable)(J) << endl;
+  //         G4cout << "  added PhysicsVector " << (*thePhysicsTable)(J) << G4endl;
   //   }
 }
 
@@ -137,7 +137,7 @@ G4HadronElasticProcess::GetMicroscopicCrossSection(
   //   thePhysicsTable = 
   //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
   //   if (verboseLevel > 1) {
-  //      G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+  //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
   //   }
   //
   //   J = anElement->GetIndex();
@@ -175,7 +175,7 @@ GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronElasticProcess::GetMeanFreePathBasic: sigma="
-          << sigma << endl;
+          << sigma << G4endl;
    if (sigma > 0.)
       return 1./sigma;
    else
@@ -231,30 +231,30 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
 
   //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
   //   if (verboseLevel > 1) {
-  //      G4cout << "DumpPhysicsTable: exists=" << exists << endl;
+  //      G4cout << "DumpPhysicsTable: exists=" << exists << G4endl;
   //   }
   //   if (!exists) {
   //      G4cout << "DumpPhysicsTable: no phyics table for " << 
-  //              aParticleType.GetParticleName() << endl;
+  //              aParticleType.GetParticleName() << G4endl;
   //      return;
   //   }
   //   G4PhysicsTable* pt = thePhysicsDictionary.findValue(&aParticleType);
   //   if (verboseLevel > 1) {
-  //      G4cout << "  found PhysicsTable pt=" << pt << endl;
+  //      G4cout << "  found PhysicsTable pt=" << pt << G4endl;
   //   }
   //
   //   const G4ElementTable* et = G4Element::GetElementTable();
   //   G4int numOfElements = G4Element::GetNumberOfElements();
   //   if (verboseLevel > 1)
-  //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << endl;
+  //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << G4endl;
   //   G4LPhysicsFreeVector* pv;
   //   for (G4int J = 0; J < numOfElements; J++) { 
-  //      G4cout << endl << "Cross section data for " << 
+  //      G4cout << G4endl << "Cross section data for " << 
   //              aParticleType.GetParticleName() << " on " <<
-  //              ((*et)[J])->GetName() << endl << endl;
+  //              ((*et)[J])->GetName() << G4endl << G4endl;
   //      pv = (G4LPhysicsFreeVector*)(*thePhysicsTable)(J);
   //      if (verboseLevel > 1) {
-  //         G4cout << "  found PhysicsVector pv=" << pv << endl;
+  //         G4cout << "  found PhysicsVector pv=" << pv << G4endl;
   //      }
   //      pv->DumpValues();
   //   }
diff --git a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
index e8b2c5ca39..d845297e50 100644
--- a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HadronFissionProcess.cc,v 1.1.10.1 1999/12/07 20:52:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HadronFissionProcess.cc,v 1.1.10.1.2.1 1999/12/08 17:35:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // F.W. Jones, TRIUMF, 03-DEC-96
@@ -64,19 +64,19 @@ G4HadronFissionProcess::BuildThePhysicsTable(G4ParticleDefinition& aParticleType
    //   theElementTable = G4Element::GetElementTable();
    //   G4int numOfElements = G4Element::GetNumberOfElements();
    //   if (verboseLevel > 1) {
-   //      G4cout << "BuildThePhysicsTable: numOfElements " << numOfElements << endl;
-   //      G4cout << "BuildThePhysicsTable: thePhysicsTable " << thePhysicsTable << endl;
+   //      G4cout << "BuildThePhysicsTable: numOfElements " << numOfElements << G4endl;
+   //      G4cout << "BuildThePhysicsTable: thePhysicsTable " << thePhysicsTable << G4endl;
    //      G4cout << "  for particle: " << aParticleType.GetParticleName() << " " <<
-   //              aParticleType.GetPDGEncoding() << endl;
+   //              aParticleType.GetPDGEncoding() << G4endl;
    //   }
    //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
    //   if (verboseLevel > 1) {
-   //      G4cout << "exists=" << exists << endl;
+   //      G4cout << "exists=" << exists << G4endl;
    //   }
    //   if (exists) {
    //      thePhysicsTable = thePhysicsDictionary.findValue(&aParticleType);
    //      if (verboseLevel > 1) {
-   //         G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+   //         G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
    //      }
    //// Remove any previous items from table
    //      thePhysicsTable->clearAndDestroy();
@@ -85,8 +85,8 @@ G4HadronFissionProcess::BuildThePhysicsTable(G4ParticleDefinition& aParticleType
    //   else {
    //      thePhysicsTable = new G4PhysicsTable(numOfElements);
    //      if (verboseLevel > 1) {
-   //         G4cout << "  make new tPT=" << thePhysicsTable << endl;
-   //         G4cout << "  entries() = " << thePhysicsTable->entries() << endl;
+   //         G4cout << "  make new tPT=" << thePhysicsTable << G4endl;
+   //         G4cout << "  entries() = " << thePhysicsTable->entries() << G4endl;
    //      }
    //      thePhysicsDictionary.insertKeyAndValue(&aParticleType, thePhysicsTable);
    //   }
@@ -126,7 +126,7 @@ G4HadronFissionProcess::GetMicroscopicCrossSection(const G4DynamicParticle* aPar
    //   thePhysicsTable = 
    //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
    //   if (verboseLevel > 1) {
-   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << endl;
+   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
    //   }
    //
    //   J = anElement->GetIndex();
@@ -159,7 +159,7 @@ G4HadronFissionProcess::GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronFissionProcess::GetMeanFreePathBasic: sigma=" 
-          << sigma << endl;
+          << sigma << G4endl;
    if (sigma > 0.)
       return 1./sigma;
    else
@@ -180,7 +180,7 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
 
    //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
    //   if (verboseLevel > 1) {
-   //      G4cout << "DumpPhysicsTable: exists=" << exists << endl;
+   //      G4cout << "DumpPhysicsTable: exists=" << exists << G4endl;
    //   }
    //   if (!exists) {
    //      G4Exception("G4HadronFissionProcess::DumpPhysicsTable: "
@@ -192,13 +192,13 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
    //   const G4ElementTable* et = G4Element::GetElementTable();
    //   G4int numOfElements = G4Element::GetNumberOfElements();
    //   if (verboseLevel > 1)
-   //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << endl;
+   //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << G4endl;
    //   G4LPhysicsFreeVector* pv;
    //   for (G4int J = 0; J < numOfElements; J++) { 
-   //      G4cout << endl << "Fission cross section data for " << 
+   //      G4cout << G4endl << "Fission cross section data for " << 
    //              aParticleType.GetParticleName() << " on " <<
-   //              ((*et)[J])->GetName() << endl << endl;
-   //      G4cout << endl << "Ek(GeV)    sigma(mb)" << endl << endl;
+   //              ((*et)[J])->GetName() << G4endl << G4endl;
+   //      G4cout << G4endl << "Ek(GeV)    sigma(mb)" << G4endl << G4endl;
    //      pv = (G4LPhysicsFreeVector*)(*thePhysicsTable)(J);
    //      pv->DumpValues();
    //   }
diff --git a/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh b/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
index 962470a580..e8cf9660c1 100644
--- a/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutronAnnihilationAtRest.hh,v 1.1.10.1 1999/12/07 20:52:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh b/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
index 2e79a647c2..2937210199 100644
--- a/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiProtonAnnihilationAtRest.hh,v 1.1.10.1 1999/12/07 20:52:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh b/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
index da7fe1ed1b..bd5fd6648b 100644
--- a/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
+++ b/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DistributionGenerator.hh,v 1.1.8.1.2.1 1999/12/07 20:52:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
index 06a3b6a81e..c11447f6e4 100644
--- a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
+++ b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinusAbsorption.hh,v 1.1.10.1 1999/12/07 20:52:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
index 6d5a80869d..5f5531b01f 100644
--- a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinusAbsorptionAtRest.hh,v 1.1.8.1.2.1 1999/12/07 20:52:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
diff --git a/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh b/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
index ddc3d7fc09..adb9ac7a4a 100644
--- a/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonMinusCaptureAtRest.hh,v 1.1.10.1 1999/12/07 20:52:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh b/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
index b4daaee985..3b0f48d893 100644
--- a/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronCaptureAtRest.hh,v 1.1.10.1 1999/12/07 20:52:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
index b564baa82c..1d438a81ed 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusAbsorptionAtRest.hh,v 1.1.10.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
index 6cb9403546..1423488472 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopAbsorption.hh,v 1.2.6.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
index e49aa7a587..203e397137 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopAl.hh,v 1.1.8.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
index 65d17fa8db..6d83bf7ae3 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopC.hh,v 1.1.8.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
index 4c6f249de4..82fabd6420 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopCo.hh,v 1.1.8.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
index 59eb001658..e527a081c6 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopCu.hh,v 1.1.8.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
index bb22abd9df..73b75a3da7 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopLi.hh,v 1.1.8.1.2.1 1999/12/07 20:52:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
index 174b833502..92b339202f 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopMaterial.hh,v 1.1.8.1.2.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
index bfb0b73b52..095a4487b6 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopN.hh,v 1.1.8.1.2.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
index 39c25827e7..d7b724fc76 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopO.hh,v 1.1.8.1.2.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
index df96482052..9f992167cc 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopPb.hh,v 1.1.8.1.2.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
index bf365ef137..4b3d04f0d4 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopTa.hh,v 1.1.8.1.2.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
index aca2745efd..cc88e44df8 100644
--- a/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionMinusAbsorptionAtRest.hh,v 1.1.10.1 1999/12/07 20:52:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
index ad094839fc..54112ad457 100644
--- a/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopDeexcitation.hh,v 1.2.8.1 1999/12/07 20:52:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh b/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
index 15c41f8932..58b246a469 100644
--- a/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopDeexcitationAlgorithm.hh,v 1.2.8.1 1999/12/07 20:52:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
index 7564237b98..94d0ede6e9 100644
--- a/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopDummyDeexcitation.hh,v 1.2.8.1 1999/12/07 20:52:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
index b39781983e..294cb7c6f8 100644
--- a/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopTheoDeexcitation.hh,v 1.2.8.1 1999/12/07 20:52:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc b/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
index 68e3114ffa..27cd36dfed 100644
--- a/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutronAnnihilationAtRest.cc,v 1.1.10.1 1999/12/07 20:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiNeutronAnnihilationAtRest.cc,v 1.1.10.1.2.4 1999/12/15 11:43:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -54,7 +54,7 @@ G4AntiNeutronAnnihilationAtRest::G4AntiNeutronAnnihilationAtRest(const G4String&
   pdefAlpha(G4Alpha::Alpha())
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   pv   = new G4GHEKinematicsVector [MAX_SECONDARIES+1];
@@ -108,10 +108,10 @@ G4double G4AntiNeutronAnnihilationAtRest::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4AntiNeutronAnnihilationAtRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -169,7 +169,7 @@ G4VParticleChange* G4AntiNeutronAnnihilationAtRest::AtRestDoIt(
   }
 
   if (verboseLevel>1) {
-    G4cout << "G4AntiNeutronAnnihilationAtRest::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4AntiNeutronAnnihilationAtRest::AtRestDoIt is invoked " <<G4endl;
     }
 
   G4ParticleMomentum momentum;
@@ -269,7 +269,7 @@ void G4AntiNeutronAnnihilationAtRest::GenerateSecondaries()
   }
 
   // --- LIMIT THE VALUE OF NGKINE IN CASE OF OVERFLOW ---
-  ngkine = G4int(min(ngkine,G4int(MAX_SECONDARIES)));
+  ngkine = G4int(G4std::min(ngkine,G4int(MAX_SECONDARIES)));
 
 } // GenerateSecondaries
 
diff --git a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
index ed62ccd65e..b6718dac96 100644
--- a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiProtonAnnihilationAtRest.cc,v 1.1.10.1 1999/12/07 20:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4AntiProtonAnnihilationAtRest.cc,v 1.1.10.1.2.4 1999/12/15 11:43:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -54,7 +54,7 @@ G4AntiProtonAnnihilationAtRest::G4AntiProtonAnnihilationAtRest(const G4String& p
   pdefAlpha(G4Alpha::Alpha())
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   pv   = new G4GHEKinematicsVector [MAX_SECONDARIES+1];
@@ -108,10 +108,10 @@ G4double G4AntiProtonAnnihilationAtRest::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4AntiProtonAnnihilationAtRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -169,7 +169,7 @@ G4VParticleChange* G4AntiProtonAnnihilationAtRest::AtRestDoIt(
   }
 
   if (verboseLevel>1) {
-    G4cout << "G4AntiProtonAnnihilationAtRest::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4AntiProtonAnnihilationAtRest::AtRestDoIt is invoked " <<G4endl;
     }
 
   G4ParticleMomentum momentum;
@@ -266,7 +266,7 @@ void G4AntiProtonAnnihilationAtRest::GenerateSecondaries()
   }
 
   // --- LIMIT THE VALUE OF NGKINE IN CASE OF OVERFLOW ---
-  ngkine = G4int(min(ngkine,G4int(MAX_SECONDARIES)));
+  ngkine = G4int(G4std::min(ngkine,G4int(MAX_SECONDARIES)));
 
 } // GenerateSecondaries
 
diff --git a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
index 343447d413..383e01ac20 100644
--- a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
+++ b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DistributionGenerator.cc,v 1.2.6.1.2.1 1999/12/07 20:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DistributionGenerator.cc,v 1.2.6.1.2.1.2.1 1999/12/08 17:35:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
@@ -40,7 +40,7 @@ G4DistributionGenerator::G4DistributionGenerator(G4RWTValOrderedVector<G4double>
   // Check boundaries: must be size(x) = size(values) + 1
   if (x.entries() != (values.entries() + 1))
     { G4cout << " Inconsistent parameters in G4DistributionGenerator "
-	   << endl;
+	   << G4endl;
     }
   assert (x.entries() == (values.entries() + 1));
 
@@ -61,11 +61,11 @@ G4DistributionGenerator::G4DistributionGenerator(G4RWTValOrderedVector<G4double>
   /*
   for (i=0; i<values.entries(); i++)
     { G4cout << values[i] << "  " ; }
-  G4cout << "  Integral = " << tot << endl;
+  G4cout << "  Integral = " << tot << G4endl;
   for (i=0; i<_cumProb.entries(); i++)
     { 
       G4cout << "Variable " << _x[i]  
-	   << " --- cumProb = " << _cumProb[i] << endl;
+	   << " --- cumProb = " << _cumProb[i] << G4endl;
     }
   */
   // End of debugging
@@ -101,7 +101,7 @@ G4double G4DistributionGenerator::Generate(G4double ranflat)
 
       // Deugging
       /*
-      G4cout << "Random = " << ranflat << " Generated " << xRandom << endl;
+      G4cout << "Random = " << ranflat << " Generated " << xRandom << G4endl;
       */
       // Endo of Debugging
 
@@ -113,7 +113,7 @@ G4double G4DistributionGenerator::Generate(G4double ranflat)
       G4cout << "Bin " << bin << " "
 	   << _cumProb.entries() << " " 
 	   << _x.entries()
-	   << endl;
+	   << G4endl;
       */
       // End of debugging
     }
diff --git a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
index c35f28a865..b2dcdd8469 100644
--- a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonMinusAbsorption.cc,v 1.1.10.1 1999/12/07 20:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4KaonMinusAbsorption.cc,v 1.1.10.1.2.4 1999/12/15 11:43:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -52,7 +52,7 @@ G4KaonMinusAbsorption::G4KaonMinusAbsorption(const G4String& processName)
   pdefAlpha(G4Alpha::Alpha())
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   pv   = new G4GHEKinematicsVector [MAX_SECONDARIES+1];
@@ -106,10 +106,10 @@ G4double G4KaonMinusAbsorption::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4KaonMinusAbsorptionProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -167,7 +167,7 @@ G4VParticleChange* G4KaonMinusAbsorption::AtRestDoIt(
   }
 
   if (verboseLevel>1) {
-    G4cout << "G4KaonMinusAbsorption::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4KaonMinusAbsorption::AtRestDoIt is invoked " <<G4endl;
     }
 
   G4ParticleMomentum momentum;
@@ -264,7 +264,7 @@ void G4KaonMinusAbsorption::GenerateSecondaries()
   }
 
   // --- LIMIT THE VALUE OF NGKINE IN CASE OF OVERFLOW ---
-  ngkine = G4int(min(ngkine,G4int(MAX_SECONDARIES)));
+  ngkine = G4int(G4std::min(ngkine,G4int(MAX_SECONDARIES)));
 
 } // GenerateSecondaries
 
diff --git a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
index d654f5fb06..c2198ca716 100644
--- a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
@@ -39,7 +39,7 @@ G4KaonMinusAbsorptionAtRest::G4KaonMinusAbsorptionAtRest(const G4String& process
   : G4VRestProcess (processName)
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   // see Cohn et al, PLB27(1968) 527;
@@ -85,7 +85,7 @@ G4VParticleChange* G4KaonMinusAbsorptionAtRest::AtRestDoIt
 
   if (!IsApplicable(*(stoppedHadron->GetDefinition()))) 
     {
-      G4cerr  <<"G4KaonMinusAbsorptionAtRest:ERROR, particle must be a Kaon!" <<endl;
+      G4cerr  <<"G4KaonMinusAbsorptionAtRest:ERROR, particle must be a Kaon!" <<G4endl;
       return 0;
     }
   
@@ -126,7 +126,7 @@ G4VParticleChange* G4KaonMinusAbsorptionAtRest::AtRestDoIt
               delete thePion;
 	      if (verboseLevel > 1) 
 		G4cout << "G4KaonMinusAbsorption::AtRestDoIt: Pion absorbed in Nucleus" 
-		       << endl;
+		       << G4endl;
 	    }                 
 	}
     }
@@ -148,7 +148,7 @@ G4VParticleChange* G4KaonMinusAbsorptionAtRest::AtRestDoIt
 
 	    if (verboseLevel > 1) 
 	      G4cout << "G4KaonMinusAbsorption::AtRestDoIt: SigmaLambdaConversion Done" 
-		     << endl;
+		     << G4endl;
 	  }                 
 	}
     }
@@ -201,7 +201,7 @@ G4VParticleChange* G4KaonMinusAbsorptionAtRest::AtRestDoIt
 	     << Z
 	     << ", "
 	     << newZ
-	     << endl; 
+	     << G4endl; 
     }
 
   if (energyDeposit < 0.) 
@@ -375,7 +375,7 @@ G4DynamicParticleVector* G4KaonMinusAbsorptionAtRest::KaonNucleonReaction()
 	    << "G4KaonMinusAbsorption::KaonNucleonReaction: "
 	    << aNucleon.GetDefinition()->GetParticleName() 
 	    << " is not a good nucleon - check G4Nucleus::ReturnTargetParticle()!"
-	    << endl;
+	    << G4endl;
 	}
       return 0;
     }  
@@ -421,7 +421,7 @@ G4DynamicParticleVector* G4KaonMinusAbsorptionAtRest::KaonNucleonReaction()
 	<< "G4KaonMinusAbsorption::KaonNucleonReaction: Number of primaries = " 
 	<< products->entries()
 	<< ": " <<producedMesonDef->GetParticleName() 
-	<< ", " <<producedBaryonDef->GetParticleName() << endl;
+	<< ", " <<producedBaryonDef->GetParticleName() << G4endl;
     }
   
   return products;
diff --git a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
index 3e381df20f..f1bb820de4 100644
--- a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonMinusCaptureAtRest.cc,v 1.1.10.1 1999/12/07 20:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuonMinusCaptureAtRest.cc,v 1.1.10.1.2.4 1999/12/15 11:43:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -117,7 +117,7 @@ G4MuonMinusCaptureAtRest::G4MuonMinusCaptureAtRest(const G4String& processName)
   pdefFragm[5] = G4Alpha::Alpha();
 
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   Fragments   = new G4GHEKinematicsVector [MXFRAG];
@@ -189,10 +189,10 @@ G4double G4MuonMinusCaptureAtRest::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4MuonMinusCaptureAtRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -221,7 +221,7 @@ G4VParticleChange* G4MuonMinusCaptureAtRest::AtRestDoIt(
   G4double globalTime = track.GetGlobalTime()/s;
 
   if (verboseLevel>1) {
-    G4cout << "G4MuonMinusCaptureAtRest::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4MuonMinusCaptureAtRest::AtRestDoIt is invoked " <<G4endl;
   }
 
   G4ParticleMomentum momentum;
@@ -532,7 +532,7 @@ G4double G4MuonMinusCaptureAtRest::CalculateIsotopicMass(G4double a,
     a * 8.367 - z * .783 + ev + es + ec + eex + cam2[iz0 - 1] + cam3[n - 1];
   ret_val = (ret_val + a * O16OLD) * O16RAT - a * ( C12NEW - ADJUST );
   d__1 = ret_val, d__2 = z * exhydr + (a - z) * exneut;
-  ret_val = min(d__1,d__2);
+  ret_val = G4std::min(d__1,d__2);
   return ret_val;
 
 } // CalculateIsotopicMass
@@ -617,12 +617,12 @@ void G4MuonMinusCaptureAtRest::EvaporationDeexcitation()
       ipar = 2;
     }
   }
-  delpai = min(eexdum,delta);
+  delpai = G4std::min(eexdum,delta);
   rnucl = residualNuclearMasses[atMassResidNucl - 1] * R0NUCL;
   ainerm = massResidNucl * .24 * rnucl * rnucl;
   roten0 = 0.5 * PLABRC * PLABRC / ainerm;
   d__1 = delta, d__2 = roten0 * 2.;
-  enmin = max(d__1,d__2);
+  enmin = G4std::max(d__1,d__2);
   rnmass = massResidNucl + excitEnResidNucl;
   umo = rnmass;
   gamcm = totEnResidNucl / rnmass;
@@ -661,7 +661,7 @@ void G4MuonMinusCaptureAtRest::EvaporationDeexcitation()
       }
       lexpn = (lmult << 1) + 1;
       ddlexp = (G4double) lexpn;
-      xdismx = min(ddlexp,hhh);
+      xdismx = G4std::min(ddlexp,hhh);
       if (xdismx > EXPMAX) {
 	dismx = 0.;
       } else {
@@ -712,8 +712,8 @@ void G4MuonMinusCaptureAtRest::EvaporationDeexcitation()
       umo = rnmass;
     } while (excitEnResidNucl > enmin);
     if (nSecPart >= MXSECS) {
-      G4cout << " **** Finuc overflow in EvaporationDeexcitation, program stopped ****" << endl;
-      G4cout << "STOP" << endl;
+      G4cout << " **** Finuc overflow in EvaporationDeexcitation, program stopped ****" << G4endl;
+      G4cout << "STOP" << G4endl;
       exit(1);
     }
   }
@@ -811,12 +811,12 @@ void G4MuonMinusCaptureAtRest::EvaporationDeexcitation()
   echck -= kinEnResidNucl;
   if (abs(echck) > echck0 * 1e-7) {
     G4cout << " **** No energy conservation in EvaporationDeexcitation ****"
-	 << " " << echck << endl;
+	 << " " << echck << G4endl;
   }
   excitEnResidNucl = 0.;
   if (nSecPart > MXSECS) {
-    G4cout << " **** Finuc overflow in EvaporationDeexcitation, program stopped ****" << endl;
-    G4cout << "STOP" << endl;
+    G4cout << " **** Finuc overflow in EvaporationDeexcitation, program stopped ****" << G4endl;
+    G4cout << "STOP" << G4endl;
     exit(1);
   }
   recoilEnResidNucl = kinEnResidNucl;
@@ -849,8 +849,8 @@ void G4MuonMinusCaptureAtRest::FermiMotion(G4int pidx)
   frndm[0] = G4UniformRand();
   frndm[1] = G4UniformRand();
   frndm[2] = G4UniformRand();
-  r__1 = max(frndm[0],frndm[1]);
-  p2 = max(r__1,frndm[2]);
+  r__1 = G4std::max(frndm[0],frndm[1]);
+  p2 = G4std::max(r__1,frndm[2]);
   if (atMassTarget <= 1) {
     ferm = 0.;
   }
@@ -1390,7 +1390,7 @@ L1000:
   // Check for starting data inconsistencies
   if (ja - jz < 0) {
     G4cout << " Dres: cascade residual nucleus has mass no. less than Z!!"
-	 << endl;
+	 << G4endl;
     return;
   } else if (ja <= 6 || jz <= 2) {
     //
@@ -1418,7 +1418,7 @@ L1000:
       if (deltu <= 0.) {
 	if (deltu < umo * -2.0 * ANGLGB) {
 	  G4cout << " *** Dres: insufficient Umo for a nucleon couple"
-	       << " " << umo << " " << zmass[jemiss - 1] * 2. << endl;
+	       << " " << umo << " " << zmass[jemiss - 1] * 2. << G4endl;
 	}
 	umo = (umo + deltu) * ( 1.0 + ANGLGB );
       }
@@ -1445,15 +1445,15 @@ L1000:
 	  } else {
 	    // Energy too low to split the deuteron, return
 	    G4cout << " **Dres: energy too low to split a deuteron! M2,M3"
-		 << " " << m2 << " " << m3 << endl;
+		 << " " << m2 << " " << m3 << G4endl;
 	    return;
 	  }
 	case 4:
 	  //  Triton:
 	  d__1 = 0., d__2 = *u + bnmass[2] - bnmass[3];
-	  deuneu = max(d__1,d__2);
+	  deuneu = G4std::max(d__1,d__2);
 	  d__1 = 0., d__2 = *u - bnmass[3];
-	  prnene = max(d__1,d__2);
+	  prnene = G4std::max(d__1,d__2);
 	  qnorm = deuneu + prnene;
 	  //  If we cannot split then return
 	  if (qnorm <= 0.) {
@@ -1495,9 +1495,9 @@ L1000:
 	case 5:
 	  //  3-He:
 	  d__1 = 0., d__2 = *u + bnmass[2] - bnmass[4];
-	  deupro = max(d__1,d__2);
+	  deupro = G4std::max(d__1,d__2);
 	  d__1 = 0., d__2 = *u - bnmass[4];
-	  prprne = max(d__1,d__2);
+	  prprne = G4std::max(d__1,d__2);
 	  qnorm = deupro + prprne;
 	  //  If we cannot split then return
 	  if (qnorm <= 0.) {
@@ -1540,11 +1540,11 @@ L1000:
 	  //  Alpha:
 	  //
 	  d__1 = 0., d__2 = *u + bnmass[2] * 2. - bnmass[5];
-	  deudeu = max(d__1,d__2);
+	  deudeu = G4std::max(d__1,d__2);
 	  d__1 = 0., d__2 = *u + bnmass[3] - bnmass[5];
-	  protri = max(d__1,d__2);
+	  protri = G4std::max(d__1,d__2);
 	  d__1 = 0., d__2 = *u + bnmass[4] - bnmass[5];
-	  ueu3he = max(d__1,d__2);
+	  ueu3he = G4std::max(d__1,d__2);
 	  qnorm = deudeu + protri + ueu3he;
 	  //  If we cannot split then return
 	  if (qnorm <= 0.) {
@@ -1598,7 +1598,7 @@ L1000:
       ddjja = (G4double) jja;
       ddjjz = (G4double) jjz;
       d__1 = *u + energ0 - GetIsotopicMass(ddjja, ddjjz) - exmass[k - 1];
-      q[k] = max(d__1,0.) + q[k - 1];
+      q[k] = G4std::max(d__1,0.) + q[k - 1];
     }
     //  If no emission channel is open then return
     if (q[6] <= 0.) {
@@ -1629,7 +1629,7 @@ L1000:
 	goto L2300;
       }
     }
-    G4cout << " **** error in Dres, few nucleon treatment ****" << endl;
+    G4cout << " **** error in Dres, few nucleon treatment ****" << G4endl;
     return;
     // Loop to compute the residual excitation energy
 L2300:
@@ -1820,13 +1820,13 @@ L2600:
       ExcitationEnergyLevel(iaa, izz, &eex1st, &eex2nd, &corr);
       eex1st *= 1e3;
       eex2nd *= 1e3;
-      corr = max(corr,0.) * 1e3;
+      corr = G4std::max(corr,0.) * 1e3;
       if (nn == 4 && izz == 4) {
 	if (*u - thresh[j - 1] - 6.1 > 0.) {
 	  corr = 6.;
 	} else {
 	  tmpvar = *u - thresh[j - 1] - .1;
-	  corr = max(0.,tmpvar);
+	  corr = G4std::max(0.,tmpvar);
 	}
       }
       if (NINT(pairCorrFlag) == 1) {
@@ -1846,9 +1846,9 @@ L2600:
     }
     n1 = 1;
     d__1 =
-      max(s[0],s[1]), d__1 = max(d__1,s[2]), d__1 =
-      max(d__1,s[3]), d__1 = max(d__1,s[4]);
-    ses = max(d__1,s[5]);
+      G4std::max(s[0],s[1]), d__1 = G4std::max(d__1,s[2]), d__1 =
+      G4std::max(d__1,s[3]), d__1 = G4std::max(d__1,s[4]);
+    ses = G4std::max(d__1,s[5]);
     for (j = 1; j <= 6; ++j) {
       js = (G4int) (sos[j - 1] + 1.);
       fjs = (G4double) js;
@@ -1856,12 +1856,12 @@ L2600:
       if (s[j - 1] > 0.) {
 	mm = ja - ia[j - 1];
 	d__3 = EXPMIN, d__4 = s[j - 1] - ses;
-	d__1 = EXPMAX, d__2 = max(d__3,d__4);
-	expsas = min(d__1,d__2);
+	d__1 = EXPMAX, d__2 = G4std::max(d__3,d__4);
+	expsas = G4std::min(d__1,d__2);
 	sas = exp(expsas);
 	d__3 = EXPMIN, d__4 = -s[j - 1];
-	d__1 = EXPMAX, d__2 = max(d__3,d__4);
-	expsus = min(d__1,d__2);
+	d__1 = EXPMAX, d__2 = G4std::max(d__3,d__4);
+	expsus = G4std::min(d__1,d__2);
 	sus = exp(expsus);
 	d__1 = s[j - 1];
 	d__2 = s[j - 1];
@@ -1881,7 +1881,7 @@ L2600:
 	  r[j - 1] = ccoul[j - 1] * (d__1 * d__1) * eye1[j - 1] * sas;
 	}
 	d__1 = 0., d__2 = r[j - 1];
-	r[j - 1] = max(d__1,d__2);
+	r[j - 1] = G4std::max(d__1,d__2);
 	sigma += r[j - 1];
       }
     }
@@ -2196,7 +2196,7 @@ G4double G4MuonMinusCaptureAtRest::GetIsotopicMass(G4double a, G4double z)
     if (ka0 != 1) {
       if (n < 0) {
 	G4cout << " Stopped in energy: mass number =< atomic number !!"
-	     << " " << ka0 << " " << kz0 << endl;
+	     << " " << ka0 << " " << kz0 << G4endl;
       }
     } else {
       ret_val = isotopicData[2][0];
@@ -3474,7 +3474,7 @@ void G4MuonMinusCaptureAtRest::DoMuCapture()
       amntar2 = massProton;
       break;
     default:
-      G4cout << "? This cannot happen!" << endl;
+      G4cout << "? This cannot happen!" << G4endl;
       exit(1);
     }
   } else {
@@ -3524,10 +3524,10 @@ void G4MuonMinusCaptureAtRest::DoMuCapture()
     }
   }
   i__1 = nSecPart, i__2 = MXGKIN - nGkine;
-  nstak1 = min(i__1,i__2);
+  nstak1 = G4std::min(i__1,i__2);
   if (nSecPart > nstak1) {
     G4cout << " **** FLUFIN: Stack overflow, "
-	 << nSecPart - nstak1 << " particles lost" << endl;
+	 << nSecPart - nstak1 << " particles lost" << G4endl;
   }
   // ==     Put neutrino on the stack IF DESIRED.
   ++nGkine;
@@ -3544,10 +3544,10 @@ void G4MuonMinusCaptureAtRest::DoMuCapture()
     Gkin[nGkine - 1].SetTOF( tDelay );
   }
   i__1 = nallFragm, i__2 = MXGKIN - nGkine;
-  nstak2 = min(i__1,i__2);
+  nstak2 = G4std::min(i__1,i__2);
   if (nallFragm > nstak2) {
     G4cout << " **** FLUFIN: Stack overflow, "
-	 << nallFragm - nstak2 << " heavy particles lost" << endl;
+	 << nallFragm - nstak2 << " heavy particles lost" << G4endl;
   }
   i__1 = nstak2;
   for (k = 1; k <= i__1; ++k) {
@@ -3586,7 +3586,7 @@ void G4MuonMinusCaptureAtRest::MuEvaporation()
   //  The initial excitation energy, mass and charge of the nucleus are
   //  put into Ex, Apr, Zpr (common Hetc5)
   d__1 = excitEnResidNucl * 1000;
-  iniExcitEnEvapNucl = max(d__1,ANGLGB);
+  iniExcitEnEvapNucl = G4std::max(d__1,ANGLGB);
   atMassEvapNucl = atMassCurrent;
   chargeEvapNucl = chargeCurrent;
   //  Ammres is the atomic mass of the residual nucleus
@@ -3655,7 +3655,7 @@ void G4MuonMinusCaptureAtRest::MuEvaporation()
       GetIsotopicMass(atMassCurrent, chargeCurrent) * .001;
     excitEnResidNucl = finExcitEnEvapNucl * .001;
     d__1 = recoilEnEvapNucl * .001;
-    recoilEnResidNucl = max(d__1,0.);
+    recoilEnResidNucl = G4std::max(d__1,0.);
     totMomResidNucl =
       sqrt(recoilEnResidNucl *
 	   (recoilEnResidNucl + (massResidNucl + excitEnResidNucl) * 2.));
@@ -3669,7 +3669,7 @@ void G4MuonMinusCaptureAtRest::MuEvaporation()
   if ((d__1 = etevap - eotest, abs(d__1)) / eotest > .05) {
     G4cout << " Evevap: failure in energy conservation!!"
 	 << " " << etevap << " " << eotest << " " << etevap - eotest
-	 << " " << totEnResidNucl << endl;
+	 << " " << totEnResidNucl << G4endl;
   }
   //  Check if the deexcitation module have to be called
   EvaporationDeexcitation();
@@ -3713,11 +3713,11 @@ G4double G4MuonMinusCaptureAtRest::NuclearBindingEnergy(G4double a1,
   n1 = ka1 - kz1;
   n2 = ka2 - kz2;
   if (n1 <= 0) {
-    G4cout << "STOP - 105" << endl;
+    G4cout << "STOP - 105" << G4endl;
     exit(1);
   }
   if (n2 <= 0) {
-    G4cout << "STOP - 106" << endl;
+    G4cout << "STOP - 106" << G4endl;
     exit(1);
   }
   izz1 = NINT(isotopicData[0][ka1 - 1]);
diff --git a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
index 40a0bdf18b..fe54796fd8 100644
--- a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronCaptureAtRest.cc,v 1.1.10.1 1999/12/07 20:52:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NeutronCaptureAtRest.cc,v 1.1.10.1.2.4 1999/12/15 11:43:41 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -45,7 +45,7 @@ G4NeutronCaptureAtRest::G4NeutronCaptureAtRest(const G4String& processName)
   pdefNeutron(G4Neutron::Neutron())
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   pv   = new G4GHEKinematicsVector [MAX_SECONDARIES+1];
@@ -99,10 +99,10 @@ G4double G4NeutronCaptureAtRest::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4NeutronCaptureAtRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -160,7 +160,7 @@ G4VParticleChange* G4NeutronCaptureAtRest::AtRestDoIt(
   }
 
   if (verboseLevel>1) {
-    G4cout << "G4NeutronCaptureAtRest::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4NeutronCaptureAtRest::AtRestDoIt is invoked " <<G4endl;
     }
 
   G4ParticleMomentum momentum;
@@ -257,7 +257,7 @@ void G4NeutronCaptureAtRest::GenerateSecondaries()
   }
 
   // --- LIMIT THE VALUE OF NGKINE IN CASE OF OVERFLOW ---
-  ngkine = G4int(min(ngkine,G4int(MAX_SECONDARIES)));
+  ngkine = G4int(G4std::min(ngkine,G4int(MAX_SECONDARIES)));
 
 } // GenerateSecondaries
 
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
index f7f426c5c2..d440c4a513 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PiMinusAbsorptionAtRest.cc,v 1.3.8.1 1999/12/07 20:52:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PiMinusAbsorptionAtRest.cc,v 1.3.8.1.2.1 1999/12/08 17:35:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
@@ -60,7 +60,7 @@ G4PiMinusAbsorptionAtRest::G4PiMinusAbsorptionAtRest(const G4String& processName
   _indexDeexcitation = 0;
 
   if (verboseLevel>0) 
-    { G4cout << GetProcessName() << " is created "<< endl; }
+    { G4cout << GetProcessName() << " is created "<< G4endl; }
 }
 
 
@@ -79,7 +79,7 @@ G4VParticleChange* G4PiMinusAbsorptionAtRest::AtRestDoIt(const G4Track& track, c
     {
       G4cerr  
       << "G4PiMinusAbsorptionAtRest: ERROR, particle must be a pion minus!" 
-      << endl;
+      << G4endl;
       return NULL;
     }
 
@@ -121,7 +121,7 @@ G4VParticleChange* G4PiMinusAbsorptionAtRest::AtRestDoIt(const G4Track& track, c
   G4double pionEnergy = stoppedHadron->GetTotalEnergy();
   G4double excitation = pionEnergy - stopAbsorption.Energy();
   if (excitation < 0.) G4Exception("G4PiMinusAbsorptionAtRest::AtRestDoIt -- excitation energy < 0");
-  if (verboseLevel>0) { G4cout << " excitation " << excitation << endl; }
+  if (verboseLevel>0) { G4cout << " excitation " << excitation << G4endl; }
 
   G4StopDeexcitationAlgorithm* nucleusAlgorithm = LoadNucleusAlgorithm();
   G4StopDeexcitation stopDeexcitation(nucleusAlgorithm);
@@ -144,7 +144,7 @@ G4VParticleChange* G4PiMinusAbsorptionAtRest::AtRestDoIt(const G4Track& track, c
     {
       G4cout << "nAbsorptionProducts = " << nAbsorptionProducts
 	     << "  nFragmentationProducts = " << nFragmentationProducts
-	     << endl;
+	     << G4endl;
     }
 
   // Deal with ParticleChange final state
@@ -182,7 +182,7 @@ G4PiMinusStopMaterial* G4PiMinusAbsorptionAtRest::LoadAlgorithm(int Z)
 {  
   if (verboseLevel>0) 
     {
-      G4cout << "Load material algorithm " << Z << endl; 
+      G4cout << "Load material algorithm " << Z << G4endl; 
     }
 
   G4int index = 3;
@@ -199,39 +199,39 @@ G4PiMinusStopMaterial* G4PiMinusAbsorptionAtRest::LoadAlgorithm(int Z)
     {
     case 3:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Li algorithm " << endl; }
+	{ G4cout << " =================== Load Li algorithm " << G4endl; }
       return new G4PiMinusStopLi();
     case 6:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load C algorithm " << endl; }
+	{ G4cout << " =================== Load C algorithm " << G4endl; }
       return new G4PiMinusStopC();
     case 7:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load N algorithm " << endl; }
+	{ G4cout << " =================== Load N algorithm " << G4endl; }
       return new G4PiMinusStopN();
     case 8:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load O algorithm " << endl; }
+	{ G4cout << " =================== Load O algorithm " << G4endl; }
       return new G4PiMinusStopO();
     case 13:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Al algorithm " << endl; }
+	{ G4cout << " =================== Load Al algorithm " << G4endl; }
       return new G4PiMinusStopAl();
     case 27:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Cu algorithm " << endl; }
+	{ G4cout << " =================== Load Cu algorithm " << G4endl; }
       return new G4PiMinusStopCu();
     case 29:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Co algorithm " << endl; }
+	{ G4cout << " =================== Load Co algorithm " << G4endl; }
       return new G4PiMinusStopCo();
     case 73:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Ta algorithm " << endl; }
+	{ G4cout << " =================== Load Ta algorithm " << G4endl; }
       return new G4PiMinusStopTa();
     default: 
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load default material algorithm " << endl; }
+	{ G4cout << " =================== Load default material algorithm " << G4endl; }
       return new G4PiMinusStopC();
     }
 }
@@ -243,15 +243,15 @@ G4StopDeexcitationAlgorithm* G4PiMinusAbsorptionAtRest::LoadNucleusAlgorithm()
     {
     case 0:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Theo deexcitation " << endl; }
+	{ G4cout << " =================== Load Theo deexcitation " << G4endl; }
       return new G4StopTheoDeexcitation();
     case 1:
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load Dummy deexcitation " << endl; }
+	{ G4cout << " =================== Load Dummy deexcitation " << G4endl; }
       return new G4StopDummyDeexcitation();
     default:  
       if (verboseLevel>0) 
-	{ G4cout << " =================== Load default deexcitation " << endl; }
+	{ G4cout << " =================== Load default deexcitation " << G4endl; }
       return new G4StopTheoDeexcitation();
     }
 }
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
index 79838e6dec..2fa30f17aa 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PiMinusStopAbsorption.cc,v 1.3.6.1.2.1 1999/12/07 20:52:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PiMinusStopAbsorption.cc,v 1.3.6.1.2.1.2.2 1999/12/09 16:58:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
@@ -190,10 +190,10 @@ G4double G4PiMinusStopAbsorption::Energy()
   
   if (_level > 0)
     {
-      cout << "E products " <<  productEnergy  
+      G4std::cout << "E products " <<  productEnergy  
 	   << " Binding " << productBinding << " " << temp << " "
 	   << " Tnucleus " << tNucleus 
-	   << " energy = " << energy << endl;
+	   << " energy = " << energy << G4endl;
     }
 
   return energy;
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
index 0c753e865c..561690c902 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopAl.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
index 19f64d5003..f62643c18e 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopC.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
index d4bb65b5df..15d7afaf2e 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopCo.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
index 1d022a8e7e..67216da042 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopCu.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
index d7f7be69b4..5fa51d7079 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopLi.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
index 4ce225e715..7fef17a7be 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PiMinusStopMaterial.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PiMinusStopMaterial.cc,v 1.1.8.1.2.1.2.1 1999/12/08 17:35:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
@@ -143,9 +143,9 @@ G4RWTPtrOrderedVector<G4LorentzVector>* G4PiMinusStopMaterial::P4Vector(const G4
 
       // ---- Debug     
       //      G4cout << " ---- binding = " << binding << ", nucleus mass = " << massNucleus 
-      //	     << ", p nucleus = " << pNucleus << endl;
+      //	     << ", p nucleus = " << pNucleus << G4endl;
       //      G4cout << "eKin1,2 " << eKin1 << " " << eKin2 << " eRecoil " << eRecoil 
-      //	     << " availableE " << availableE << endl;
+      //	     << " availableE " << availableE << G4endl;
       // ----
 
     }  while ((eKin1 + eKin2 + eRecoil) > availableE);
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
index 86713620d4..8af29560ae 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopN.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
index 7a98908056..a926e5799b 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopO.cc,v 1.1.8.1.2.1 1999/12/07 20:52:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
index 4201c95a20..1703161a50 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopPb.cc,v 1.1.8.1.2.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
index 9187355e08..67a37eb0d3 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopTa.cc,v 1.1.8.1.2.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
index 6f5a8557e8..ea4fabed64 100644
--- a/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionMinusAbsorptionAtRest.cc,v 1.1.10.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PionMinusAbsorptionAtRest.cc,v 1.1.10.1.2.4 1999/12/15 11:43:41 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
@@ -47,7 +47,7 @@ G4PionMinusAbsorptionAtRest::G4PionMinusAbsorptionAtRest(const G4String& process
   pdefAlpha(G4Alpha::Alpha())
 {
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created "<< endl;
+    G4cout << GetProcessName() << " is created "<< G4endl;
   }
 
   pv   = new G4GHEKinematicsVector [MAX_SECONDARIES+1];
@@ -101,10 +101,10 @@ G4double G4PionMinusAbsorptionAtRest::AtRestGetPhysicalInteractionLength(
 
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4PionMinusAbsorptionAtRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 
   return theNumberOfInteractionLengthLeft * currentInteractionLength;
@@ -162,7 +162,7 @@ G4VParticleChange* G4PionMinusAbsorptionAtRest::AtRestDoIt(
   }
 
   if (verboseLevel>1) {
-    G4cout << "G4PionMinusAbsorptionAtRest::AtRestDoIt is invoked " <<endl;
+    G4cout << "G4PionMinusAbsorptionAtRest::AtRestDoIt is invoked " <<G4endl;
     }
 
   G4ParticleMomentum momentum;
@@ -259,7 +259,7 @@ void G4PionMinusAbsorptionAtRest::GenerateSecondaries()
   }
 
   // --- LIMIT THE VALUE OF NGKINE IN CASE OF OVERFLOW ---
-  ngkine = G4int(min(ngkine,G4int(MAX_SECONDARIES)));
+  ngkine = G4int(G4std::min(ngkine,G4int(MAX_SECONDARIES)));
 
 } // GenerateSecondaries
 
diff --git a/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
index ac7a999218..897a333361 100644
--- a/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopDeexcitation.cc,v 1.2.6.1.2.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
index 451ba9ae12..aaf1e7d300 100644
--- a/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopDummyDeexcitation.cc,v 1.2.6.1.2.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
index 498738bca6..cdc82daec0 100644
--- a/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StopTheoDeexcitation.cc,v 1.2.6.1.2.1 1999/12/07 20:52:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StopTheoDeexcitation.cc,v 1.2.6.1.2.1.2.1 1999/12/08 17:35:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
@@ -80,10 +80,10 @@ G4ReactionProductVector* G4StopTheoDeexcitation::BreakUp(G4double A, G4double Z,
   //  theExcitedNucleus.SetMomentum(initialMomentum);
 
   //  G4cout << "Theo input " << A << " " << Z << " " 
-  //	 << pMag << " " << atomicMass << endl
-  //	 << "Theo -     " << excitation << " " << initialMomentum.mag() << endl
+  //	 << pMag << " " << atomicMass << G4endl
+  //	 << "Theo -     " << excitation << " " << initialMomentum.mag() << G4endl
   //	 << "Fragment - " << theExcitedNucleus.GetExcitationEnergy() << " "
-  //	 << theExcitedNucleus.GetMomentum().mag() << endl;
+  //	 << theExcitedNucleus.GetMomentum().mag() << G4endl;
 
   return theHandler.BreakItUp(theExcitedNucleus);
 }
diff --git a/source/processes/hadronic/util/include/DumpFrame.hh b/source/processes/hadronic/util/include/DumpFrame.hh
index bdfccf8e23..2eb5889f10 100644
--- a/source/processes/hadronic/util/include/DumpFrame.hh
+++ b/source/processes/hadronic/util/include/DumpFrame.hh
@@ -6,7 +6,7 @@ class DumpFrames
 public:
 static void DumpFrame(G4FastVector<G4ReactionProduct,128> &vec, G4int vecLen)
 {
-//  cout << vecLen<<endl;
+//  cout << vecLen<<G4endl;
 //  for(G4int i=0; i<vecLen; i++)
 //  {
 //    cout << vec[i]->GetDefinition()->GetPDGEncoding()<<" ";
@@ -22,7 +22,7 @@ static void DumpFrame(G4FastVector<G4ReactionProduct,128> &vec, G4int vecLen)
 //    cout << x<<" "<<y<<" "<<z;
 //    cout << vec[i]->GetMomentum()<<" ";
 //    cout << vec[i]->GetTotalEnergy();
-//    cout << endl;
+//    cout << G4endl;
 //  }
 }
 };
diff --git a/source/processes/hadronic/util/include/G4DynamicParticleVector.hh b/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
index 91d4572b61..fc1d94cf59 100644
--- a/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
+++ b/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DynamicParticleVector.hh,v 1.1.8.1.2.1 1999/12/07 20:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //	For information related to this code contact:
diff --git a/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh b/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
index b14a868519..3757649787 100644
--- a/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
+++ b/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GHEKinematicsVector.hh,v 1.1.10.1 1999/12/07 20:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GHEKinematicsVector.hh,v 1.1.10.1.2.2 1999/12/10 15:42:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
@@ -95,7 +95,7 @@ class G4GHEKinematicsVector
    {
      momentum      = mom;
      energy        = sqrt(mass*mass + momentum.mag2());
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      return;
    }
 
@@ -118,7 +118,7 @@ class G4GHEKinematicsVector
      momentum.setY( y );
      momentum.setZ( z );
      energy        = sqrt(mass*mass + momentum.mag2());
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -136,7 +136,7 @@ class G4GHEKinematicsVector
      momentum.setX( x );
      momentum.setY( y );
      energy = sqrt(mass*mass + momentum.mag2());
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -152,7 +152,7 @@ class G4GHEKinematicsVector
    {
      momentum.setZ( z );
      energy = sqrt(mass*mass + momentum.mag2());
-     kineticEnergy = max(0.,energy-mass);
+     kineticEnergy = G4std::max(0.,energy-mass);
      return;
    }
 
@@ -248,10 +248,10 @@ class G4GHEKinematicsVector
   inline
   void SetMassAndUpdate( G4double m )
   {
-    kineticEnergy = max(0., energy - m);
+    kineticEnergy = G4std::max(0., energy - m);
     mass = m;
     energy = kineticEnergy + mass;
-    G4double momnew = sqrt(max(0., energy*energy - mass*mass));
+    G4double momnew = sqrt(G4std::max(0., energy*energy - mass*mass));
     if ( momnew == 0.0) 
        {
          momentum.setX( 0.0 );
@@ -347,7 +347,7 @@ class G4GHEKinematicsVector
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      charge        = p1.charge + p2.charge;
      code          = p1.code   + p2.code;
      particleDef   = p1.particleDef;
@@ -363,7 +363,7 @@ class G4GHEKinematicsVector
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      charge        = p1.charge - p2.charge;
      code          = p1.code   - p2.code;
      particleDef   = p1.particleDef;
@@ -379,7 +379,7 @@ class G4GHEKinematicsVector
      momentum.setZ( p1.momentum.z()+a*p2.momentum.z() );
      energy = sqrt( sqr(p1.mass) + momentum.mag2() );
      mass = p1.mass;
-     kineticEnergy = max(0.,energy - mass);
+     kineticEnergy = G4std::max(0.,energy - mass);
      timeOfFlight  = p1.timeOfFlight;
      side          = p1.side;
      flag          = p1.flag;
@@ -656,7 +656,7 @@ class G4GHEKinematicsVector
      G4cout << "G4GHEKinematicsVector: " 
           << L << " " << momentum.x() << " " <<  momentum.y() << " " <<  momentum.z() << " "
           << energy << " " << kineticEnergy << " " << mass << " " << charge << " " 
-          << timeOfFlight << " " << side << " " << flag << " " << code << particleDef << endl;
+          << timeOfFlight << " " << side << " " << flag << " " << code << particleDef << G4endl;
      return;                         
    }
 
diff --git a/source/processes/hadronic/util/include/G4LightMedia.hh b/source/processes/hadronic/util/include/G4LightMedia.hh
index 45d7a160de..62a5c0f97b 100644
--- a/source/processes/hadronic/util/include/G4LightMedia.hh
+++ b/source/processes/hadronic/util/include/G4LightMedia.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LightMedia.hh,v 1.1.10.1 1999/12/07 20:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Light Media Charge and/or Strangeness Exchange
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/util/include/G4Nucleus.hh b/source/processes/hadronic/util/include/G4Nucleus.hh
index e41e5d187a..61c2020c69 100644
--- a/source/processes/hadronic/util/include/G4Nucleus.hh
+++ b/source/processes/hadronic/util/include/G4Nucleus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Nucleus.hh,v 1.1.10.1 1999/12/07 20:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // original by H.P. Wellisch
  // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/util/include/G4ParticleVector.hh b/source/processes/hadronic/util/include/G4ParticleVector.hh
index 5c9b08fa99..cb52946170 100644
--- a/source/processes/hadronic/util/include/G4ParticleVector.hh
+++ b/source/processes/hadronic/util/include/G4ParticleVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleVector.hh,v 1.1.8.1.2.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 // HPW decoupling theo models from RW (Mon Mar 16 1998)
diff --git a/source/processes/hadronic/util/include/G4ReactionDynamics.hh b/source/processes/hadronic/util/include/G4ReactionDynamics.hh
index ac189cbcad..4ab8c0bbf8 100644
--- a/source/processes/hadronic/util/include/G4ReactionDynamics.hh
+++ b/source/processes/hadronic/util/include/G4ReactionDynamics.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionDynamics.hh,v 1.1.10.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Reaction Dynamics
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/util/include/G4ReactionKinematics.hh b/source/processes/hadronic/util/include/G4ReactionKinematics.hh
index 911dad46e6..ee34190f8d 100644
--- a/source/processes/hadronic/util/include/G4ReactionKinematics.hh
+++ b/source/processes/hadronic/util/include/G4ReactionKinematics.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionKinematics.hh,v 1.1.10.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1995
diff --git a/source/processes/hadronic/util/include/G4ReactionProduct.hh b/source/processes/hadronic/util/include/G4ReactionProduct.hh
index c5f4d41b67..d18023faca 100644
--- a/source/processes/hadronic/util/include/G4ReactionProduct.hh
+++ b/source/processes/hadronic/util/include/G4ReactionProduct.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionProduct.hh,v 1.1.10.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // J.L. Chuma, TRIUMF, 31-Oct-1996
  // last modified: 19-Dec-1996
diff --git a/source/processes/hadronic/util/include/G4ReactionProductVector.hh b/source/processes/hadronic/util/include/G4ReactionProductVector.hh
index e21dd02cfc..f5149332e0 100644
--- a/source/processes/hadronic/util/include/G4ReactionProductVector.hh
+++ b/source/processes/hadronic/util/include/G4ReactionProductVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionProductVector.hh,v 1.1.8.1.2.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //	For information related to this code contact:
diff --git a/source/processes/hadronic/util/include/G4StableIsotopes.hh b/source/processes/hadronic/util/include/G4StableIsotopes.hh
index 401a8ff1be..d899489a77 100644
--- a/source/processes/hadronic/util/include/G4StableIsotopes.hh
+++ b/source/processes/hadronic/util/include/G4StableIsotopes.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StableIsotopes.hh,v 1.1.10.1 1999/12/07 20:52:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4StableIsotopes_h
 #define G4StableIsotopes_h 1
diff --git a/source/processes/hadronic/util/src/G4LightMedia.cc b/source/processes/hadronic/util/src/G4LightMedia.cc
index ca7e6b4caf..31a6ea09d3 100644
--- a/source/processes/hadronic/util/src/G4LightMedia.cc
+++ b/source/processes/hadronic/util/src/G4LightMedia.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LightMedia.cc,v 1.1.10.1 1999/12/07 20:52:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LightMedia.cc,v 1.1.10.1.2.1 1999/12/10 15:42:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // Hadronic Process: Light Media Charge and/or Strangeness Exchange
  // J.L. Chuma, TRIUMF, 21-Feb-1997
@@ -34,7 +34,7 @@
       // for pi+ n reactions, change some of the elastic cross section to pi0 p
       
       const G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-      G4int iplab = G4int(min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ));
+      G4int iplab = G4int(G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ));
       if( G4UniformRand() > cech[iplab]/pow(atomicNumber,0.42) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         resultant->SetDefinition( aPiZero );
@@ -75,7 +75,7 @@
       // for k+ n reactions, change some of the elastic cross section to k0 p
       
       const G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-      G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ) );
+      G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ) );
       if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         if( G4UniformRand() < 0.5 )
@@ -111,7 +111,7 @@
       // for k0 p reactions, change some of the elastic cross section to k+ n
       
       const G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-      G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ) );
+      G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*5.0 ) );
       if( G4UniformRand() > cech[iplab]/pow(atomicNumber,0.42) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         resultant->SetDefinition( aKaonPlus );
@@ -169,7 +169,7 @@
     
     if( targetParticle->GetDefinition() == aNeutron ) {
       const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.};
-      G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+      G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
       if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         resultant->SetDefinition( aNeutron );
@@ -228,7 +228,7 @@
     
     if( targetParticle->GetDefinition() == aProton ) {
       const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.};
-      G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+      G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
       if( G4UniformRand() > cech[iplab]/pow(atomicNumber,0.42) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         resultant->SetDefinition( aProton );
@@ -257,7 +257,7 @@
     
     if( targetParticle->GetDefinition() == aNeutron ) {
       const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-      G4int iplab = min( 9, G4int( incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+      G4int iplab = G4std::min( 9, G4int( incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
       if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.75) ) {
         G4DynamicParticle* resultant = new G4DynamicParticle;
         resultant->SetDefinition( anAntiProton );
@@ -288,7 +288,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       G4int irn = G4int( G4UniformRand()/0.2 );
@@ -368,7 +368,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       G4int irn = G4int( G4UniformRand()/0.2 );
@@ -449,7 +449,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       
@@ -513,7 +513,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       
@@ -577,7 +577,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       G4int irn = G4int( G4UniformRand()/0.2 );
@@ -638,7 +638,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       G4int irn = G4int( G4UniformRand()/0.2 );
@@ -703,7 +703,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       if( targetParticle->GetDefinition() == aNeutron ) {
@@ -789,7 +789,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       if( targetParticle->GetDefinition() == aNeutron ) {
@@ -880,7 +880,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       if( targetParticle->GetDefinition() == aNeutron ) {
@@ -970,7 +970,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       if( targetParticle->GetDefinition() == aNeutron ) {
@@ -1058,7 +1058,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       
@@ -1161,7 +1161,7 @@
     G4DynamicParticle* targetParticle = targetNucleus.ReturnTargetParticle();
     
     const G4double cech[] = {0.50,0.45,0.40,0.35,0.30,0.25,0.06,0.04,0.005,0.0};
-    G4int iplab = G4int( min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
+    G4int iplab = G4int( G4std::min( 9.0, incidentParticle->GetTotalMomentum()/GeV*2.5 ) );
     if( G4UniformRand() <= cech[iplab]/pow(atomicNumber,0.42) ) {
       G4DynamicParticle* resultant = new G4DynamicParticle;
       
diff --git a/source/processes/hadronic/util/src/G4Nucleus.cc b/source/processes/hadronic/util/src/G4Nucleus.cc
index db01f3c2ba..d22e3774eb 100644
--- a/source/processes/hadronic/util/src/G4Nucleus.cc
+++ b/source/processes/hadronic/util/src/G4Nucleus.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Nucleus.cc,v 1.3.8.1 1999/12/07 20:52:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Nucleus.cc,v 1.3.8.1.2.1 1999/12/10 15:42:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // original by H.P. Wellisch
  // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -173,17 +173,17 @@
       return 0.0;
     }
     G4double ek = kineticEnergy/GeV;
-    G4float ekin = min( 4.0, max( 0.1, ek ) );
-    const G4float atno = min( 120., aEff ); 
+    G4float ekin = G4std::min( 4.0, G4std::max( 0.1, ek ) );
+    const G4float atno = G4std::min( 120., aEff ); 
     const G4float gfa = 2.0*((aEff-1.0)/70.)*exp(-(aEff-1.0)/70.);
     //
     // 0.35 value at 1 GeV
     // 0.05 value at 0.1 GeV
     //
-    G4float cfa = max( 0.15, 0.35 + ((0.35-0.05)/2.3)*log(ekin) );
+    G4float cfa = G4std::max( 0.15, 0.35 + ((0.35-0.05)/2.3)*log(ekin) );
     G4float exnu = 7.716 * cfa * exp(-cfa)
       * ((atno-1.0)/120.)*exp(-(atno-1.0)/120.);
-    G4float fpdiv = max( 0.5, 1.0-0.25*ekin*ekin );
+    G4float fpdiv = G4std::max( 0.5, 1.0-0.25*ekin*ekin );
     //
     // pnBlackTrackEnergy  is the kinetic energy (in GeV) available for
     //                     proton/neutron black track particles
@@ -207,8 +207,8 @@
       pnBlackTrackEnergy *= 1.0 + ran1*gfa;
       dtaBlackTrackEnergy *= 1.0 + ran2*gfa;
     }
-    pnBlackTrackEnergy = max( 0.0, pnBlackTrackEnergy );
-    dtaBlackTrackEnergy = max( 0.0, dtaBlackTrackEnergy );
+    pnBlackTrackEnergy = G4std::max( 0.0, pnBlackTrackEnergy );
+    dtaBlackTrackEnergy = G4std::max( 0.0, dtaBlackTrackEnergy );
     while( pnBlackTrackEnergy+dtaBlackTrackEnergy >= ek )
     {
       pnBlackTrackEnergy *= 1.0 - 0.5*G4UniformRand();
@@ -231,9 +231,9 @@
     G4double ek = kineticEnergy/GeV;
     G4double ekLog = log( ek );
     G4double aLog = log( aEff );
-    G4double em = min( 1.0, 0.2390 + 0.0408*aLog*aLog );
-    G4double temp1 = -ek * min( 0.15, 0.0019*aLog*aLog*aLog );
-    G4double temp2 = exp( max( expxl, min( expxu, -(ekLog-em)*(ekLog-em)*2.0 ) ) );
+    G4double em = G4std::min( 1.0, 0.2390 + 0.0408*aLog*aLog );
+    G4double temp1 = -ek * G4std::min( 0.15, 0.0019*aLog*aLog*aLog );
+    G4double temp2 = exp( G4std::max( expxl, G4std::min( expxu, -(ekLog-em)*(ekLog-em)*2.0 ) ) );
     G4double result = 0.0;
     if( abs( temp1 ) < 1.0 )
     {
diff --git a/source/processes/hadronic/util/src/G4ReactionDynamics.cc b/source/processes/hadronic/util/src/G4ReactionDynamics.cc
index e2a463ed9f..206b385721 100644
--- a/source/processes/hadronic/util/src/G4ReactionDynamics.cc
+++ b/source/processes/hadronic/util/src/G4ReactionDynamics.cc
@@ -35,7 +35,7 @@
 #include "G4AntiProton.hh"
 #include "G4AntiNeutron.hh"
 #include "Randomize.hh"
-#include <iostream.h>
+#include "g4std/iostream"
 // #include "DumpFrame.hh"
  //#include "../../alpha_test/cxx/NametoGheishNumber.cc"
  
@@ -118,7 +118,7 @@
       currentMass = currentParticle.GetMass()/GeV;
       targetMass = targetParticle.GetMass()/GeV;
     }
-    const G4double afc = min( 0.75,
+    const G4double afc = G4std::min( 0.75,
                               0.312+0.200*log(log(centerofmassEnergy*centerofmassEnergy))+
                               pow(centerofmassEnergy*centerofmassEnergy,1.5)/6000.0 );
     
@@ -172,7 +172,7 @@
       while( (momentumBin < 6) &&
              (modifiedOriginal.GetTotalMomentum()/GeV > psup[momentumBin]) )
         ++momentumBin;
-      momentumBin = min( 5, momentumBin );
+      momentumBin = G4std::min( 5, momentumBin );
       //
       //  NOTE: in GENXPT, these new particles were given negative codes
       //        here I use  NewlyAdded = true  instead
@@ -402,7 +402,7 @@
           pt = sqrt( pow( ran, 1.5 ) );
         }
       }
-      pt = max( 0.001, pt );
+      pt = G4std::max( 0.001, pt );
       vec[i]->SetMomentum( pt*cos(phi)*GeV, pt*sin(phi)*GeV );
       for( G4int j=0; j<20; ++j )binl[j] = j/(19.*pt);
       if( vec[i]->GetSide() > 0 )
@@ -421,7 +421,7 @@
         for( l=1; l<20; ++l )
         {
           x = (binl[l]+binl[l-1])/2.;
-          pt = max( 0.001, pt );
+          pt = G4std::max( 0.001, pt );
           if( x > 1.0/pt )
             dndl[l] += dndl[l-1];   //  changed from just  =  on 02 April 98
           else
@@ -439,8 +439,8 @@
           ran = G4UniformRand()*dndl[19];
           l = 1;
           while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-          l = min( 19, l );
-          x = min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+          l = G4std::min( 19, l );
+          x = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
           if( vec[i]->GetSide() < 0 )x *= -1.;
           vec[i]->SetMomentum( x*et*GeV );              // set the z-momentum
           totalEnergy = sqrt( x*et*x*et + pt*pt + vecMass*vecMass );
@@ -530,7 +530,7 @@
             {
               G4double tempMass = vec[l]->GetMass()/MeV;
               totalEnergy = 0.95*vec[l]->GetTotalEnergy()/MeV + 0.05*tempMass;
-              totalEnergy = max( tempMass, totalEnergy );
+              totalEnergy = G4std::max( tempMass, totalEnergy );
               vec[l]->SetTotalEnergy( totalEnergy*MeV );
               pp = sqrt( abs( totalEnergy*totalEnergy - tempMass*tempMass ) );
               pp1 = vec[l]->GetMomentum().mag()/MeV;
@@ -547,7 +547,7 @@
               }
               G4double px = vec[l]->GetMomentum().x()/MeV;
               G4double py = vec[l]->GetMomentum().y()/MeV;
-              pt = max( 1.0, sqrt( px*px + py*py ) )/GeV;
+              pt = G4std::max( 1.0, sqrt( px*px + py*py ) )/GeV;
               if( vec[l]->GetSide() > 0 )
               {
                 forwardKinetic += vec[l]->GetKineticEnergy()/GeV;
@@ -631,8 +631,8 @@
     ran = G4UniformRand()*dndl[19];
     l = 1;
     while( (ran>dndl[l]) && (l<20) )l++;
-    l = min( 19, l );
-    x = min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );   
+    l = G4std::min( 19, l );
+    x = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );   
     currentParticle.SetMomentum( x*et*GeV );                 // set the z-momentum
     if( forwardEnergy < forwardKinetic )
       totalEnergy = vecMass + 0.04*fabs(normal());
@@ -670,7 +670,7 @@
       vecMass = targetParticle.GetMass()/GeV;
       ran = -log(1.0-G4UniformRand());
       aspar = 0.40;
-      pt = max( 0.001, sqrt( pow( ran/4.0, 1.2 ) ) );
+      pt = G4std::max( 0.001, sqrt( pow( ran/4.0, 1.2 ) ) );
       targetParticle.SetMomentum( pt*cos(phi)*GeV, pt*sin(phi)*GeV );
       for( G4int j=0; j<20; ++j )binl[j] = (j-1.)/(19.*pt);
       et = pseudoParticle[1].GetTotalEnergy()/GeV;
@@ -696,8 +696,8 @@
           l = 1;
           ran = G4UniformRand()*dndl[19];
           while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-          l = min( 19, l );
-          x = min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+          l = G4std::min( 19, l );
+          x = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
           if( targetParticle.GetSide() < 0 )x *= -1.;
           targetParticle.SetMomentum( x*et*GeV );                // set the z-momentum
           totalEnergy = sqrt( x*et*x*et + pt*pt + vecMass*vecMass );
@@ -786,7 +786,7 @@
             {
               G4double tempMass = vec[l]->GetMass()/GeV;
               totalEnergy =
-                max( tempMass, 0.95*vec[l]->GetTotalEnergy()/GeV + 0.05*tempMass );
+                G4std::max( tempMass, 0.95*vec[l]->GetTotalEnergy()/GeV + 0.05*tempMass );
               vec[l]->SetTotalEnergy( totalEnergy*GeV );
               pp = sqrt( abs( totalEnergy*totalEnergy - tempMass*tempMass ) )*GeV;
               pp1 = vec[l]->GetMomentum().mag()/MeV;
@@ -802,7 +802,7 @@
               else
                 vec[l]->SetMomentum( vec[l]->GetMomentum() * (pp/pp1) );
 
-              pt = max( 0.001*GeV, sqrt( sqr(vec[l]->GetMomentum().x()/MeV) +
+              pt = G4std::max( 0.001*GeV, sqrt( sqr(vec[l]->GetMomentum().x()/MeV) +
                                          sqr(vec[l]->GetMomentum().y()/MeV) ) )/GeV;
               if( vec[l]->GetSide() > 0)
               {
@@ -818,7 +818,7 @@
       }    // closes outer loop
       if( eliminateThisParticle )  // not enough energy, eliminate target
       {
-        G4cerr << "eliminating target particle" << endl;
+        G4cerr << "eliminating target particle" << G4endl;
         exit( EXIT_FAILURE );
       }
     }
@@ -832,7 +832,7 @@
     if( backwardNucleonCount == 1 )  // target particle is the only backward nucleon
     {
       G4double ekin =
-        min( backwardEnergy-backwardKinetic, centerofmassEnergy/2.0-protonMass/GeV );
+        G4std::min( backwardEnergy-backwardKinetic, centerofmassEnergy/2.0-protonMass/GeV );
       if( ekin < 0.04 )ekin = 0.04 * fabs( normal() );
       vecMass = targetParticle.GetMass()/GeV;
       totalEnergy = ekin+vecMass;
@@ -857,7 +857,7 @@
       const G4double cpar[] = { 0.6, 0.6, 0.35, 0.15, 0.10 };
       const G4double gpar[] = { 2.6, 2.6, 1.80, 1.30, 1.20 };
       // Replaced the following min function to get correct behaviour on DEC.
-      // G4int tempCount = min( 5, backwardNucleonCount ) - 1;
+      // G4int tempCount = G4std::min( 5, backwardNucleonCount ) - 1;
       G4int tempCount;
       if (backwardNucleonCount < 5)
 	{
@@ -868,8 +868,8 @@
 	  tempCount = 5;
 	}
       tempCount--;
-      //cout << "backwardNucleonCount " << backwardNucleonCount << endl;
-      //cout << "tempCount " << tempCount << endl;
+      //cout << "backwardNucleonCount " << backwardNucleonCount << G4endl;
+      //cout << "tempCount " << tempCount << G4endl;
       G4double rmb0 = 0.0;
       if( targetParticle.GetSide() == -3 )
         rmb0 += targetParticle.GetMass()/GeV;
@@ -879,7 +879,7 @@
       }
       rmb = rmb0 + pow(-log(1.0-G4UniformRand()),cpar[tempCount]) / gpar[tempCount];
       totalEnergy = pseudoParticle[6].GetTotalEnergy()/GeV;
-      vecMass = min( rmb, totalEnergy );
+      vecMass = G4std::min( rmb, totalEnergy );
       pseudoParticle[6].SetMass( vecMass*GeV );
       pp = sqrt( abs( totalEnergy*totalEnergy - vecMass*vecMass ) )*GeV;
       pp1 = pseudoParticle[6].GetMomentum().mag()/MeV;
@@ -905,13 +905,13 @@
       }
       if( tempLen != backwardNucleonCount )
       {
-        G4cerr << "tempLen is not the same as backwardNucleonCount" << endl;
+        G4cerr << "tempLen is not the same as backwardNucleonCount" << G4endl;
         G4cerr << "tempLen = " << tempLen;
-        G4cerr << ", backwardNucleonCount = " << backwardNucleonCount << endl;
-        G4cerr << "targetParticle side = " << targetParticle.GetSide() << endl;
-        G4cerr << "currentParticle side = " << currentParticle.GetSide() << endl;
+        G4cerr << ", backwardNucleonCount = " << backwardNucleonCount << G4endl;
+        G4cerr << "targetParticle side = " << targetParticle.GetSide() << G4endl;
+        G4cerr << "currentParticle side = " << currentParticle.GetSide() << G4endl;
         for( i=0; i<vecLen; ++i )
-          G4cerr << "particle #" << i << " side = " << vec[i]->GetSide() << endl;
+          G4cerr << "particle #" << i << " side = " << vec[i]->GetSide() << G4endl;
         exit( EXIT_FAILURE );
       }
       constantCrossSection = true;
@@ -962,7 +962,7 @@
      vec[i]->Lorentz( *vec[i], pseudoParticle[1] );
     }
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    numberofFinalStateNucleons = max( 1, numberofFinalStateNucleons );
+    numberofFinalStateNucleons = G4std::max( 1, numberofFinalStateNucleons );
     //
     // leadFlag will be true
     //  iff original particle is at least as heavy as K+ and not a proton or neutron AND
@@ -1177,18 +1177,18 @@
       const G4double kineticFactor = -0.010;
       G4double sprob = 0.0; // sprob = probability of self-absorption in heavy molecules
       const G4double ekIncident = originalIncident->GetKineticEnergy()/GeV;
-      if( ekIncident >= 5.0 )sprob = min( 1.0, 0.6*log(ekIncident-4.0) );
+      if( ekIncident >= 5.0 )sprob = G4std::min( 1.0, 0.6*log(ekIncident-4.0) );
       if( epnb >= pnCutOff )
       {
         npnb = Poisson((1.5+1.25*numberofFinalStateNucleons)*epnb/(epnb+edta));
         if( numberofFinalStateNucleons + npnb > atomicWeight )
           npnb = G4int(atomicWeight+0.00001 - numberofFinalStateNucleons);
-        npnb = min( npnb, 127-vecLen );
+        npnb = G4std::min( npnb, 127-vecLen );
       }
       if( edta >= dtaCutOff )
       {
         ndta = Poisson( (1.5+1.25*numberofFinalStateNucleons)*edta/(epnb+edta) );
-        ndta = min( ndta, 127-vecLen );
+        ndta = G4std::min( ndta, 127-vecLen );
       }
       G4double spall = numberofFinalStateNucleons;
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
@@ -1388,7 +1388,7 @@
     G4double extraNucleonMass = 0.0;
     if( nuclearExcitationCount > 0 )
     {
-      G4int momentumBin = min( 4, G4int(pOriginal/3.0) );     
+      G4int momentumBin = G4std::min( 4, G4int(pOriginal/3.0) );     
       const G4double nucsup[] = { 1.0, 0.8, 0.6, 0.5, 0.4 };
       //
       //  NOTE: in TWOCLU, these new particles were given negative codes
@@ -1537,15 +1537,15 @@
     if( forwardCount == 1 )rmc = forwardMass;
     else
     {
-//      G4int ntc = min(5,forwardCount); // check if offset by 1 @@
-      G4int ntc = max(1, min(5,forwardCount)); // check if offset by 1 @@
+//      G4int ntc = G4std::min(5,forwardCount); // check if offset by 1 @@
+      G4int ntc = G4std::max(1, G4std::min(5,forwardCount)); // check if offset by 1 @@
       rmc = forwardMass + pow(-log(1.0-G4UniformRand()),cpar[ntc-1])/gpar[ntc-1];
     }
     if( backwardCount == 1 )rmd = backwardMass;
     else
     {
-//      G4int ntc = min(5,backwardCount); // check, if offfset by 1 @@
-      G4int ntc = max(1, min(5,backwardCount)); // check, if offfset by 1 @@
+//      G4int ntc = G4std::min(5,backwardCount); // check, if offfset by 1 @@
+      G4int ntc = G4std::max(1, G4std::min(5,backwardCount)); // check, if offfset by 1 @@
       rmd = backwardMass + pow(-log(1.0-G4UniformRand()),cpar[ntc-1])/gpar[ntc-1];
     }
     while( rmc+rmd > centerofmassEnergy )
@@ -1568,7 +1568,7 @@
     //else if( nuclearExcitationCount == 1 )rme = extraMass;
     //else
     //{
-    //  G4int ntc = min(5,nuclearExcitationCount)-1;
+    //  G4int ntc = G4std::min(5,nuclearExcitationCount)-1;
     //  rme = extraMass + pow(-log(1.-G4UniformRand()),cpar[ntc])/gpar[ntc];
     //}
     //
@@ -1595,7 +1595,7 @@
     G4double pf = (centerofmassEnergy*centerofmassEnergy+rmd*rmd-rmc*rmc);
     pf *= pf;
     pf -= 4*centerofmassEnergy*centerofmassEnergy*rmd*rmd;
-    pf = sqrt( max(pf,pfMin) )/(2.0*centerofmassEnergy);
+    pf = sqrt( G4std::max(pf,pfMin) )/(2.0*centerofmassEnergy);
     //
     //  set final state masses and energies in centre of mass system
     //
@@ -1610,7 +1610,7 @@
     const G4double bMin = 0.01;
     const G4double b1 = 4.0;
     const G4double b2 = 1.6;
-    G4double t = log( 1.0-G4UniformRand() ) / max( bMin, b1+b2*log(pOriginal) );
+    G4double t = log( 1.0-G4UniformRand() ) / G4std::max( bMin, b1+b2*log(pOriginal) );
     G4double t1 =
       pseudoParticle[1].GetTotalEnergy()/GeV - pseudoParticle[3].GetTotalEnergy()/GeV;
     G4double pin = pseudoParticle[1].GetMomentum().mag()/GeV;
@@ -1621,8 +1621,8 @@
     const G4double smallValue = 1.0e-10;
     G4double dumnve = 4.0*pin*pf;
     if( dumnve == 0.0 )dumnve = smallValue;
-    G4double ctet = max( -1.0, min( 1.0, 1.0+2.0*(t-tacmin)/dumnve ) );
-    dumnve = max( 0.0, 1.0-ctet*ctet );
+    G4double ctet = G4std::max( -1.0, G4std::min( 1.0, 1.0+2.0*(t-tacmin)/dumnve ) );
+    dumnve = G4std::max( 0.0, 1.0-ctet*ctet );
     G4double stet = sqrt(dumnve);
     G4double phi = G4UniformRand() * twopi;
     //
@@ -1657,8 +1657,8 @@
           G4double vMass = vec[i]->GetMass()/MeV;
           G4double totalE = kineticE + vMass;
           pp = sqrt( abs(totalE*totalE-vMass*vMass) );
-          G4double cost = min( 1.0, max( -1.0, log(2.23*G4UniformRand()+0.383)/0.96 ) );
-          G4double sint = sqrt( max( 0.0, (1.0-cost*cost) ) );
+          G4double cost = G4std::min( 1.0, G4std::max( -1.0, log(2.23*G4UniformRand()+0.383)/0.96 ) );
+          G4double sint = sqrt( G4std::max( 0.0, (1.0-cost*cost) ) );
           phi = twopi*G4UniformRand();
           vec[i]->SetMomentum( pp*sint*sin(phi)*MeV,
                                pp*sint*cos(phi)*MeV,
@@ -1779,7 +1779,7 @@
       vec[i]->Lorentz( *vec[i], pseudoParticle[2] );
     }
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    numberofFinalStateNucleons = max( 1, numberofFinalStateNucleons );
+    numberofFinalStateNucleons = G4std::max( 1, numberofFinalStateNucleons );
     //
     // sometimes the leading strange particle is lost, set it back
     //
@@ -2000,19 +2000,19 @@
       
       G4double sprob = 0.0; // sprob = probability of self-absorption in heavy molecules
       const G4double ekIncident = originalIncident->GetKineticEnergy()/GeV;
-      if( ekIncident >= 5.0 )sprob = min( 1.0, 0.6*log(ekIncident-4.0) );
+      if( ekIncident >= 5.0 )sprob = G4std::min( 1.0, 0.6*log(ekIncident-4.0) );
       
       if( epnb >= pnCutOff )
       {
         npnb = Poisson((1.5+1.25*numberofFinalStateNucleons)*epnb/(epnb+edta));
         if( numberofFinalStateNucleons + npnb > atomicWeight )
           npnb = G4int(atomicWeight - numberofFinalStateNucleons);
-        npnb = min( npnb, 127-vecLen );
+        npnb = G4std::min( npnb, 127-vecLen );
       }
       if( edta >= dtaCutOff )
       {
         ndta = Poisson( (1.5+1.25*numberofFinalStateNucleons)*edta/(epnb+edta) );
-        ndta = min( ndta, 127-vecLen );
+        ndta = G4std::min( ndta, 127-vecLen );
       }
       G4double spall = numberofFinalStateNucleons;
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
@@ -2181,11 +2181,11 @@
       //
       // Calculate slope b for elastic scattering on proton/neutron
       //
-      G4double b = max( cb, b1+b2*log(pOriginal) );     
+      G4double b = G4std::max( cb, b1+b2*log(pOriginal) );     
       G4double btrang = b * 4.0 * pf * pseudoParticle[0].GetMomentum().mag()/GeV;
       
       G4double exindt = -1.0;
-      exindt += exp(max(-btrang,expxl));
+      exindt += exp(G4std::max(-btrang,expxl));
       //
       // Calculate sqr(sin(teta/2.) and cos(teta), set azimuth angle phi
       //
@@ -2231,7 +2231,7 @@
         if( pp1 >= 1.0 )
         {
           ekin = currentParticle.GetKineticEnergy()/MeV - cfa*(1.0+0.5*normal())*GeV;
-          ekin = max( 0.0001*GeV, ekin );
+          ekin = G4std::max( 0.0001*GeV, ekin );
           currentParticle.SetKineticEnergy( ekin*MeV );
           pp = currentParticle.GetTotalMomentum()/MeV;
           currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
@@ -2240,7 +2240,7 @@
         if( pp1 >= 1.0 )
         {
           ekin = targetParticle.GetKineticEnergy()/MeV - cfa*(1.0+normal()/2.)*GeV;
-          ekin = max( 0.0001*GeV, ekin );
+          ekin = G4std::max( 0.0001*GeV, ekin );
           targetParticle.SetKineticEnergy( ekin*MeV );
           pp = targetParticle.GetTotalMomentum()/MeV;
           targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
@@ -2275,12 +2275,12 @@
         npnb = Poisson( epnb/0.02 );
         if( npnb > atomicWeight )npnb = G4int(atomicWeight);
         if( (epnb > pnCutOff) && (npnb <= 0) )npnb = 1;
-        npnb = min( npnb, 127-vecLen );
+        npnb = G4std::min( npnb, 127-vecLen );
       }
       if( edta >= dtaCutOff )
       {
         ndta = G4int(2.0 * log(atomicWeight));
-        ndta = min( ndta, 127-vecLen );
+        ndta = G4std::min( ndta, 127-vecLen );
       }
       G4double spall = 0.0;
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
@@ -2314,9 +2314,9 @@
     const G4double expxl = -expxu;         // lower bound for arg. of exp
     if( vecLen < 2 )
     {
-      G4cerr << "*** Error in G4ReactionDynamics::GenerateNBodyEvent" << endl;
-      G4cerr << "    number of particles < 2" << endl;
-      G4cerr << "totalEnergy = " << totalEnergy << "MeV, vecLen = " << vecLen << endl;
+      G4cerr << "*** Error in G4ReactionDynamics::GenerateNBodyEvent" << G4endl;
+      G4cerr << "    number of particles < 2" << G4endl;
+      G4cerr << "totalEnergy = " << totalEnergy << "MeV, vecLen = " << vecLen << G4endl;
       return -1.0;
     }
     G4double mass[18];    // mass of each particle
@@ -2346,9 +2346,9 @@
     G4double totalE = totalEnergy/GeV;
     if( totalMass > totalE )
     {
-      //G4cerr << "*** Error in G4ReactionDynamics::GenerateNBodyEvent" << endl;
+      //G4cerr << "*** Error in G4ReactionDynamics::GenerateNBodyEvent" << G4endl;
       //G4cerr << "    total mass (" << totalMass*GeV << "MeV) > total energy ("
-      //     << totalEnergy << "MeV)" << endl;
+      //     << totalEnergy << "MeV)" << G4endl;
       totalE = totalMass;
       //delete [] mass;
       //delete [] energy;
@@ -2440,7 +2440,7 @@
         wtmax += log( pd[i] );
     }
     G4double weight = 0.0;           // weight is returned by GenerateNBodyEvent
-    if( lzero )weight = exp( max(min(wtmax,expxu),expxl) );
+    if( lzero )weight = exp( G4std::max(G4std::min(wtmax,expxu),expxl) );
     
     G4double bang, cb, sb, s0, s1, s2, c, s, esys, a, b, gama, beta;
     pcm[0][0] = 0.0;
@@ -2522,7 +2522,7 @@
      G4double ran;
      
      if( x > 9.9 )    // use normal distribution with sigma^2 = <x>
-       iran = max( 0.0, x+normal()*sqrt(x) );
+       iran = G4std::max( 0.0, x+normal()*sqrt(x) );
      else {
       G4int mm = G4int(5.0*x);
       if( mm <= 0 )   // for very small x try iran=1,2,3
@@ -2568,7 +2568,7 @@
  G4int
    G4ReactionDynamics::Factorial( G4int n )
    {   // calculates factorial( n ) = n*(n-1)*(n-2)*...*1
-     G4int m = min(n,10);
+     G4int m = G4std::min(n,10);
      G4int result = 1;
      if( m <= 1 )return result;
      for( G4int i=2; i<=m; ++i )result *= i;
@@ -2770,7 +2770,7 @@
       }
       const G4double cfa = 0.025*((atomicWeight-1.)/120.)*exp(-(atomicWeight-1.)/120.);
       ekin = currentParticle.GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-      ekin = max( 1.0e-6, ekin );
+      ekin = G4std::max( 1.0e-6, ekin );
       xxh = 1.0;
       if( ( (modifiedOriginal.GetDefinition() == aPiPlus) ||
             (modifiedOriginal.GetDefinition() == aPiMinus) ) &&
@@ -2799,7 +2799,7 @@
       else
         currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
       ekin = targetParticle.GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-      ekin = max( 1.0e-6, ekin );
+      ekin = G4std::max( 1.0e-6, ekin );
       xxh = 1.0;
       if( ( (modifiedOriginal.GetDefinition() == aPiPlus) ||
             (modifiedOriginal.GetDefinition() == aPiMinus) ) &&
@@ -2830,7 +2830,7 @@
       for( i=0; i<vecLen; ++i )
       {
         ekin = vec[i]->GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-        ekin = max( 1.0e-6, ekin );
+        ekin = G4std::max( 1.0e-6, ekin );
         xxh = 1.0;
         if( ( (modifiedOriginal.GetDefinition() == aPiPlus) ||
               (modifiedOriginal.GetDefinition() == aPiMinus) ) &&
@@ -2871,7 +2871,7 @@
           (currentParticle.GetDefinition() == aPiMinus) )
       {
         currentParticle.SetKineticEnergy(
-         max( 0.001*MeV, dekin*currentParticle.GetKineticEnergy() ) );
+         G4std::max( 0.001*MeV, dekin*currentParticle.GetKineticEnergy() ) );
         pp = currentParticle.GetTotalMomentum()/MeV;
         pp1 = currentParticle.GetMomentum().mag()/MeV;
         if( pp1 < 0.001 )
@@ -2890,7 +2890,7 @@
           (targetParticle.GetDefinition() == aPiMinus) )
       {
         targetParticle.SetKineticEnergy(
-         max( 0.001*MeV, dekin*targetParticle.GetKineticEnergy() ) );
+         G4std::max( 0.001*MeV, dekin*targetParticle.GetKineticEnergy() ) );
         pp = targetParticle.GetTotalMomentum()/MeV;
         pp1 = targetParticle.GetMomentum().mag()/MeV;
         if( pp1 < 0.001 )
@@ -2910,7 +2910,7 @@
             (vec[i]->GetDefinition() == aPiZero) ||
             (vec[i]->GetDefinition() == aPiMinus) )
         {
-          vec[i]->SetKineticEnergy( max( 0.001*MeV, dekin*vec[i]->GetKineticEnergy() ) );
+          vec[i]->SetKineticEnergy( G4std::max( 0.001*MeV, dekin*vec[i]->GetKineticEnergy() ) );
           pp = vec[i]->GetTotalMomentum()/MeV;
           pp1 = vec[i]->GetMomentum().mag()/MeV;
           if( pp1 < 0.001 )
@@ -2990,7 +2990,7 @@
         if( kinetic < 0.0 )kinetic = -0.010*log(ran);
         backwardKinetic += kinetic;
         if( backwardKinetic > epnb )
-          kinetic = max( kineticMinimum, epnb-(backwardKinetic-kinetic) );
+          kinetic = G4std::max( kineticMinimum, epnb-(backwardKinetic-kinetic) );
         if( G4UniformRand() > (1.0-atomicNumber/atomicWeight) )
           p1->SetDefinition( aProton );
         else
@@ -3013,7 +3013,7 @@
         G4double ekw = ekOriginal/GeV;
         G4int ika, kk = 0;
         if( ekw > 1.0 )ekw *= ekw;
-        ekw = max( 0.1, ekw );
+        ekw = G4std::max( 0.1, ekw );
         ika = G4int(ika1*exp((atomicNumber*atomicNumber/atomicWeight-ika2)/ika3)/ekw);
         if( ika > 0 )
         {
@@ -3053,7 +3053,7 @@
         if( backwardKinetic > edta )kinetic = edta-(backwardKinetic-kinetic);
         if( kinetic < 0.0 )kinetic = kineticMinimum;
         G4double cost = 2.0*G4UniformRand() - 1.0;
-        G4double sint = sqrt(max(0.0,(1.0-cost*cost)));
+        G4double sint = sqrt(G4std::max(0.0,(1.0-cost*cost)));
         G4double phi = twopi*G4UniformRand();
         ran = G4UniformRand();
         if( ran <= 0.60 )
@@ -3471,7 +3471,7 @@
       energyCheck -= vec[i]->GetMass()/GeV;
       if( energyCheck < 0.0 )      // chop off the secondary List
       {
-        vecLen = max( 0, --i ); // looks like a memory leak @@@@@@@@@@@@
+        vecLen = G4std::max( 0, --i ); // looks like a memory leak @@@@@@@@@@@@
         break;
       }
     }
@@ -3516,7 +3516,7 @@
     if( pp <= 0.001*MeV )
     {
       G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = acos( max( -1.0, min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
+      G4double rthnve = acos( G4std::max( -1.0, G4std::min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
       currentParticle.SetMomentum( p*sin(rthnve)*cos(phinve),
                                    p*sin(rthnve)*sin(phinve),
                                    p*cos(rthnve) );
@@ -3576,7 +3576,7 @@
     
     G4double ke = currentParticle.GetKineticEnergy()/GeV;
     G4int nt = 2;
-    if( (index>=6) || (G4UniformRand()<min(0.5,ke*10.0)) )nt = 3;
+    if( (index>=6) || (G4UniformRand()<G4std::min(0.5,ke*10.0)) )nt = 3;
     
     G4ReactionProduct *v = new G4ReactionProduct [3];
     v[0].SetMass( mass[index]*MeV );
@@ -3670,13 +3670,13 @@
       particleIsDefined = true;
     }
     currentParticle.SetKineticEnergy(
-     max( 0.001, currentParticle.GetKineticEnergy()/MeV ) );
+     G4std::max( 0.001, currentParticle.GetKineticEnergy()/MeV ) );
     p = currentParticle.GetTotalMomentum();
     pp = currentParticle.GetMomentum().mag();
     if( pp <= 0.001*MeV )
     {
       G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = acos( max( -1.0, min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
+      G4double rthnve = acos( G4std::max( -1.0, G4std::min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
       currentParticle.SetMomentum( p*sin(rthnve)*cos(phinve),
                                    p*sin(rthnve)*sin(phinve),
                                    p*cos(rthnve) );
@@ -3687,13 +3687,13 @@
     if( particleIsDefined )
     {
       v[0].SetKineticEnergy(
-       max( 0.001, 0.5*G4UniformRand()*v[0].GetKineticEnergy()/MeV ) );
+       G4std::max( 0.001, 0.5*G4UniformRand()*v[0].GetKineticEnergy()/MeV ) );
       p = v[0].GetTotalMomentum();
       pp = v[0].GetMomentum().mag();
       if( pp <= 0.001*MeV )
       {
         G4double phinve = twopi*G4UniformRand();
-        G4double rthnve = acos( max(-1.0,min(1.0,-1.0+2.0*G4UniformRand())) );
+        G4double rthnve = acos( G4std::max(-1.0,G4std::min(1.0,-1.0+2.0*G4UniformRand())) );
         v[0].SetMomentum( p*sin(rthnve)*cos(phinve),
                           p*sin(rthnve)*sin(phinve),
                           p*cos(rthnve) );
@@ -3705,16 +3705,16 @@
         (v[1].GetDefinition() == aTriton)   ||
         (v[1].GetDefinition() == anAlpha) ) 
       v[1].SetKineticEnergy(
-       max( 0.001, 0.5*G4UniformRand()*v[1].GetKineticEnergy()/MeV ) );
+       G4std::max( 0.001, 0.5*G4UniformRand()*v[1].GetKineticEnergy()/MeV ) );
     else
-      v[1].SetKineticEnergy( max( 0.001, v[1].GetKineticEnergy()/MeV ) );
+      v[1].SetKineticEnergy( G4std::max( 0.001, v[1].GetKineticEnergy()/MeV ) );
     
     p = v[1].GetTotalMomentum();
     pp = v[1].GetMomentum().mag();
     if( pp <= 0.001*MeV )
     {
       G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = acos( max(-1.0,min(1.0,-1.0+2.0*G4UniformRand())) );
+      G4double rthnve = acos( G4std::max(-1.0,G4std::min(1.0,-1.0+2.0*G4UniformRand())) );
       v[1].SetMomentum( p*sin(rthnve)*cos(phinve),
                         p*sin(rthnve)*sin(phinve),
                         p*cos(rthnve) );
@@ -3728,16 +3728,16 @@
           (v[2].GetDefinition() == aTriton)   ||
           (v[2].GetDefinition() == anAlpha) ) 
         v[2].SetKineticEnergy(
-         max( 0.001, 0.5*G4UniformRand()*v[2].GetKineticEnergy()/MeV ) );
+         G4std::max( 0.001, 0.5*G4UniformRand()*v[2].GetKineticEnergy()/MeV ) );
       else
-        v[2].SetKineticEnergy( max( 0.001, v[2].GetKineticEnergy()/MeV ) );
+        v[2].SetKineticEnergy( G4std::max( 0.001, v[2].GetKineticEnergy()/MeV ) );
       
       p = v[2].GetTotalMomentum();
       pp = v[2].GetMomentum().mag();
       if( pp <= 0.001*MeV )
       {
         G4double phinve = twopi*G4UniformRand();
-        G4double rthnve = acos( max(-1.0,min(1.0,-1.0+2.0*G4UniformRand())) );
+        G4double rthnve = acos( G4std::max(-1.0,G4std::min(1.0,-1.0+2.0*G4UniformRand())) );
         v[2].SetMomentum( p*sin(rthnve)*cos(phinve),
                           p*sin(rthnve)*sin(phinve),
                           p*cos(rthnve) );
diff --git a/source/processes/hadronic/util/src/G4ReactionKinematics.cc b/source/processes/hadronic/util/src/G4ReactionKinematics.cc
index 24471bdca3..8c1644ed8a 100644
--- a/source/processes/hadronic/util/src/G4ReactionKinematics.cc
+++ b/source/processes/hadronic/util/src/G4ReactionKinematics.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionKinematics.cc,v 1.1.10.1 1999/12/07 20:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      CERN Geneva Switzerland
 //
diff --git a/source/processes/hadronic/util/src/G4ReactionProduct.cc b/source/processes/hadronic/util/src/G4ReactionProduct.cc
index 63f2be58e4..2b4dca89ea 100644
--- a/source/processes/hadronic/util/src/G4ReactionProduct.cc
+++ b/source/processes/hadronic/util/src/G4ReactionProduct.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReactionProduct.cc,v 1.1.10.1 1999/12/07 20:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
  // J.L. Chuma, TRIUMF, 31-Oct-1996
  // last modified: 19-Dec-1996
diff --git a/source/processes/hadronic/util/src/G4StableIsotopes.cc b/source/processes/hadronic/util/src/G4StableIsotopes.cc
index e3d1e471b9..2d58923c12 100644
--- a/source/processes/hadronic/util/src/G4StableIsotopes.cc
+++ b/source/processes/hadronic/util/src/G4StableIsotopes.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StableIsotopes.cc,v 1.1.10.1 1999/12/07 20:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4StableIsotopes.hh"
 
diff --git a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
index 62dbdffe8b..36cd45b570 100644
--- a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IVContinuousDiscreteProcess.hh,v 1.5 1999/11/07 17:11:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IVContinuousDiscreteProcess.hh,v 1.5.6.1 1999/12/08 17:35:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
@@ -174,10 +174,10 @@ inline G4double G4IVContinuousDiscreteProcess::AlongStepGetPhysicalInteractionLe
 
   if (verboseLevel>1){
     G4cout << "G4IVContinuousDiscreteProcess::AlongStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<G4endl;
   }
   return  steplength ;
 }
diff --git a/source/processes/management/include/G4IVRestDiscreteProcess.hh b/source/processes/management/include/G4IVRestDiscreteProcess.hh
index 7358ae1a0d..d5f03d5c76 100644
--- a/source/processes/management/include/G4IVRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVRestDiscreteProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IVRestDiscreteProcess.hh,v 1.5 1999/11/07 17:11:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4IVRestDiscreteProcess.hh,v 1.5.6.1 1999/12/08 17:35:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
@@ -155,10 +155,10 @@ inline G4double G4IVRestDiscreteProcess::AtRestGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
   if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4IVRestDiscreteProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 #endif
 
diff --git a/source/processes/management/include/G4ParticleTypes.hh b/source/processes/management/include/G4ParticleTypes.hh
index 11c5d0aaef..8f147a6dd2 100644
--- a/source/processes/management/include/G4ParticleTypes.hh
+++ b/source/processes/management/include/G4ParticleTypes.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleTypes.hh,v 1.3 1999/11/07 17:11:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcTblElement.hh b/source/processes/management/include/G4ProcTblElement.hh
index 56b0949530..5e50c9d1eb 100644
--- a/source/processes/management/include/G4ProcTblElement.hh
+++ b/source/processes/management/include/G4ProcTblElement.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcTblElement.hh,v 1.4.2.1 1999/11/11 14:31:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessAttribute.hh b/source/processes/management/include/G4ProcessAttribute.hh
index 3eb0469a03..a2e6bdae39 100644
--- a/source/processes/management/include/G4ProcessAttribute.hh
+++ b/source/processes/management/include/G4ProcessAttribute.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessAttribute.hh,v 1.3 1999/11/07 17:11:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessManager.hh b/source/processes/management/include/G4ProcessManager.hh
index 861484e0d9..0eb355db02 100644
--- a/source/processes/management/include/G4ProcessManager.hh
+++ b/source/processes/management/include/G4ProcessManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessManager.hh,v 1.5.2.1 1999/11/11 14:31:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessManager.icc b/source/processes/management/include/G4ProcessManager.icc
index a9f23ec667..574ecb138a 100644
--- a/source/processes/management/include/G4ProcessManager.icc
+++ b/source/processes/management/include/G4ProcessManager.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessManager.icc,v 1.1.4.1 1999/12/07 20:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/processes/management/include/G4ProcessManagerMessenger.hh b/source/processes/management/include/G4ProcessManagerMessenger.hh
index 14de84d08e..9ca5a6af64 100644
--- a/source/processes/management/include/G4ProcessManagerMessenger.hh
+++ b/source/processes/management/include/G4ProcessManagerMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessManagerMessenger.hh,v 1.4 1999/11/07 17:11:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessTable.hh b/source/processes/management/include/G4ProcessTable.hh
index 4cffb3899a..9eb807479b 100644
--- a/source/processes/management/include/G4ProcessTable.hh
+++ b/source/processes/management/include/G4ProcessTable.hh
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessTable.hh,v 1.4.2.1 1999/11/11 14:31:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessTableMessenger.hh b/source/processes/management/include/G4ProcessTableMessenger.hh
index 72e507c4c8..ddd6efbb53 100644
--- a/source/processes/management/include/G4ProcessTableMessenger.hh
+++ b/source/processes/management/include/G4ProcessTableMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessTableMessenger.hh,v 1.3 1999/11/07 17:11:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessType.hh b/source/processes/management/include/G4ProcessType.hh
index 2cd24e7966..c2a18218ba 100644
--- a/source/processes/management/include/G4ProcessType.hh
+++ b/source/processes/management/include/G4ProcessType.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessType.hh,v 1.3 1999/11/07 17:11:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessVector.hh b/source/processes/management/include/G4ProcessVector.hh
index ad78763fa8..a0aac4f832 100644
--- a/source/processes/management/include/G4ProcessVector.hh
+++ b/source/processes/management/include/G4ProcessVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessVector.hh,v 1.3.2.1 1999/11/11 14:31:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VContinuousDiscreteProcess.hh b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
index e65e1f19b4..bc4a948d2f 100644
--- a/source/processes/management/include/G4VContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VContinuousDiscreteProcess.hh,v 1.3 1999/11/07 17:11:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VContinuousDiscreteProcess.hh,v 1.3.6.1 1999/12/08 17:35:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -150,10 +150,10 @@ inline G4double G4VContinuousDiscreteProcess::PostStepGetPhysicalInteractionLeng
 #ifdef G4VERBOSE
   if ((currentInteractionLength <=0.0) || (verboseLevel>2)){
     G4cout << "G4VContinuousDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<G4endl;
   }
 #endif
 
@@ -161,10 +161,10 @@ inline G4double G4VContinuousDiscreteProcess::PostStepGetPhysicalInteractionLeng
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << "G4VContinuousDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<G4endl;
   }
 #endif
   return value;
@@ -211,10 +211,10 @@ inline G4double G4VContinuousDiscreteProcess::AlongStepGetPhysicalInteractionLen
 #ifdef G4VERBOSE
    if (verboseLevel>1){
     G4cout << "G4VContinuousDiscreteProcess::AlongStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<G4endl;
   }
 #endif
   return  steplength ;
diff --git a/source/processes/management/include/G4VContinuousProcess.hh b/source/processes/management/include/G4VContinuousProcess.hh
index 3ff737ea10..5cdb10f2cc 100644
--- a/source/processes/management/include/G4VContinuousProcess.hh
+++ b/source/processes/management/include/G4VContinuousProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VContinuousProcess.hh,v 1.3 1999/11/07 17:11:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VContinuousProcess.hh,v 1.3.6.1 1999/12/08 17:35:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -146,10 +146,10 @@ inline G4double G4VContinuousProcess::AlongStepGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
    if (verboseLevel>1){
     G4cout << "G4VContinuousProcess::AlongStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<G4endl;
   }
 #endif
 
diff --git a/source/processes/management/include/G4VDiscreteProcess.hh b/source/processes/management/include/G4VDiscreteProcess.hh
index ecbf395073..3205ce1bf2 100644
--- a/source/processes/management/include/G4VDiscreteProcess.hh
+++ b/source/processes/management/include/G4VDiscreteProcess.hh
@@ -6,8 +6,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDiscreteProcess.hh,v 1.3 1999/11/07 17:11:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VDiscreteProcess.hh,v 1.3.6.1 1999/12/08 17:35:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -138,10 +138,10 @@ inline G4double G4VDiscreteProcess::PostStepGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
   if ((currentInteractionLength <=0.0) || (verboseLevel>2)){
     G4cout << "G4VDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<G4endl;
   }
 #endif
 
@@ -150,10 +150,10 @@ inline G4double G4VDiscreteProcess::PostStepGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << "G4VDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<G4endl;
   }
 #endif
   return value;
diff --git a/source/processes/management/include/G4VProcess.hh b/source/processes/management/include/G4VProcess.hh
index 07d9a787e9..fd9c79128c 100644
--- a/source/processes/management/include/G4VProcess.hh
+++ b/source/processes/management/include/G4VProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VProcess.hh,v 1.5 1999/11/07 17:11:47 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
index 48adda1cf7..195aee1a97 100644
--- a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRestContinuousDiscreteProcess.hh,v 1.3 1999/11/07 17:11:47 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRestContinuousDiscreteProcess.hh,v 1.3.6.1 1999/12/08 17:35:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -150,10 +150,10 @@ inline G4double G4VRestContinuousDiscreteProcess::AtRestGetPhysicalInteractionLe
 #ifdef G4VERBOSE
    if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4VRestContinuousDiscreteProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 #endif
 
@@ -192,10 +192,10 @@ inline G4double G4VRestContinuousDiscreteProcess::AlongStepGetPhysicalInteractio
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << "G4VRestContinuousDiscreteProcess::AlongStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<G4endl;
   }
 #endif
   return  steplength ;
@@ -234,10 +234,10 @@ inline G4double G4VRestContinuousDiscreteProcess::PostStepGetPhysicalInteraction
 #ifdef G4VERBOSE
    if ((currentInteractionLength <=0.0) || (verboseLevel>2)){
     G4cout << "G4VRestContinuousDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<G4endl;
   }
 #endif
 
@@ -245,10 +245,10 @@ inline G4double G4VRestContinuousDiscreteProcess::PostStepGetPhysicalInteraction
 #ifdef G4VERBOSE
    if (verboseLevel>1){
     G4cout << "G4VRestContinuousDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<G4endl;
   }
 #endif
   return value;
diff --git a/source/processes/management/include/G4VRestContinuousProcess.hh b/source/processes/management/include/G4VRestContinuousProcess.hh
index aa9a000ad4..a01e646698 100644
--- a/source/processes/management/include/G4VRestContinuousProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRestContinuousProcess.hh,v 1.3 1999/11/07 17:11:47 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRestContinuousProcess.hh,v 1.3.6.1 1999/12/08 17:35:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -150,10 +150,10 @@ inline G4double G4VRestContinuousProcess::AlongStepGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
    if (verboseLevel>1){
     G4cout << "G4VRestContinuousProcess::AlongStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "IntractionLength= " << steplength/cm <<"[cm] " <<G4endl;
   }
 #endif
    return  steplength ;
@@ -176,10 +176,10 @@ inline G4double G4VRestContinuousProcess::AtRestGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
    if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4VRestContinuousProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 #endif
 
diff --git a/source/processes/management/include/G4VRestDiscreteProcess.hh b/source/processes/management/include/G4VRestDiscreteProcess.hh
index 52daaf9e1d..5a68fdb05e 100644
--- a/source/processes/management/include/G4VRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestDiscreteProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRestDiscreteProcess.hh,v 1.3 1999/11/07 17:11:48 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRestDiscreteProcess.hh,v 1.3.6.1 1999/12/08 17:35:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -143,10 +143,10 @@ inline
 #ifdef G4VERBOSE
    if ((currentInteractionLength <=0.0) || (verboseLevel>2)){
     G4cout << "G4VRestDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanFreePath = " << currentInteractionLength/cm << "[cm]" <<G4endl;
   }
 #endif
 
@@ -154,10 +154,10 @@ inline
 #ifdef G4VERBOSE
    if (verboseLevel>1){
     G4cout << "G4VRestDiscreteProcess::PostStepGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<endl;
-    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<endl;
+    G4cout << " in Material  " <<  track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "InteractionLength= " << value/cm <<"[cm] " <<G4endl;
   }
 #endif
   return value;
@@ -191,10 +191,10 @@ inline G4double G4VRestDiscreteProcess::AtRestGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
    if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4VRestDiscreteProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 #endif
 
diff --git a/source/processes/management/include/G4VRestProcess.hh b/source/processes/management/include/G4VRestProcess.hh
index b22f83224e..8d426f56cd 100644
--- a/source/processes/management/include/G4VRestProcess.hh
+++ b/source/processes/management/include/G4VRestProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRestProcess.hh,v 1.3 1999/11/07 17:11:48 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRestProcess.hh,v 1.3.6.1 1999/12/08 17:35:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -130,10 +130,10 @@ inline G4double G4VRestProcess::AtRestGetPhysicalInteractionLength(
 #ifdef G4VERBOSE
  if ((currentInteractionLength <0.0) || (verboseLevel>2)){
     G4cout << "G4VRestProcess::AtRestGetPhysicalInteractionLength ";
-    G4cout << "[ " << GetProcessName() << "]" <<endl;
+    G4cout << "[ " << GetProcessName() << "]" <<G4endl;
     track.GetDynamicParticle()->DumpInfo();
-    G4cout << " in Material  " << track.GetMaterial()->GetName() <<endl;
-    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<endl;
+    G4cout << " in Material  " << track.GetMaterial()->GetName() <<G4endl;
+    G4cout << "MeanLifeTime = " << currentInteractionLength/ns << "[ns]" <<G4endl;
   }
 #endif 
 
diff --git a/source/processes/management/src/G4IVContinuousDiscreteProcess.cc b/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
index 2c1d414f56..e3a0ccd1ee 100644
--- a/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IVContinuousDiscreteProcess.cc,v 1.4.8.1 1999/12/07 20:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4IVRestDiscreteProcess.cc b/source/processes/management/src/G4IVRestDiscreteProcess.cc
index 26153a6fc2..d2e7990f6b 100644
--- a/source/processes/management/src/G4IVRestDiscreteProcess.cc
+++ b/source/processes/management/src/G4IVRestDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IVRestDiscreteProcess.cc,v 1.4.8.1 1999/12/07 20:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcTblElement.cc b/source/processes/management/src/G4ProcTblElement.cc
index dde81857a9..52e5431155 100644
--- a/source/processes/management/src/G4ProcTblElement.cc
+++ b/source/processes/management/src/G4ProcTblElement.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcTblElement.cc,v 1.2.8.1 1999/12/07 20:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessAttribute.cc b/source/processes/management/src/G4ProcessAttribute.cc
index 44d19777c9..238c15fbbf 100644
--- a/source/processes/management/src/G4ProcessAttribute.cc
+++ b/source/processes/management/src/G4ProcessAttribute.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessAttribute.cc,v 1.2.8.1 1999/12/07 20:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessManager.cc b/source/processes/management/src/G4ProcessManager.cc
index ee05d63a38..ebfba3a26e 100644
--- a/source/processes/management/src/G4ProcessManager.cc
+++ b/source/processes/management/src/G4ProcessManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProcessManager.cc,v 1.10.4.1 1999/12/07 20:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProcessManager.cc,v 1.10.4.1.2.5 1999/12/14 09:16:49 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -26,15 +26,11 @@
 #include "G4ProcessManagerMessenger.hh"
 #include "G4ProcessManager.hh"
 #include "G4StateManager.hh"
-#include <iomanip.h>
+#include "g4std/iomanip"
 #include "G4ProcessTable.hh"
 #include "G4ios.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 
@@ -51,12 +47,12 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
 		verboseLevel(1)
 {
   char errMsg[1024];
-  ostrstream errOs(errMsg,1024);
+  G4std::ostrstream errOs(errMsg,1024);
   // create the process List
   theProcessList = new G4ProcessVector();
   if ( theProcessList == 0) {
     errOs << "G4ProcessManager::G4ProcessManager():";
-    errOs << " can not create G4ProcessVector " << endl;
+    errOs << " can not create G4ProcessVector " << G4endl;
     G4Exception(errMsg);
   }
 
@@ -65,7 +61,7 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
     theProcVector[i] = new G4ProcessVector();
     if ( theProcVector[i] == 0) {
       errOs << "G4ProcessManager::G4ProcessManager():";
-      errOs << " can not create G4ProcessVector " << endl;
+      errOs << " can not create G4ProcessVector " << G4endl;
       G4Exception(errMsg);
     }
   }
@@ -89,7 +85,7 @@ G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
    verboseLevel = right.verboseLevel;
 #ifdef G4VERBOSE
    if (GetVerboseLevel() > 2) {
-     G4cout <<  "G4ProcessManagerMessenger:: copy constructor " <<endl; 
+     G4cout <<  "G4ProcessManagerMessenger:: copy constructor " <<G4endl; 
     }
 #endif
 
@@ -140,7 +136,7 @@ G4ProcessManager::G4ProcessManager():
                 numberOfProcesses(0)
 {
   if (GetVerboseLevel()>0) {
-    G4cout << "G4ProcessManager: default constructor is called !!" <<endl;
+    G4cout << "G4ProcessManager: default constructor is called !!" <<G4endl;
   }
 }
 
@@ -175,7 +171,7 @@ G4ProcessManager::~G4ProcessManager()
       fProcessManagerMessenger = 0;
 #ifdef G4VERBOSE
       if (GetVerboseLevel() > 1) {
-	G4cout << "G4ProcessManagerMessenger is deleted" << endl;
+	G4cout << "G4ProcessManagerMessenger is deleted" << G4endl;
       } 
 #endif
     }
@@ -200,14 +196,14 @@ G4int G4ProcessManager::GetProcessVectorIndex(
       G4cout << " G4ProcessManager::GetProcessVectorIndex:";
       G4cout << "particle[" << theParticleType->GetParticleName() << "] " ;
       G4cout <<  "process[" << aProcess->GetProcessName() << "]" ;
-      G4cout << endl;
+      G4cout << G4endl;
       if (idxProc <0) { 
 	G4cout << " is not registered yet ";
       }
       if (ivec <0) {
 	G4cout << " illegal DoIt Index [= " << idx << "," << typ << "]";
       }
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif
   }
@@ -223,10 +219,10 @@ G4ProcessAttribute* G4ProcessManager::GetAttribute(G4int index) const
     if (GetVerboseLevel()>0) {
       G4cout << "G4ProcessManager::GetAttribute():";
       G4cout << " particle[" << theParticleType->GetParticleName() << "]";
-      G4cout << endl;
-      G4cout << "  index out of range " << endl;
+      G4cout << G4endl;
+      G4cout << "  index out of range " << G4endl;
       G4cout << "  #processes[" << numberOfProcesses << "]"; 
-      G4cout << "  index [" << index << "]" << endl;
+      G4cout << "  index [" << index << "]" << G4endl;
     }
 #endif
     return 0;
@@ -251,8 +247,8 @@ G4ProcessAttribute* G4ProcessManager::GetAttribute(G4int index) const
    if (GetVerboseLevel()>0) { 
       G4cout << "G4ProcessManager::GetAttribute():";
       G4cout << " particle[" << theParticleType->GetParticleName() << "]";
-      G4cout << endl;
-      G4cout << "Warning:: attribute vector index is inconsistent with process List index" << endl; 
+      G4cout << G4endl;
+      G4cout << "Warning:: attribute vector index is inconsistent with process List index" << G4endl; 
     }
 #endif
    // re-ordering attribute vector 
@@ -293,7 +289,7 @@ G4int G4ProcessManager::InsertAt(G4int ip, G4VProcess* process, G4int ivec)
     } else {
 #ifdef G4VERBOSE
       if (GetVerboseLevel()>0) { 
-	G4cout << " G4ProcessManager::InsertAt : No Process Attribute " << endl;
+	G4cout << " G4ProcessManager::InsertAt : No Process Attribute " << G4endl;
       }
 #endif
     }
@@ -328,7 +324,7 @@ G4int G4ProcessManager::RemoveAt(G4int ip, G4VProcess* process, G4int ivec)
     }else {
 #ifdef G4VERBOSE
       if (GetVerboseLevel()>0) { 
-	G4cout << " G4ProcessManager::RemoveAt : No Process Attribute " << endl;
+	G4cout << " G4ProcessManager::RemoveAt : No Process Attribute " << G4endl;
       }
 #endif
     }
@@ -370,8 +366,8 @@ G4int G4ProcessManager::AddProcess(
   if (  !aProcess->IsApplicable(*theParticleType) ) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>1) {
-      G4cout << aErrorMessage << endl;
-      G4cout << "This process is not applicable to this particle" << endl;
+      G4cout << aErrorMessage << G4endl;
+      G4cout << "This process is not applicable to this particle" << G4endl;
     }
 #endif
     //  G4Exception((const char*)aErrorMessage); 
@@ -380,7 +376,7 @@ G4int G4ProcessManager::AddProcess(
 
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>2) {
-    G4cout << aErrorMessage << endl;
+    G4cout << aErrorMessage << G4endl;
   }
 #endif
 
@@ -435,11 +431,11 @@ G4int G4ProcessManager::AddProcess(
 
 #ifdef G4VERBOSE
       if (verboseLevel>2) {
-	G4cout <<  aErrorMessage << endl;
+	G4cout <<  aErrorMessage << G4endl;
 	G4cout << aProcess->GetProcessName() << " is inserted at "<< ip;
 	G4cout << " in ProcessVetor[" << ivec<< "]";
 	G4cout << " with Ordering parameter = " ;
-	G4cout <<  pAttr->ordProcVector[ivec]  << endl;
+	G4cout <<  pAttr->ordProcVector[ivec]  << G4endl;
       }
 #endif
      }
@@ -482,7 +478,7 @@ G4VProcess* G4ProcessManager::RemoveProcess(G4int index)
             G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	    G4cerr << "process["<<removedProcess->GetProcessName()<< "]  " ;
 	    G4cerr << "bad index in attribute ";
-	    G4cerr << idx << "->" << pVector->index(removedProcess) << endl;
+	    G4cerr << idx << "->" << pVector->index(removedProcess) << G4endl;
 	  }
 #endif
           G4Exception((const char*)(aErrorMessage)); 
@@ -498,7 +494,7 @@ G4VProcess* G4ProcessManager::RemoveProcess(G4int index)
 	  G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	  G4cerr << "process["<<removedProcess->GetProcessName()<< "]  " ;
 	  G4cerr << "index(=" << idx << ") of process vector";
-	  G4cerr << "[size:" << pVector->entries() << "] out of range" <<endl;
+	  G4cerr << "[size:" << pVector->entries() << "] out of range" <<G4endl;
 	}
 #endif
 	G4Exception((const char*)(aErrorMessage)); 
@@ -549,7 +545,7 @@ G4int G4ProcessManager::GetProcessOrdering(
     if (verboseLevel>0) {
       G4cout << "G4ProcessManager::SetProcessOrdering: ";
       G4cout << " illegal DoIt Index [= " << idDoIt << "]";
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif
     return -1;
@@ -579,7 +575,7 @@ void G4ProcessManager::SetProcessOrdering(
   if (GetVerboseLevel()>2) {
     G4cout << aErrorMessage ;
     G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
-    G4cout <<"process[" + aProcess->GetProcessName() + "]"<<  endl;
+    G4cout <<"process[" + aProcess->GetProcessName() + "]"<<  G4endl;
   }
 #endif
 
@@ -588,11 +584,11 @@ void G4ProcessManager::SetProcessOrdering(
   if (ivec <0 ) {
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
-      G4cout <<  aErrorMessage << endl;
+      G4cout <<  aErrorMessage << G4endl;
       G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
-      G4cout << "process[" + aProcess->GetProcessName() + "]"<<  endl;
+      G4cout << "process[" + aProcess->GetProcessName() + "]"<<  G4endl;
       G4cout << " illegal DoIt Index [= " << idDoIt << "]";
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif
     return;
@@ -626,13 +622,13 @@ void G4ProcessManager::SetProcessOrdering(
       pAttr->idxProcVector[ivec] = ip;
 #ifdef G4VERBOSE
       if (verboseLevel>2) {
-	G4cout <<  aErrorMessage << endl;
+	G4cout <<  aErrorMessage << G4endl;
 	G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
-	G4cout <<"process[" + aProcess->GetProcessName() + "]"<<  endl;
+	G4cout <<"process[" + aProcess->GetProcessName() + "]"<<  G4endl;
 	G4cout << aProcess->GetProcessName() << " is inserted at "<< ip;
 	G4cout << " in ProcessVetor[" << ivec<< "]";
 	G4cout << " with Ordering parameter = " <<  ordDoIt ;
-	G4cout << endl;
+	G4cout << G4endl;
       }
 #endif
     }
@@ -656,7 +652,7 @@ void G4ProcessManager::SetProcessOrderingToFirst(
     if (verboseLevel>0) {
       G4cout << "G4ProcessManager::SetProcessOrdering: ";
       G4cout << " illegal DoIt Index [= " << idDoIt << "]";
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif
     return;
@@ -689,7 +685,7 @@ void G4ProcessManager::SetProcessOrderingToFirst(
       G4cout << "G4ProcessManager::SetProcessOrdering: ";
       G4cout << aProcess->GetProcessName() << " is inserted at top ";
       G4cout << " in ProcessVetor[" << ivec<< "]";
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif
   }
@@ -722,7 +718,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
       } else if  (currentState == Init ) {
 	G4cout << "Init ";
       } 
-      G4cout << "state !" << endl;
+      G4cout << "state !" << G4endl;
     }
 #endif
    return 0;
@@ -757,7 +753,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
 	    G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	    G4cerr << "process["<<pProcess->GetProcessName()<<"]   " ;
 	    G4cerr << "bad index in attribute ";
-	    G4cerr << idx << "->" << pVector->index(pProcess) << endl;
+	    G4cerr << idx << "->" << pVector->index(pProcess) << G4endl;
 	  }
 #endif
           G4Exception((const char*)aErrorMessage); 
@@ -771,7 +767,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
 	  G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	  G4cerr << "process["<<pProcess->GetProcessName()<<"]   " ;
 	  G4cerr << "index(=" << idx << ") of process vector";
-	  G4cerr << "[size:" << pVector->entries() << "] out of range" << endl;
+	  G4cerr << "[size:" << pVector->entries() << "] out of range" << G4endl;
 	}
 #endif
 	G4Exception((const char*)aErrorMessage); 
@@ -786,7 +782,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
       G4cout << aErrorMessage;
       G4cout << "particle["<<theParticleType->GetParticleName()<<"] " ;
       G4cout << "process["<<pProcess->GetProcessName()<<"]   " ;
-      G4cout << "The process is already inactive" << endl;
+      G4cout << "The process is already inactive" << G4endl;
     }
 #endif
   }
@@ -807,7 +803,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
       } else  if (currentState == Init ) {
 	G4cout << "Init ";
       } 
-      G4cout << "state !" << endl;
+      G4cout << "state !" << G4endl;
     }
 #endif
    return 0;
@@ -825,8 +821,8 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
   if (pAttr->isActive) {
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0) {
-      G4cout << aErrorMessage << endl;
-      G4cout << "The process is already active" << endl;
+      G4cout << aErrorMessage << G4endl;
+      G4cout << "The process is already active" << G4endl;
     }
 #endif
   } else { 
@@ -847,7 +843,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
 	    G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	    G4cerr << "process["<<pProcess->GetProcessName()<<"]   " ;
 	    G4cerr << "bad index in attribute " << idx << "->";
-	    G4cerr << pVector->index(pProcess) << endl;
+	    G4cerr << pVector->index(pProcess) << G4endl;
 	  }
 #endif
           G4Exception((const char*)aErrorMessage); 
@@ -861,7 +857,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
 	  G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
 	  G4cerr << "process["<<pProcess->GetProcessName()<<"]   " ;
 	  G4cerr << "index(=" << idx <<")of process vector";
-	  G4cerr << "[size:" << pVector->entries() << "] out of range" << endl;
+	  G4cerr << "[size:" << pVector->entries() << "] out of range" << G4endl;
 	}
 #endif
 	G4Exception((const char*)aErrorMessage); 
@@ -893,7 +889,7 @@ void G4ProcessManager::DumpInfo()
   // particle type
   G4String* aMessage = new G4String("G4ProcessManager:");
   *aMessage += "particle[" + theParticleType->GetParticleName() + "]";
-  G4cout << *aMessage << endl;
+  G4cout << *aMessage << G4endl;
   delete aMessage;
 
   // loop over all processes
@@ -911,28 +907,28 @@ void G4ProcessManager::DumpInfo()
     } else {
       G4cout << " InActive ";
     }
-    G4cout << endl;
+    G4cout << G4endl;
 
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       // order parameter    
       G4cout << "  Ordering::     ";
       G4cout << "        AtRest             AlongStep          PostStep   ";
-      G4cout << endl;
+      G4cout << G4endl;
       G4cout << "                 ";
       G4cout << "   GetPIL/    DoIt    GetPIL/    DoIt    GetPIL/    DoIt ";
-      G4cout << endl;
-      G4cout << "  Ordering::      " << endl;
+      G4cout << G4endl;
+      G4cout << "  Ordering::      " << G4endl;
       G4cout << "  index           ";
       for (G4int idx2 = 0; idx2 <6 ; idx2++) {
-	G4cout << setw(8) << pAttr->idxProcVector[idx2] <<":";
+	G4cout << G4std::setw(8) << pAttr->idxProcVector[idx2] <<":";
       }
-      G4cout << endl;
+      G4cout << G4endl;
       G4cout << "  parameter       ";
       for (G4int idx3 = 0; idx3 <6 ; idx3++) {
-	G4cout << setw(8) << pAttr->ordProcVector[idx3] <<":";
+	G4cout << G4std::setw(8) << pAttr->ordProcVector[idx3] <<":";
       }
-      G4cout << endl;
+      G4cout << G4endl;
     }
 #endif 
   }
diff --git a/source/processes/management/src/G4ProcessManagerMessenger.cc b/source/processes/management/src/G4ProcessManagerMessenger.cc
index 3ddaad2213..325ddd68bf 100644
--- a/source/processes/management/src/G4ProcessManagerMessenger.cc
+++ b/source/processes/management/src/G4ProcessManagerMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProcessManagerMessenger.cc,v 1.3.8.1 1999/12/07 20:52:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProcessManagerMessenger.cc,v 1.3.8.1.2.5 1999/12/14 09:16:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -36,13 +36,9 @@
 
 #include "G4ProcessManagerMessenger.hh"
 #include "G4ios.hh"                 // Include from 'system'
-#include <iomanip.h>                  // Include from 'system'
+#include "g4std/iomanip"                  // Include from 'system'
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4ProcessManagerMessenger::G4ProcessManagerMessenger(G4ParticleTable* pTable)
                         :theParticleTable(pTable),
@@ -117,7 +113,7 @@ G4ParticleDefinition* G4ProcessManagerMessenger::SetCurrentParticle()
   if (currentParticle == 0) {
     theManager = 0;
     G4cout << "G4ProcessManagerMessenger::SetCurrentParticle() ";
-    G4cout << particleName << " not found " << endl;
+    G4cout << particleName << " not found " << G4endl;
   } else {
     theManager = currentParticle->GetProcessManager();
     theProcessList = theManager->GetProcessList();
@@ -128,7 +124,7 @@ G4ParticleDefinition* G4ProcessManagerMessenger::SetCurrentParticle()
 void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
 {
   if (SetCurrentParticle()==0) {
-      G4cout << "Particle is not selected yet !! Command ignored." << endl;
+      G4cout << "Particle is not selected yet !! Command ignored." << G4endl;
       return;
   }
   if( command == dumpCmd ){
@@ -140,12 +136,12 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
       currentProcess =  (*theProcessList)(index);
       if (currentProcess == 0) {
 	G4cout << " no process at index of " << index;
-	G4cout << "in the Process Vector" << endl;
+	G4cout << "in the Process Vector" << G4endl;
       } else {
 	currentProcess->DumpInfo();
       }
     } else {
-      G4cout << " illegal index !!! " << endl;
+      G4cout << " illegal index !!! " << G4endl;
       currentProcess = 0;
     } 
  
@@ -160,7 +156,7 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
     //Commnad   /particle/process/Verbose
     //  inputstream for newValues 
     const char* temp = (const char*)(newValue);
-    istrstream is((char*)temp);
+    G4std::istrstream is((char*)temp);
     G4int Verbose, index;
     is  >>Verbose >>index;
     if (index <0) {
@@ -170,12 +166,12 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
       currentProcess =  (*theProcessList)(index);
       if (currentProcess == 0) {
 	G4cout << " no process at index of " << index;
-	G4cout << "in the Process Vector" << endl;
+	G4cout << "in the Process Vector" << G4endl;
       } else {
 	currentProcess->SetVerboseLevel(Verbose);
       }
     } else {
-      G4cout << " illegal index !!! " << endl;
+      G4cout << " illegal index !!! " << G4endl;
       currentProcess = 0;
     } 
   }
@@ -191,7 +187,7 @@ G4String G4ProcessManagerMessenger::GetCurrentValue(G4UIcommand * command)
   }
 
   char line[255];
-  ostrstream os(line,255);
+  G4std::ostrstream os(line,255);
   
   if( command==verboseCmd ){
     //Commnad   /particle/process/Verbose
diff --git a/source/processes/management/src/G4ProcessTable.cc b/source/processes/management/src/G4ProcessTable.cc
index e2467b153c..72bdf16295 100644
--- a/source/processes/management/src/G4ProcessTable.cc
+++ b/source/processes/management/src/G4ProcessTable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProcessTable.cc,v 1.3.8.1 1999/12/07 20:52:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProcessTable.cc,v 1.3.8.1.2.1 1999/12/08 17:35:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -26,7 +26,7 @@ G4ProcessTable::G4ProcessTable():verboseLevel(1)
 {
 #ifdef G4VERBOSE
   if (verboseLevel>1){
-    G4cout << "--  G4ProcessTable constructor  --" << endl;
+    G4cout << "--  G4ProcessTable constructor  --" << G4endl;
   }
 #endif
   fProcTblVector  = new  G4ProcTableVector();
@@ -40,7 +40,7 @@ G4ProcessTable::G4ProcessTable(const G4ProcessTable &right)
 {
 #ifdef G4VERBOSE
   if (verboseLevel>0){
-    G4cout << "--  G4ProcessTable copy constructor  --" << endl;
+    G4cout << "--  G4ProcessTable copy constructor  --" << G4endl;
   }
 #endif
 }
@@ -50,7 +50,7 @@ G4ProcessTable::~G4ProcessTable()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>1){
-    G4cout << "--  G4ProcessTable destructor  --" << endl;
+    G4cout << "--  G4ProcessTable destructor  --" << G4endl;
   }
 
 #endif
@@ -96,7 +96,7 @@ G4ProcessTable & G4ProcessTable::operator=(const G4ProcessTable &right)
 {
 #ifdef G4VERBOSE
   if (verboseLevel>0){
-    G4cout << "--  G4ProcessTable assignment operator  --" << endl;
+    G4cout << "--  G4ProcessTable assignment operator  --" << G4endl;
   }
 #endif
   if (&right == this) return *this;
@@ -136,7 +136,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
   if ( (aProcess == 0) || ( aProcMgr == 0 ) ){
 #ifdef G4VERBOSE
     if (verboseLevel>0){
-      G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "<<endl;
+      G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "<<G4endl;
     }
 #endif
     return -1;
@@ -147,7 +147,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
     G4cout << "G4ProcessTable::Insert ";
     G4cout << " Process["  << aProcess->GetProcessName() << "]";
     G4cout << " Particle["  << aProcMgr->GetParticleType()->GetParticleName() << "]";
-    G4cout << endl;
+    G4cout << G4endl;
   }
 #endif
 
@@ -163,7 +163,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
       isFoundInTbl = true;
 #ifdef G4VERBOSE
       if (verboseLevel>2){
-	G4cout << " This Process has been already registered !! " << endl;
+	G4cout << " This Process has been already registered !! " << G4endl;
       }
 #endif
       // 
@@ -174,7 +174,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
 	  isFound = true;
 #ifdef G4VERBOSE
 	  if (verboseLevel>1){
-	    G4cout << " This Process Manager has been already registered !! " << endl;
+	    G4cout << " This Process Manager has been already registered !! " << G4endl;
 	  }
 #endif
 	  break;
@@ -185,7 +185,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
 	anElement->Insert(aProcMgr);
 #ifdef G4VERBOSE
 	if (verboseLevel>2){
-	  G4cout << " This Process Manager is registered !! " << endl;
+	  G4cout << " This Process Manager is registered !! " << G4endl;
 	}
 #endif
       }
@@ -203,7 +203,7 @@ G4int   G4ProcessTable::Insert(G4VProcess* aProcess,
     }
 #ifdef G4VERBOSE
     if (verboseLevel>2){
-      G4cout << " This Process is registered !! " << endl;
+      G4cout << " This Process is registered !! " << G4endl;
     }
 #endif
   }
@@ -217,7 +217,7 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
   if ( (aProcess == 0) || ( aProcMgr == 0 ) ){
 #ifdef G4VERBOSE
     if (verboseLevel>0){
-      G4cout << "G4ProcessTable::Remove : arguments are 0 pointer "<< endl;
+      G4cout << "G4ProcessTable::Remove : arguments are 0 pointer "<< G4endl;
     }
 #endif
     return -1;
@@ -227,7 +227,7 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
   if (verboseLevel>1){
     G4cout << "G4ProcessTable::Remove ";
     G4cout << " Process["  << aProcess->GetProcessName() << "]";
-    G4cout << " Particle[" << aProcMgr->GetParticleType()->GetParticleName() << "]" << endl;
+    G4cout << " Particle[" << aProcMgr->GetParticleType()->GetParticleName() << "]" << G4endl;
   }
 #endif
 
@@ -255,7 +255,7 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
 	anElement->Remove(aProcMgr);
 #ifdef G4VERBOSE
 	if (verboseLevel>2){
-	  G4cout << " This Process Manager is removed !! " << endl;
+	  G4cout << " This Process Manager is removed !! " << G4endl;
 	}
 #endif
       }
@@ -281,7 +281,7 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
       }
 #ifdef G4VERBOSE
       if (verboseLevel>1){
-	G4cout << " This Process is removed !! " << endl;
+	G4cout << " This Process is removed !! " << G4endl;
       }
 #endif
     }
@@ -289,7 +289,7 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
   } else {
 #ifdef G4VERBOSE
     if (verboseLevel>0){
-      G4cout << " This Process is not registered !! " << endl;
+      G4cout << " This Process is not registered !! " << G4endl;
     }
 #endif
   }
@@ -319,7 +319,7 @@ G4VProcess* G4ProcessTable::FindProcess(const G4String& processName,
   if (!isFound && verboseLevel>1){
     G4cout << " G4ProcessTable::FindProcess :" ;
     G4cout << " The Process[" << processName << "] is not found  ";
-    G4cout << " for " << processManager->GetParticleType()->GetParticleName() << endl;
+    G4cout << " for " << processManager->GetParticleType()->GetParticleName() << G4endl;
   }
 #endif
   
@@ -349,7 +349,7 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
 #ifdef G4VERBOSE
   if (!isFound && verboseLevel>0){
     G4cout << " G4ProcessTable::Find :" ;
-    G4cout << " The Process[" << processName << "] is not found  " << endl;
+    G4cout << " The Process[" << processName << "] is not found  " << G4endl;
   }
 #endif
   
@@ -378,7 +378,7 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
 #ifdef G4VERBOSE
   if (!isFound && verboseLevel>0){
     G4cout << " G4ProcessTable::Find :" ;
-    G4cout << " The Process[" << anElement->GetProcessName() << "] is not found  " << endl;
+    G4cout << " The Process[" << anElement->GetProcessName() << "] is not found  " << G4endl;
   }
 #endif
   
@@ -432,7 +432,7 @@ void G4ProcessTable::SetProcessActivation( const G4String& processName,
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The Process[" << processName << "] "<< endl;
+    G4cout << " The Process[" << processName << "] "<< G4endl;
   }
 #endif
 
@@ -449,7 +449,7 @@ void G4ProcessTable::SetProcessActivation( const G4String& processName,
       if (verboseLevel>1){
         G4cout << "  for " << manager->GetParticleType()->GetParticleName();
 	G4cout << "  Index = " << manager->GetProcessIndex(process); 
-        G4cout << endl;
+        G4cout << G4endl;
       }
 #endif
     }
@@ -465,7 +465,7 @@ void G4ProcessTable::SetProcessActivation(
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The Process[" << processName << "] "<< endl;
+    G4cout << " The Process[" << processName << "] "<< G4endl;
   }
 #endif
   
@@ -475,7 +475,7 @@ void G4ProcessTable::SetProcessActivation(
 #ifdef G4VERBOSE
     if (verboseLevel>1){
       G4cout << "  for " << processManager->GetParticleType()->GetParticleName();
-      G4cout << "  Index = " << processManager->GetProcessIndex(process) << endl;
+      G4cout << "  Index = " << processManager->GetProcessIndex(process) << G4endl;
     }
 #endif
   } 
@@ -489,7 +489,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType   processType,
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The ProcessType[" << processType << "] "<< endl;
+    G4cout << " The ProcessType[" << processType << "] "<< G4endl;
   }
 #endif
 
@@ -501,7 +501,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType   processType,
     G4VProcess* process = anElement->GetProcess();
 #ifdef G4VERBOSE
     if (verboseLevel>1){
-      G4cout << " The Process[" << process->GetProcessName()<< "] "<< endl;
+      G4cout << " The Process[" << process->GetProcessName()<< "] "<< G4endl;
     }
 #endif
     for (G4int idx = 0 ; idx < anElement->Length(); idx++) {
@@ -510,7 +510,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType   processType,
 #ifdef G4VERBOSE
       if (verboseLevel>1){
         G4cout << "  for " << manager->GetParticleType()->GetParticleName();
-	G4cout << "  Index = " << manager->GetProcessIndex(process) << endl;
+	G4cout << "  Index = " << manager->GetProcessIndex(process) << G4endl;
       }
 #endif
     }
@@ -526,7 +526,7 @@ void G4ProcessTable::SetProcessActivation(
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The ProcessType[" << processType << "] "<< endl;
+    G4cout << " The ProcessType[" << processType << "] "<< G4endl;
   }
 #endif
   
@@ -537,9 +537,9 @@ void G4ProcessTable::SetProcessActivation(
       processManager->SetProcessActivation(process, fActive);
 #ifdef G4VERBOSE
       if (verboseLevel>1){
-        G4cout << " The Process[" << process->GetProcessName()<< "] "<< endl;
+        G4cout << " The Process[" << process->GetProcessName()<< "] "<< G4endl;
 	G4cout << "  for " << processManager->GetParticleType()->GetParticleName();
-	G4cout << "  Index = " << idx << endl;
+	G4cout << "  Index = " << idx << G4endl;
       }
 #endif
     }
@@ -584,12 +584,12 @@ void G4ProcessTable::DumpInfo(G4VProcess* process,
     for (idx=0; idx<anElement->Length(); idx++){
       manager = anElement->GetProcessManager(idx);
       G4cout << " for " << manager->GetParticleType()->GetParticleName();
-      G4cout << endl;
+      G4cout << G4endl;
       if (verboseLevel >2) manager->DumpInfo();
     }
   } else {
     G4cout << " for " << manager->GetParticleType()->GetParticleName();
-    G4cout << endl;
+    G4cout << G4endl;
     if (verboseLevel >2) manager->DumpInfo();
   }
 }
diff --git a/source/processes/management/src/G4ProcessTableMessenger.cc b/source/processes/management/src/G4ProcessTableMessenger.cc
index 3d5339f2b5..032e544a06 100644
--- a/source/processes/management/src/G4ProcessTableMessenger.cc
+++ b/source/processes/management/src/G4ProcessTableMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ProcessTableMessenger.cc,v 1.3.6.1.2.1 1999/12/07 20:52:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ProcessTableMessenger.cc,v 1.3.6.1.2.1.2.5 1999/12/14 09:16:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -36,15 +36,11 @@
 #include "G4ParticleTable.hh"
 
 #include "G4ios.hh"                 
-#include <iomanip.h>               
+#include "g4std/iomanip"               
 #include "g4rw/ctoken.h"               
 #include "g4rw/rstream.h"               
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 /////////////////////////////////////////
 G4int G4ProcessTableMessenger::NumberOfProcessType = 10;
@@ -159,7 +155,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
     } else {
       type  = GetProcessType(newValue);
       if (type <0) {
-	G4cout << " illegal type !!! " << endl;
+	G4cout << " illegal type !!! " << G4endl;
       } else {
 	currentProcessTypeName = newValue;
       }
@@ -170,13 +166,13 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
       tmpVector = theProcessTable->FindProcesses(name);
       if ( (type <0) || ( ((*tmpVector)(0)->GetProcessType()) == type) ) {
         if ( counter%4 != 0) G4cout << ",";
-	G4cout << setw(19) << name;
+	G4cout << G4std::setw(19) << name;
 	if ((counter++)%4 == 3) {
-          G4cout << endl;
+          G4cout << G4endl;
         }
       }
     }
-    G4cout << endl;
+    G4cout << G4endl;
     delete tmpVector;
     //Commnad  /process/list
 
@@ -201,7 +197,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
 	isNameFound = true;
       } else {
 	// no processes with specifed name
-	G4cout << " illegal process (or type) name " << endl;
+	G4cout << " illegal process (or type) name " << G4endl;
 	currentProcessName = "";
 	return;
       }
@@ -224,7 +220,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
 
     if ( !isParticleFound ) {
       // no particle with specifed name
-      G4cout << " illegal particle name " << endl;
+      G4cout << " illegal particle name " << G4endl;
       currentParticleName = "";
       return;
     }
@@ -280,7 +276,7 @@ G4String G4ProcessTableMessenger::GetCurrentValue(G4UIcommand * command)
   G4String returnValue('\0');
 
   char line[255];
-  ostrstream os(line,255);
+  G4std::ostrstream os(line,255);
   G4UIparameter * param; 
 
   G4int idx; 
diff --git a/source/processes/management/src/G4VContinuousDiscreteProcess.cc b/source/processes/management/src/G4VContinuousDiscreteProcess.cc
index 9fab974328..fb23309949 100644
--- a/source/processes/management/src/G4VContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4VContinuousDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VContinuousDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VContinuousProcess.cc b/source/processes/management/src/G4VContinuousProcess.cc
index e39261b149..07503c9df6 100644
--- a/source/processes/management/src/G4VContinuousProcess.cc
+++ b/source/processes/management/src/G4VContinuousProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VContinuousProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VDiscreteProcess.cc b/source/processes/management/src/G4VDiscreteProcess.cc
index ec262f1985..40cf5c20e3 100644
--- a/source/processes/management/src/G4VDiscreteProcess.cc
+++ b/source/processes/management/src/G4VDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VProcess.cc b/source/processes/management/src/G4VProcess.cc
index 8cf7e20d3d..9dafa449ed 100644
--- a/source/processes/management/src/G4VProcess.cc
+++ b/source/processes/management/src/G4VProcess.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VProcess.cc,v 1.3.8.1 1999/12/07 20:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VProcess.cc,v 1.3.8.1.2.1 1999/12/08 17:35:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -62,10 +62,10 @@ void G4VProcess::SubtractNumberOfInteractionLengthLeft(
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cerr << "G4VProcess::SubtractNumberOfInteractionLengthLeft()";
-      G4cerr << " [" << theProcessName << "]" <<endl;
+      G4cerr << " [" << theProcessName << "]" <<G4endl;
       G4cerr << " currentInteractionLength = " << currentInteractionLength/cm << " [cm]";
       G4cerr << " previousStepSize = " << previousStepSize/cm << " [cm]";
-      G4cerr << endl;
+      G4cerr << G4endl;
     }
 #endif
     G4Exception("G4VProcess::SubtractNumberOfInteractionLengthLeft()  negative currentInteractionLength" );
@@ -78,7 +78,7 @@ void G4VProcess::StartTracking()
   theNumberOfInteractionLengthLeft = -1.0;
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4VProcess::StartTracking() [" << theProcessName << "]" <<endl;
+    G4cout << "G4VProcess::StartTracking() [" << theProcessName << "]" <<G4endl;
   }
 #endif
 }
@@ -87,7 +87,7 @@ void G4VProcess::EndTracking()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4VProcess::EndTracking() [" << theProcessName << "]" <<endl;
+    G4cout << "G4VProcess::EndTracking() [" << theProcessName << "]" <<G4endl;
   }
 #endif
   theNumberOfInteractionLengthLeft = -1.0;
@@ -153,7 +153,7 @@ G4int G4VProcess::operator!=(const G4VProcess &right) const
 void G4VProcess::DumpInfo() const
 {
   G4cout << "Process Name " << theProcessName ;   
-  G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]"<< endl;
+  G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]"<< G4endl;
 }
 
 
diff --git a/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc b/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
index 90bf494afe..2465c1e1c5 100644
--- a/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestContinuousDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestContinuousProcess.cc b/source/processes/management/src/G4VRestContinuousProcess.cc
index 9be2197c76..f36bff5c26 100644
--- a/source/processes/management/src/G4VRestContinuousProcess.cc
+++ b/source/processes/management/src/G4VRestContinuousProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestContinuousProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestDiscreteProcess.cc b/source/processes/management/src/G4VRestDiscreteProcess.cc
index 53d1d72a2e..893b9e25c8 100644
--- a/source/processes/management/src/G4VRestDiscreteProcess.cc
+++ b/source/processes/management/src/G4VRestDiscreteProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestProcess.cc b/source/processes/management/src/G4VRestProcess.cc
index 4e98e54251..73b200cb39 100644
--- a/source/processes/management/src/G4VRestProcess.cc
+++ b/source/processes/management/src/G4VRestProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/optical/include/G4OpAbsorption.hh b/source/processes/optical/include/G4OpAbsorption.hh
index 06adabf4f9..feba6710fd 100644
--- a/source/processes/optical/include/G4OpAbsorption.hh
+++ b/source/processes/optical/include/G4OpAbsorption.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpAbsorption.hh,v 1.4.4.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Definition
diff --git a/source/processes/optical/include/G4OpBoundaryProcess.hh b/source/processes/optical/include/G4OpBoundaryProcess.hh
index 319e035c9c..2c37d6120e 100644
--- a/source/processes/optical/include/G4OpBoundaryProcess.hh
+++ b/source/processes/optical/include/G4OpBoundaryProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpBoundaryProcess.hh,v 1.4.4.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/include/G4OpRayleigh.hh b/source/processes/optical/include/G4OpRayleigh.hh
index b659b468b1..18fb9d799b 100644
--- a/source/processes/optical/include/G4OpRayleigh.hh
+++ b/source/processes/optical/include/G4OpRayleigh.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpRayleigh.hh,v 1.3.4.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/src/G4OpAbsorption.cc b/source/processes/optical/src/G4OpAbsorption.cc
index 608dc16fed..82fff679fa 100644
--- a/source/processes/optical/src/G4OpAbsorption.cc
+++ b/source/processes/optical/src/G4OpAbsorption.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpAbsorption.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpAbsorption.cc,v 1.1.10.1.2.1 1999/12/08 17:35:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Implementation
@@ -51,7 +51,7 @@ G4OpAbsorption::G4OpAbsorption(const G4String& processName)
               : G4VDiscreteProcess(processName)
 {
         if (verboseLevel>0) {
-           G4cout << GetProcessName() << " is created " << endl;
+           G4cout << GetProcessName() << " is created " << G4endl;
         }
 }
 
@@ -80,7 +80,7 @@ G4OpAbsorption::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
         aParticleChange.SetStatusChange(fStopAndKill);
 
         if (verboseLevel>0) {
-	   G4cout << "\n** Photon Absorbed! **" << endl;
+	   G4cout << "\n** Photon Absorbed! **" << G4endl;
         }
         return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
 }
@@ -113,11 +113,11 @@ G4double G4OpAbsorption::GetMeanFreePath(const G4Track& aTrack,
                                          GetProperty (thePhotonMomentum);
            }
            else {
-             G4cout << "No Absorbtion length specified" << endl;
+             G4cout << "No Absorbtion length specified" << G4endl;
            }
         } 
         else {
-           G4cout << "No Absorbtion length specified" << endl;
+           G4cout << "No Absorbtion length specified" << G4endl;
         }	
 
         return AttenuationLength;
diff --git a/source/processes/optical/src/G4OpBoundaryProcess.cc b/source/processes/optical/src/G4OpBoundaryProcess.cc
index de6b99469c..f58c7df7d7 100644
--- a/source/processes/optical/src/G4OpBoundaryProcess.cc
+++ b/source/processes/optical/src/G4OpBoundaryProcess.cc
@@ -52,7 +52,7 @@ G4OpBoundaryProcess::G4OpBoundaryProcess(const G4String& processName)
              : G4VDiscreteProcess(processName)
 {
         if ( verboseLevel > 0) {
-           G4cout << GetProcessName() << " is created " << endl;
+           G4cout << GetProcessName() << " is created " << G4endl;
         }
 
 	theStatus = Undefined;
@@ -106,9 +106,9 @@ G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 	OldPolarization   = aParticle->GetPolarization();
 
         if ( verboseLevel > 0 ) {
-		G4cout << " Photon at Boundary! " << endl;
-		G4cout << " Old Momentum Direction: " << OldMomentum     << endl;
-		G4cout << " Old Polarization:       " << OldPolarization << endl;
+		G4cout << " Photon at Boundary! " << G4endl;
+		G4cout << " Old Momentum Direction: " << OldMomentum     << G4endl;
+		G4cout << " Old Polarization:       " << OldPolarization << G4endl;
         }
 
 	G4MaterialPropertiesTable* aMaterialPropertiesTable;
@@ -232,7 +232,7 @@ G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 	else {
 	  G4cerr << " G4OpBoundaryProcess/PostStepDoIt(): "
 	       << " The Navigator reports that it returned an invalid normal" 
-	       << endl;
+	       << G4endl;
 	}
 
 	theGlobalNormal = theNavigator->GetLocalToGlobalTransform().
@@ -264,7 +264,7 @@ G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 	}
 	else {
 
-	  G4cout << " Error: G4BoundaryProcess: illegal boundary type " << endl;
+	  G4cout << " Error: G4BoundaryProcess: illegal boundary type " << G4endl;
 	  return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
 
 	}
@@ -273,28 +273,28 @@ G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
         NewPolarization = NewPolarization.unit();
 
         if ( verboseLevel > 0) {
-		G4cout << " New Momentum Direction: " << NewMomentum     << endl;
-		G4cout << " New Polarization:       " << NewPolarization << endl;
+		G4cout << " New Momentum Direction: " << NewMomentum     << G4endl;
+		G4cout << " New Polarization:       " << NewPolarization << G4endl;
 		if ( theStatus == Undefined )
-			G4cout << " *** Undefined *** " << endl;
+			G4cout << " *** Undefined *** " << G4endl;
 		if ( theStatus == FresnelRefraction )
-			G4cout << " *** FresnelRefraction *** " << endl;
+			G4cout << " *** FresnelRefraction *** " << G4endl;
 		if ( theStatus == FresnelReflection )
-			G4cout << " *** FresnelReflection *** " << endl;
+			G4cout << " *** FresnelReflection *** " << G4endl;
 		if ( theStatus == TotalInternalReflection )
-			G4cout << " *** TotalInternalReflection *** " << endl;
+			G4cout << " *** TotalInternalReflection *** " << G4endl;
 		if ( theStatus == LambertianReflection )
-			G4cout << " *** LambertianReflection *** " << endl;
+			G4cout << " *** LambertianReflection *** " << G4endl;
 		if ( theStatus == LobeReflection ) 
-			G4cout << " *** LobeReflection *** " << endl;
+			G4cout << " *** LobeReflection *** " << G4endl;
 		if ( theStatus == SpikeReflection )
-			G4cout << " *** SpikeReflection *** " << endl;
+			G4cout << " *** SpikeReflection *** " << G4endl;
 		if ( theStatus == BackScattering )
-			G4cout << " *** BackScattering *** " << endl;
+			G4cout << " *** BackScattering *** " << G4endl;
 		if ( theStatus == Absorption )
-			G4cout << " *** Absorption *** " << endl;
+			G4cout << " *** Absorption *** " << G4endl;
 		if ( theStatus == Detection )
-			G4cout << " *** Detection *** " << endl;
+			G4cout << " *** Detection *** " << G4endl;
         }
 
 	aParticleChange.SetMomentumChange(NewMomentum);
@@ -322,7 +322,7 @@ G4OpBoundaryProcess::GetFacetNormal(const G4ThreeVector& Momentum,
 	   G4double sigma_alpha = 0.0;
 	   if (OpticalSurface) sigma_alpha = OpticalSurface->GetSigmaAlpha();
 
-	   G4double f_max = min(1.0,4.*sigma_alpha);
+	   G4double f_max = G4std::min(1.0,4.*sigma_alpha);
 
 	   do {
 	      do {
diff --git a/source/processes/optical/src/G4OpRayleigh.cc b/source/processes/optical/src/G4OpRayleigh.cc
index 8c5ba1bdce..7689869d48 100644
--- a/source/processes/optical/src/G4OpRayleigh.cc
+++ b/source/processes/optical/src/G4OpRayleigh.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpRayleigh.cc,v 1.1.10.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpRayleigh.cc,v 1.1.10.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ G4OpRayleigh::G4OpRayleigh(const G4String& processName)
         thePhysicsTable = NULL;
 
         if (verboseLevel>0) {
-           G4cout << GetProcessName() << " is created " << endl;
+           G4cout << GetProcessName() << " is created " << G4endl;
         }
 
         BuildThePhysicsTable();
@@ -89,11 +89,11 @@ G4OpRayleigh::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
         const G4Material* aMaterial = aTrack.GetMaterial();
 
         if (verboseLevel>0) {
-		G4cout << "Scattering Photon!" << endl;
+		G4cout << "Scattering Photon!" << G4endl;
 		G4cout << "Old Momentum Direction: "
-	     	     << aParticle->GetMomentumDirection() << endl;
+	     	     << aParticle->GetMomentumDirection() << G4endl;
 		G4cout << "Old Polarization: "
-		     << aParticle->GetPolarization() << endl;
+		     << aParticle->GetPolarization() << G4endl;
 	}
 
 	// find polar angle w.r.t. old polarization vector
@@ -152,13 +152,13 @@ G4OpRayleigh::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 
         if (verboseLevel>0) {
 		G4cout << "New Polarization: " 
-		     << NewPolarization << endl;
+		     << NewPolarization << G4endl;
 		G4cout << "Polarization Change: "
-		     << *(aParticleChange.GetPolarizationChange()) << endl;  
+		     << *(aParticleChange.GetPolarizationChange()) << G4endl;  
 		G4cout << "New Momentum Direction: " 
-		     << NewMomentumDirection << endl;
+		     << NewMomentumDirection << G4endl;
 		G4cout << "Momentum Change: "
-		     << *(aParticleChange.GetMomentumChange()) << endl; 
+		     << *(aParticleChange.GetMomentumChange()) << G4endl; 
 	}
 
         return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
@@ -285,7 +285,7 @@ G4OpRayleigh::RayleighAttenuationLengthGenerator(G4MaterialPropertiesTable *aMPT
                 Dist = 1.0 / (c1*c2*c3*c4);
 
 	        if (verboseLevel>0) {
-	                G4cout << Dist << " mm" << endl;
+	                G4cout << Dist << " mm" << G4endl;
 		}
                 RayleighScatteringLengths->
 			InsertValues(Rindex->GetPhotonMomentum(), Dist);
diff --git a/source/processes/parameterisation/include/G4FastSimulationManager.hh b/source/processes/parameterisation/include/G4FastSimulationManager.hh
index 672e688c19..c60fd42f17 100644
--- a/source/processes/parameterisation/include/G4FastSimulationManager.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastSimulationManager.hh,v 1.3.2.1.2.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
index d330ac5e17..6437abc302 100644
--- a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastSimulationManagerProcess.hh,v 1.4.2.1.2.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
index a71238bf2e..00c8e3637f 100644
--- a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastSimulationMessenger.hh,v 1.2.8.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/processes/parameterisation/include/G4FastStep.hh b/source/processes/parameterisation/include/G4FastStep.hh
index fa1c0001fe..3737592970 100644
--- a/source/processes/parameterisation/include/G4FastStep.hh
+++ b/source/processes/parameterisation/include/G4FastStep.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastStep.hh,v 1.4.4.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastStep.icc b/source/processes/parameterisation/include/G4FastStep.icc
index 9d9d3357db..f8cc88e81b 100644
--- a/source/processes/parameterisation/include/G4FastStep.icc
+++ b/source/processes/parameterisation/include/G4FastStep.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastStep.icc,v 1.1.10.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $id: G4ParticleChange.icc,v 1.6 1998/04/14 02:25:54 kurasige Exp $
 
diff --git a/source/processes/parameterisation/include/G4FastTrack.hh b/source/processes/parameterisation/include/G4FastTrack.hh
index d71b869a73..985344c158 100644
--- a/source/processes/parameterisation/include/G4FastTrack.hh
+++ b/source/processes/parameterisation/include/G4FastTrack.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastTrack.hh,v 1.3.4.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
index 99d475fe7c..1f6364aeb6 100644
--- a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
+++ b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FlavoredParallelWorld.hh,v 1.3.8.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
index 54c5831063..4dc697f15b 100644
--- a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
+++ b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GlobalFastSimulationManager.hh,v 1.4.2.1.2.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4VFastSimulationModel.hh b/source/processes/parameterisation/include/G4VFastSimulationModel.hh
index cb19b75338..859a3aadfe 100644
--- a/source/processes/parameterisation/include/G4VFastSimulationModel.hh
+++ b/source/processes/parameterisation/include/G4VFastSimulationModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFastSimulationModel.hh,v 1.2.4.1 1999/12/07 20:52:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4FastSimulationManager.cc b/source/processes/parameterisation/src/G4FastSimulationManager.cc
index 2cd00fcefd..f609191106 100644
--- a/source/processes/parameterisation/src/G4FastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FastSimulationManager.cc,v 1.2.8.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FastSimulationManager.cc,v 1.2.8.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //$Id:
 //---------------------------------------------------------------
@@ -357,7 +357,7 @@ G4FastSimulationManager::ListModels(const G4String& aName) const
 	  G4cout << theParticleTable->
 	    GetParticle(iParticle)->GetParticleName();
 	}
-      G4cout <<endl;
+      G4cout <<G4endl;
     }
   
   // Inactive Models
@@ -382,7 +382,7 @@ G4FastSimulationManager::ListModels(const G4String& aName) const
 	  G4cout << theParticleTable->
 	    GetParticle(iParticle)->GetParticleName();
 	}
-      G4cout <<endl;
+      G4cout <<G4endl;
     }
 }
 
@@ -399,7 +399,7 @@ G4FastSimulationManager::ListModels(const G4ParticleDefinition* aPD) const
       ListTitle();
       G4cout << ", Model " 
 	     << ModelList(iModel)->GetName() 
-	     << "." << endl;
+	     << "." << G4endl;
     }
   // inactive Models
   for (iModel=0; iModel<fInactivatedModels.length(); iModel++)
@@ -408,12 +408,12 @@ G4FastSimulationManager::ListModels(const G4ParticleDefinition* aPD) const
       ListTitle();
       G4cout << ", Model " 
 	     << fInactivatedModels(iModel)->GetName() 
-	     << " (inactivated)." << endl;
+	     << " (inactivated)." << G4endl;
     }
   
   if(!unique)
     G4cout << "\a\n >>>>>>Warning: two or more Models for the same "
 	   << "particle type attached to the same envelope!"
-	   << endl;
+	   << G4endl;
   unique=false;
 }
diff --git a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
index 7f0792a5a5..c983a74568 100644
--- a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FastSimulationManagerProcess.cc,v 1.3.8.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FastSimulationManagerProcess.cc,v 1.3.8.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -39,7 +39,7 @@ G4FastSimulationManagerProcess(const G4String& processName,
 
   fGhostTouchable       = new G4TouchableHistory();
   if (verboseLevel>0) {
-    G4cout << GetProcessName() << " is created " << endl;
+    G4cout << GetProcessName() << " is created " << G4endl;
   }
   fGhostFieldPropagator = new G4PropagatorInField(&fGhostNavigator,
 						   G4TransportationManager::
@@ -252,7 +252,7 @@ G4VParticleChange* G4FastSimulationManagerProcess::PostStepDoIt(
     }
   else
     {
-      if (fOutOfGhostWorld)   G4cout << " ????????????? Problem of logic in GHOST param !!! " << endl;
+      if (fOutOfGhostWorld)   G4cout << " ????????????? Problem of logic in GHOST param !!! " << G4endl;
       // No FastSimulationManager has asked for trigger. That means here:
       //       - the PostStep is "Conditionally" forced because
       //       - the Step has been limited by the ALong of G4FSMP because
@@ -296,7 +296,7 @@ G4VParticleChange* G4FastSimulationManagerProcess::PostStepDoIt(
 	      fUpdateGhostTouchable = true; // What should we do here ?!?
 	                                    // false => lot a microscopic steps
 	                                    // is true rasonnably safe ?
-	      G4cout << GetProcessName() << " : WARNING: Can not correct for\ndifference between tracking and ghost mag-field computations." << endl;
+	      G4cout << GetProcessName() << " : WARNING: Can not correct for\ndifference between tracking and ghost mag-field computations." << G4endl;
 	    }
 	  else
 	    {
@@ -510,22 +510,22 @@ void G4FastSimulationManagerProcess::Verbose() const
   switch(fFastSimulationManager->GetTriggerStatus())
     {
     case NoModel:
-      G4cout << "NoModel" << endl;
+      G4cout << "NoModel" << G4endl;
       break;
     case OnBoundaryButLeaving:
-      G4cout << "OnBoundaryButLeaving" << endl;
+      G4cout << "OnBoundaryButLeaving" << G4endl;
       break;
     case OneModelTrigger:
-      G4cout << "OneModelTrigger" << endl;
+      G4cout << "OneModelTrigger" << G4endl;
       break;
     case NoModelTrigger:
-      G4cout << "NoModelTrigger" << endl;
+      G4cout << "NoModelTrigger" << G4endl;
       break;
     case Undefined:
-      G4cout << "Undefined" << endl;
+      G4cout << "Undefined" << G4endl;
       break;
     default:
-      G4cout << " Bizarre..." << endl;
+      G4cout << " Bizarre..." << G4endl;
       break;
     }*/
 }
diff --git a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
index 17be703745..ed7e3adfe0 100644
--- a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastSimulationMessenger.cc,v 1.2.8.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4FastSimulationMessenger.hh"
diff --git a/source/processes/parameterisation/src/G4FastStep.cc b/source/processes/parameterisation/src/G4FastStep.cc
index 4845ee4cde..06a577f55e 100644
--- a/source/processes/parameterisation/src/G4FastStep.cc
+++ b/source/processes/parameterisation/src/G4FastStep.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FastStep.cc,v 1.5.6.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FastStep.cc,v 1.5.6.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //$Id:
 //---------------------------------------------------------------
@@ -239,14 +239,14 @@ void G4FastStep::Initialize(const G4Track&) {
 G4FastStep::G4FastStep():G4VParticleChange()
 {
   if (verboseLevel>2) {
-    G4cerr << "G4FastStep::G4FastStep() " << endl;
+    G4cerr << "G4FastStep::G4FastStep() " << G4endl;
   }
 }
 
 G4FastStep::~G4FastStep() 
 {
   if (verboseLevel>2) {
-    G4cerr << "G4FastStep::~G4FastStep() " << endl;
+    G4cerr << "G4FastStep::~G4FastStep() " << G4endl;
   }
 }
 
@@ -377,41 +377,41 @@ void G4FastStep::DumpInfo() const
 
   G4cout.precision(3);
   G4cout << "        Position - x (mm)   : " 
-       << setw(20) << thePositionChange.x()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.x()/mm
+       << G4endl; 
   G4cout << "        Position - y (mm)   : " 
-       << setw(20) << thePositionChange.y()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.y()/mm
+       << G4endl; 
   G4cout << "        Position - z (mm)   : " 
-       << setw(20) << thePositionChange.z()/mm
-       << endl;
+       << G4std::setw(20) << thePositionChange.z()/mm
+       << G4endl;
   G4cout << "        Time (ns)           : " 
-       << setw(20) << theTimeChange/ns
-       << endl;
+       << G4std::setw(20) << theTimeChange/ns
+       << G4endl;
   G4cout << "        Proper Time (ns)    : " 
-       << setw(20) << theProperTimeChange/ns
-       << endl;
+       << G4std::setw(20) << theProperTimeChange/ns
+       << G4endl;
   G4cout << "        Momentum Direct - x : " 
-       << setw(20) << theMomentumChange.x()
-       << endl;
+       << G4std::setw(20) << theMomentumChange.x()
+       << G4endl;
   G4cout << "        Momentum Direct - y : " 
-       << setw(20) << theMomentumChange.y()
-       << endl;
+       << G4std::setw(20) << theMomentumChange.y()
+       << G4endl;
   G4cout << "        Momentum Direct - z : " 
-       << setw(20) << theMomentumChange.z()
-       << endl;
+       << G4std::setw(20) << theMomentumChange.z()
+       << G4endl;
   G4cout << "        Kinetic Energy (MeV): " 
-       << setw(20) << theEnergyChange/MeV
-       << endl;
+       << G4std::setw(20) << theEnergyChange/MeV
+       << G4endl;
   G4cout << "        Polarization - x    : " 
-       << setw(20) << thePolarizationChange.x()
-       << endl;
+       << G4std::setw(20) << thePolarizationChange.x()
+       << G4endl;
   G4cout << "        Polarization - y    : " 
-       << setw(20) << thePolarizationChange.y()
-       << endl;
+       << G4std::setw(20) << thePolarizationChange.y()
+       << G4endl;
   G4cout << "        Polarization - z    : " 
-       << setw(20) <<  thePolarizationChange.z()
-       << endl;
+       << G4std::setw(20) <<  thePolarizationChange.z()
+       << G4endl;
 }
 
 G4bool G4FastStep::CheckIt(const G4Track& aTrack)
@@ -442,8 +442,8 @@ G4bool G4FastStep::CheckIt(const G4Track& aTrack)
   accuracy = ( theEnergyChange - aTrack.GetKineticEnergy())/MeV;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4FastStep::CheckIt    : ";
-    G4cout << "the energy becomes larger than the initial value !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<endl;
+    G4cout << "the energy becomes larger than the initial value !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<G4endl;
     itsOK = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -454,7 +454,7 @@ G4bool G4FastStep::CheckIt(const G4Track& aTrack)
     if (accuracy > accuracyForWarning) {
       G4cout << "  G4FastStep::CheckIt    : ";
       G4cout << "the Momentum Change is not unit vector !!"
-	     << "  Difference:  " << accuracy << endl;
+	     << "  Difference:  " << accuracy << G4endl;
       itsOK = itsOKforMomentum = false;
       if (accuracy > accuracyForException) exitWithError = true;
     }
@@ -464,7 +464,7 @@ G4bool G4FastStep::CheckIt(const G4Track& aTrack)
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4FastStep::CheckIt    : ";
     G4cout << "the global time goes back  !!"
-	   << " Difference:  " << accuracy << "[ns] " <<endl;
+	   << " Difference:  " << accuracy << "[ns] " <<G4endl;
     itsOK = false;
   }
   
@@ -472,13 +472,13 @@ G4bool G4FastStep::CheckIt(const G4Track& aTrack)
   if (accuracy) {
     G4cout << "  G4FastStep::CheckIt    : ";
     G4cout << "the proper time goes back  !!"
-	   << " Difference:  " <<  accuracy  << "[ns] " <<endl;
+	   << " Difference:  " <<  accuracy  << "[ns] " <<G4endl;
     itsOK = false;
   }
   
   if (!itsOK) { 
-    G4cout << " G4FastStep::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4FastStep::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
   
diff --git a/source/processes/parameterisation/src/G4FastTrack.cc b/source/processes/parameterisation/src/G4FastTrack.cc
index 2c53aaf13d..5ba46861a7 100644
--- a/source/processes/parameterisation/src/G4FastTrack.cc
+++ b/source/processes/parameterisation/src/G4FastTrack.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FastTrack.cc,v 1.2.8.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FastTrack.cc,v 1.2.8.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //$Id:
 //---------------------------------------------------------------
@@ -130,7 +130,7 @@ G4FastTrack::FRecordsAffineTransformation(const G4Navigator* theNavigator)
   if ( !Done )
     {
       G4cout << "\n\nERROR !!! can't find Transform for " <<
-	fEnvelopePhysicalVolume->GetName() << "\n\n" << endl;
+	fEnvelopePhysicalVolume->GetName() << "\n\n" << G4endl;
     }
   else
     {
diff --git a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
index 3232df2109..971c186d64 100644
--- a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GlobalFastSimulationManager.cc,v 1.4.8.1 1999/12/07 20:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GlobalFastSimulationManager.cc,v 1.4.8.1.2.1 1999/12/08 17:35:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
@@ -140,7 +140,7 @@ G4GlobalFastSimulationManager::ActivateFastSimulationModel(const G4String& aName
     G4cout << "Model " << aName << " activated.";
   else
     G4cout << "Model " << aName << " not found.";
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void 
@@ -153,7 +153,7 @@ G4GlobalFastSimulationManager::InActivateFastSimulationModel(const G4String& aNa
     G4cout << "Model " << aName << " inactivated.";
   else
     G4cout << "Model " << aName << " not found.";
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void 
@@ -174,7 +174,7 @@ G4GlobalFastSimulationManager::ListEnvelopes(const G4String& aName,
 	  G4cout << "Current Envelopes for Fast Simulation:\n";
 	G4cout << "   "; 
 	ManagedManagers(ifsm)->ListTitle();
-	G4cout << endl;
+	G4cout << G4endl;
       }
       else ManagedManagers(ifsm)->ListModels();
     }
diff --git a/source/processes/parameterisation/src/G4VFastSimulationModel.cc b/source/processes/parameterisation/src/G4VFastSimulationModel.cc
index 23338e7c73..dbe1b149d0 100644
--- a/source/processes/parameterisation/src/G4VFastSimulationModel.cc
+++ b/source/processes/parameterisation/src/G4VFastSimulationModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFastSimulationModel.cc,v 1.2.8.1 1999/12/07 20:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id:
 //---------------------------------------------------------------
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
index cbb324c7a2..576d563e43 100644
--- a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
+++ b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuNuclearInteraction.hh,v 1.1.10.1 1999/12/07 20:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
index 2f4062d7ea..3f35f96885 100644
--- a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
+++ b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuNuclearInteraction.icc,v 1.1.10.1 1999/12/07 20:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc b/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
index 79916307eb..7b3c68cc75 100644
--- a/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
+++ b/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuNuclearInteraction.cc,v 1.5.8.1 1999/12/07 20:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4MuNuclearInteraction.cc,v 1.5.8.1.2.1 1999/12/08 17:35:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -522,7 +522,7 @@ G4Element* G4MuNuclearInteraction::SelectRandomAtom(G4Material* aMaterial) const
   for ( G4int i=0; i < NumberOfElements; i++ )
     if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << endl;
+       << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
 }
 void G4MuNuclearInteraction::PrintInfoDefinition()
@@ -530,12 +530,12 @@ void G4MuNuclearInteraction::PrintInfoDefinition()
   G4String comments = "cross sections from R. Kokoulin \n ";
            comments += "         Good description up to 1000 TeV.";
 
-  G4cout << endl << GetProcessName() << ":  " << comments
+  G4cout << G4endl << GetProcessName() << ":  " << comments
          << "\n    PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
                                                      "Energy")
          << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
          << " in " << TotBin << " bins. \n";
 
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
diff --git a/source/processes/transportation/include/G4Transportation.hh b/source/processes/transportation/include/G4Transportation.hh
index 3f7d0f7c88..c6131faf89 100644
--- a/source/processes/transportation/include/G4Transportation.hh
+++ b/source/processes/transportation/include/G4Transportation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Transportation.hh,v 1.1.10.1 1999/12/07 20:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/transportation/include/G4Transportation.icc b/source/processes/transportation/include/G4Transportation.icc
index ee853a7a31..ea3d7cdec1 100644
--- a/source/processes/transportation/include/G4Transportation.icc
+++ b/source/processes/transportation/include/G4Transportation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Transportation.icc,v 1.1.10.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 // 
diff --git a/source/processes/transportation/include/G4UserSpecialCuts.hh b/source/processes/transportation/include/G4UserSpecialCuts.hh
index 658d68b85d..4ebdc34a33 100644
--- a/source/processes/transportation/include/G4UserSpecialCuts.hh
+++ b/source/processes/transportation/include/G4UserSpecialCuts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserSpecialCuts.hh,v 1.2.2.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // ------------------------------------------------------------
 //                  15 April 1998  M.Maire
 // ------------------------------------------------------------
diff --git a/source/processes/transportation/src/G4Transportation.cc b/source/processes/transportation/src/G4Transportation.cc
index cecfd6a68b..495dce55e0 100644
--- a/source/processes/transportation/src/G4Transportation.cc
+++ b/source/processes/transportation/src/G4Transportation.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Transportation.cc,v 1.7.2.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Transportation.cc,v 1.7.2.1.2.1 1999/12/08 17:35:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -277,14 +277,14 @@ G4double G4Transportation::AlongStepGetPhysicalInteractionLength(
 
 #ifdef G4DEBUG_TRANSPORT      
       cout.precision(5);
-      cout << "***Transportation::AlongStepGPIL ** " << endl ;
-      cout << "  Called Navigator->ComputeSafety " << endl
-	   << "    with position = " << fTransportEndPosition << endl
-	   << "    and it returned safety= " << endSafety << endl; 
+      cout << "***Transportation::AlongStepGPIL ** " << G4endl ;
+      cout << "  Called Navigator->ComputeSafety " << G4endl
+	   << "    with position = " << fTransportEndPosition << G4endl
+	   << "    and it returned safety= " << endSafety << G4endl; 
       cout << "  I add the endpoint distance " << endpointDistance 
 	   << "   to it " 
 	   << "   to obtain a pseudo-safety= " << currentSafety 
-	   << "   which I return."  << endl; 
+	   << "   which I return."  << G4endl; 
 #endif
   }				    
 
@@ -430,17 +430,17 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
 			                        true);
        if( fCurrentTouchable->GetVolume() != track.GetVolume() ){
           // 
-          G4cerr << " ERROR: A relocation within safety has caused a volume change! " << endl ; 
+          G4cerr << " ERROR: A relocation within safety has caused a volume change! " << G4endl ; 
           G4cerr << "   The old volume is called " 
-	         << track.GetVolume()->GetName() << endl; 
+	         << track.GetVolume()->GetName() << G4endl; 
           G4cerr << "   The new volume is called ";
           if ( fCurrentTouchable->GetVolume() != 0 )
-	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << endl; 
+	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl; 
           else
-	     G4cerr << "Out of World" << endl; 
+	     G4cerr << "Out of World" << G4endl; 
 
           G4cerr.precision(7);
-          G4cerr << "   The position is " << track.GetPosition() <<  endl;
+          G4cerr << "   The position is " << track.GetPosition() <<  G4endl;
 
           // Let us relocate again, for debuging
           fLinearNavigator-> LocateGlobalPointAndUpdateTouchable( 
@@ -450,9 +450,9 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
 			                        true);
           G4cerr << "   The newer volume is called " ;
           if ( fCurrentTouchable->GetVolume() != 0 )
-	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << endl; 
+	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl; 
           else
-	     G4cerr << "Out of World" << endl; 
+	     G4cerr << "Out of World" << G4endl; 
        }
 
        assert( fCurrentTouchable->GetVolume()->GetName() == 
diff --git a/source/processes/transportation/src/G4UserSpecialCuts.cc b/source/processes/transportation/src/G4UserSpecialCuts.cc
index 74a5bb25c0..9ef9e2ff0b 100644
--- a/source/processes/transportation/src/G4UserSpecialCuts.cc
+++ b/source/processes/transportation/src/G4UserSpecialCuts.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserSpecialCuts.cc,v 1.2.2.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserSpecialCuts.cc,v 1.2.2.1.2.1 1999/12/08 17:35:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // --------------------------------------------------------------
 // History
@@ -27,7 +27,7 @@ G4UserSpecialCuts::G4UserSpecialCuts(const G4String& aName)
   : G4VProcess(aName)
 {
    if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< endl;
+     G4cout << GetProcessName() << " is created "<< G4endl;
    }
 }
 
diff --git a/source/readout/include/G4DCtable.hh b/source/readout/include/G4DCtable.hh
index de6cd4599a..cf30ef58ae 100644
--- a/source/readout/include/G4DCtable.hh
+++ b/source/readout/include/G4DCtable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DCtable.hh,v 1.2.2.1.2.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4DCtable_H
diff --git a/source/readout/include/G4DMmessenger.hh b/source/readout/include/G4DMmessenger.hh
index dc333dc75e..7fee53d3e1 100644
--- a/source/readout/include/G4DMmessenger.hh
+++ b/source/readout/include/G4DMmessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMmessenger.hh,v 1.2.4.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4DMmessenger_h
diff --git a/source/readout/include/G4DigiManager.hh b/source/readout/include/G4DigiManager.hh
index 539a53ef7c..5b7db0f591 100644
--- a/source/readout/include/G4DigiManager.hh
+++ b/source/readout/include/G4DigiManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DigiManager.hh,v 1.2.2.1.2.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4DigiManager_h
diff --git a/source/readout/include/G4VDigitizerModule.hh b/source/readout/include/G4VDigitizerModule.hh
index 5662beac1a..6708cc1561 100644
--- a/source/readout/include/G4VDigitizerModule.hh
+++ b/source/readout/include/G4VDigitizerModule.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigitizerModule.hh,v 1.2.2.1.2.1 1999/12/07 20:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VDigitizerModule_H
diff --git a/source/readout/src/G4DCtable.cc b/source/readout/src/G4DCtable.cc
index 5acf3b10db..a9382a7ef6 100644
--- a/source/readout/src/G4DCtable.cc
+++ b/source/readout/src/G4DCtable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DCtable.cc,v 1.1.8.1.2.1 1999/12/07 20:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4DCtable.hh"
diff --git a/source/readout/src/G4DMmessenger.cc b/source/readout/src/G4DMmessenger.cc
index 2aadc99806..b54dff8c19 100644
--- a/source/readout/src/G4DMmessenger.cc
+++ b/source/readout/src/G4DMmessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMmessenger.cc,v 1.1.10.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/readout/src/G4DigiManager.cc b/source/readout/src/G4DigiManager.cc
index a07468ae4d..872356dd2c 100644
--- a/source/readout/src/G4DigiManager.cc
+++ b/source/readout/src/G4DigiManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DigiManager.cc,v 1.1.8.1.2.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DigiManager.cc,v 1.1.8.1.2.1.2.1 1999/12/08 17:35:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4DigiManager.hh"
@@ -54,13 +54,13 @@ void G4DigiManager::AddNewModule(G4VDigitizerModule* DM)
   G4String DMname = DM->GetName();
   if(DMtable.index(DM) != G4std::string::npos)
   { 
-    G4cout << "<" << DMname << "> has already been registored." << endl; 
+    G4cout << "<" << DMname << "> has already been registored." << G4endl; 
     return;
   }
   else if( verboseLevel > 0 )
   {
     G4cout << "New DigitizerModule <" << DMname
-         << "> is registored." << endl;
+         << "> is registored." << G4endl;
   }
   DMtable.insert(DM);
 
@@ -72,12 +72,12 @@ void G4DigiManager::AddNewModule(G4VDigitizerModule* DM)
     { 
       G4cout << "DigiCollection <" << DCname 
            << "> has already been registored with "
-           << DMname << " DigitizerModule." << endl;
+           << DMname << " DigitizerModule." << G4endl;
     }
     else if( verboseLevel > 0 )
     {
       G4cout << "DigiCollection " << DCname 
-           << " is registored. " << endl;
+           << " is registored. " << G4endl;
     }
   }
   
@@ -90,7 +90,7 @@ void G4DigiManager::Digitize(G4String mName)
   if(aDM)
   { aDM->Digitize(); }
   else
-  { G4cout << "Unknown digitizer module <" << mName << ">. Digitize() ignored." << endl; }
+  { G4cout << "Unknown digitizer module <" << mName << ">. Digitize() ignored." << G4endl; }
 }
 
 G4VDigitizerModule* G4DigiManager::FindDigitizerModule(G4String mName)
@@ -141,7 +141,7 @@ G4int G4DigiManager::GetDigiCollectionID(G4String DCname)
 {
   G4int i = DCtable->GetCollectionID(DCname);
   if(i==-2)
-  { G4cout << "< " << DCname << "> is ambegious." << endl; }
+  { G4cout << "< " << DCname << "> is ambegious." << G4endl; }
   return i;
 }
 
@@ -151,7 +151,7 @@ void G4DigiManager::SetDigiCollection(G4int DCID,G4VDigiCollection* aDC)
   if(consEvt==NULL) 
   {
     G4cout << "G4DigiManager::SetDigiCollection --- "
-         << "Event object is not available." << endl;
+         << "Event object is not available." << G4endl;
     return;
   }
   
@@ -162,7 +162,7 @@ void G4DigiManager::SetDigiCollection(G4int DCID,G4VDigiCollection* aDC)
     DCE = new G4DCofThisEvent(DCtable->entries());
     evt->SetDCofThisEvent(DCE);
     if(verboseLevel>0)
-    { G4cout << "DCofThisEvent object is added to current G4Event." << endl; }
+    { G4cout << "DCofThisEvent object is added to current G4Event." << G4endl; }
   }
 
   DCE->AddDigiCollection(DCID,aDC);
@@ -170,7 +170,7 @@ void G4DigiManager::SetDigiCollection(G4int DCID,G4VDigiCollection* aDC)
   if(verboseLevel>0)
   {
     G4cout << aDC->GetName() << " is stored at " << DCID 
-         << "-th slot of G4DCofThisEvent." << endl;
+         << "-th slot of G4DCofThisEvent." << G4endl;
   }
 }
   
@@ -184,7 +184,7 @@ void G4DigiManager::SetVerboseLevel(G4int val)
 void G4DigiManager::List() const
 {
   for(G4int i=0;i<DMtable.entries();i++)
-  { G4cout << "   " << i << " : " << DMtable[i]->GetName() << endl; }
+  { G4cout << "   " << i << " : " << DMtable[i]->GetName() << G4endl; }
 }
 
 
diff --git a/source/readout/src/G4VDigitizerModule.cc b/source/readout/src/G4VDigitizerModule.cc
index eeb89c853d..5086663f85 100644
--- a/source/readout/src/G4VDigitizerModule.cc
+++ b/source/readout/src/G4VDigitizerModule.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDigitizerModule.cc,v 1.1.10.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VDigitizerModule.hh"
diff --git a/source/run/include/G4Run.hh b/source/run/include/G4Run.hh
index 100bb1259c..a8b2672fe2 100644
--- a/source/run/include/G4Run.hh
+++ b/source/run/include/G4Run.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Run.hh,v 1.2.4.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4Run_h
diff --git a/source/run/include/G4RunManager.hh b/source/run/include/G4RunManager.hh
index 28ec7243d0..3019424b75 100644
--- a/source/run/include/G4RunManager.hh
+++ b/source/run/include/G4RunManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RunManager.hh,v 1.7.2.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/run/include/G4RunMessenger.hh b/source/run/include/G4RunMessenger.hh
index 55cb7cdd2f..d57d13b659 100644
--- a/source/run/include/G4RunMessenger.hh
+++ b/source/run/include/G4RunMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RunMessenger.hh,v 1.4.4.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/run/include/G4UserPhysicsListMessenger.hh b/source/run/include/G4UserPhysicsListMessenger.hh
index 7a39fdf99a..9c22d39cbb 100644
--- a/source/run/include/G4UserPhysicsListMessenger.hh
+++ b/source/run/include/G4UserPhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserPhysicsListMessenger.hh,v 1.4.4.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/run/include/G4UserRunAction.hh b/source/run/include/G4UserRunAction.hh
index e05a206feb..172f7651d3 100644
--- a/source/run/include/G4UserRunAction.hh
+++ b/source/run/include/G4UserRunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserRunAction.hh,v 1.3.4.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UserRunAction_h
diff --git a/source/run/include/G4VPersistencyManager.hh b/source/run/include/G4VPersistencyManager.hh
index 758e2bf98e..67aa601ddb 100644
--- a/source/run/include/G4VPersistencyManager.hh
+++ b/source/run/include/G4VPersistencyManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistencyManager.hh,v 1.2.4.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VPersistencyManager_h
diff --git a/source/run/include/G4VUserDetectorConstruction.hh b/source/run/include/G4VUserDetectorConstruction.hh
index 8f7abb53ca..129549fde3 100644
--- a/source/run/include/G4VUserDetectorConstruction.hh
+++ b/source/run/include/G4VUserDetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserDetectorConstruction.hh,v 1.2.4.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VUserDetectorConstruction_h
diff --git a/source/run/include/G4VUserPhysicsList.hh b/source/run/include/G4VUserPhysicsList.hh
index 8dc64e793c..ef4d718488 100644
--- a/source/run/include/G4VUserPhysicsList.hh
+++ b/source/run/include/G4VUserPhysicsList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VUserPhysicsList.hh,v 1.5 1999/11/07 13:11:49 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VUserPhysicsList.hh,v 1.5.6.1 1999/12/08 17:35:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -194,14 +194,14 @@ class G4VUserPhysicsList
 
 inline void G4VUserPhysicsList::Construct()
 {
-  if (verboseLevel >1) G4cout << "G4VUserPhysicsList::Construct()" << endl;  
+  if (verboseLevel >1) G4cout << "G4VUserPhysicsList::Construct()" << G4endl;  
 
-  if (verboseLevel >1) G4cout << "Construct particles " << endl;  
+  if (verboseLevel >1) G4cout << "Construct particles " << G4endl;  
   ConstructParticle();
 
   InitializeProcessManager();
 
-  if (verboseLevel >1) G4cout << "Construct processes " << endl;  
+  if (verboseLevel >1) G4cout << "Construct processes " << G4endl;  
   ConstructProcess();
 }
 
@@ -215,7 +215,7 @@ inline void G4VUserPhysicsList::SetVerboseLevel(G4int value)
   verboseLevel = value;
   if (verboseLevel >1){
     G4cout << "G4VUserPhysicsList::SetVerboseLevel  :";
-    G4cout << " Verbose level is set to " << verboseLevel << endl;
+    G4cout << " Verbose level is set to " << verboseLevel << G4endl;
   }
 }
 
diff --git a/source/run/include/G4VUserPrimaryGeneratorAction.hh b/source/run/include/G4VUserPrimaryGeneratorAction.hh
index 1ac009f6e1..b5d197dceb 100644
--- a/source/run/include/G4VUserPrimaryGeneratorAction.hh
+++ b/source/run/include/G4VUserPrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserPrimaryGeneratorAction.hh,v 1.2.4.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VUserPrimaryGeneratorAction_h
diff --git a/source/run/src/G4Run.cc b/source/run/src/G4Run.cc
index 97426ea910..0c02b7c711 100644
--- a/source/run/src/G4Run.cc
+++ b/source/run/src/G4Run.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Run.cc,v 1.1.10.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4Run.hh"
diff --git a/source/run/src/G4RunManager.cc b/source/run/src/G4RunManager.cc
index b38808f263..e6a501490e 100644
--- a/source/run/src/G4RunManager.cc
+++ b/source/run/src/G4RunManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RunManager.cc,v 1.10.2.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RunManager.cc,v 1.12 2000/03/09 17:07:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -37,11 +37,7 @@
 #include "G4VVisManager.hh"
 
 #include "G4ios.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 
 G4RunManager* G4RunManager::fRunManager = NULL;
@@ -71,20 +67,20 @@ G4RunManager::G4RunManager()
   G4ParticleTable::GetParticleTable()->CreateMessenger();
   G4ProcessTable::GetProcessTable()->CreateMessenger();
   G4cout 
-  << "**********************************************" << endl
-  << " Geant4 version $Name: geant4-01-00 $" << endl
-  << "                                  (07-Dec-99)" << endl
-  << "             Copyright : Geant4 Collaboration" << endl
-  << "**********************************************" << endl;
+  << "**********************************************" << G4endl
+  << " Geant4 version $Name: geant4-01-01 $" << G4endl
+  << "                                (10-Mar-2000)" << G4endl
+  << "             Copyright : Geant4 Collaboration" << G4endl
+  << "**********************************************" << G4endl;
 }
 
 G4RunManager::~G4RunManager()
 {
-  if(verboseLevel>0) G4cout << "G4 kernel has come to Quit state." << endl;
+  if(verboseLevel>0) G4cout << "G4 kernel has come to Quit state." << G4endl;
   G4StateManager* pStateManager = G4StateManager::GetStateManager();
   pStateManager->SetNewState(Quit);
 
-  if(verboseLevel>1) G4cout << "Deletion of G4 kernel class start." << endl;
+  if(verboseLevel>1) G4cout << "Deletion of G4 kernel class start." << G4endl;
   delete timer;
   delete runMessenger;
   physicsList->RemoveProcessManager();
@@ -94,42 +90,42 @@ G4RunManager::~G4RunManager()
   if(userDetector)
   {
     delete userDetector;
-    if(verboseLevel>1) G4cout << "UserDetectorConstruction deleted." << endl;
+    if(verboseLevel>1) G4cout << "UserDetectorConstruction deleted." << G4endl;
   }
   if(physicsList)
   {
     delete physicsList;
-    if(verboseLevel>1) G4cout << "UserPhysicsList deleted." << endl;
+    if(verboseLevel>1) G4cout << "UserPhysicsList deleted." << G4endl;
   }
   if(userRunAction)
   {
     delete userRunAction;
-    if(verboseLevel>1) G4cout << "UserRunAction deleted." << endl;
+    if(verboseLevel>1) G4cout << "UserRunAction deleted." << G4endl;
   }
   if(userPrimaryGeneratorAction)
   {
     delete userPrimaryGeneratorAction;
-    if(verboseLevel>1) G4cout << "UserPrimaryGenerator deleted." << endl;
+    if(verboseLevel>1) G4cout << "UserPrimaryGenerator deleted." << G4endl;
   }
   G4SDManager* fSDM = G4SDManager::GetSDMpointerIfExist();
   if(fSDM)
   {
     delete fSDM;
-    if(verboseLevel>1) G4cout << "G4SDManager deleted." << endl;
+    if(verboseLevel>1) G4cout << "G4SDManager deleted." << G4endl;
   }
   delete eventManager;
-  if(verboseLevel>1) G4cout << "EventManager deleted." << endl;
+  if(verboseLevel>1) G4cout << "EventManager deleted." << G4endl;
   G4UImanager* pUImanager = G4UImanager::GetUIpointer();
   {
     if(pUImanager) delete pUImanager;
-    if(verboseLevel>1) G4cout << "UImanager deleted." << endl;
+    if(verboseLevel>1) G4cout << "UImanager deleted." << G4endl;
   }
   if(pStateManager) 
   {
     delete pStateManager;
-    if(verboseLevel>1) G4cout << "StateManager deleted." << endl;
+    if(verboseLevel>1) G4cout << "StateManager deleted." << G4endl;
   }
-  if(verboseLevel>1) G4cout << "RunManager is deleting." << endl;
+  if(verboseLevel>1) G4cout << "RunManager is deleting." << G4endl;
 }
 
 void G4RunManager::BeamOn(G4int n_event,const char* macroFile,G4int n_select)
@@ -150,14 +146,14 @@ G4bool G4RunManager::ConfirmBeamOnCondition()
   G4ApplicationState currentState = stateManager->GetCurrentState();
   if(currentState!=PreInit && currentState!=Idle)
   {
-    G4cerr << "Illegal application state - BeamOn() ignored." << endl;
+    G4cerr << "Illegal application state - BeamOn() ignored." << G4endl;
     return false;
   }
 
   if(!initializedAtLeastOnce)
   {
-    G4cerr << " Geant4 kernel should be initialized" << endl;
-    G4cerr << "before the first BeamOn(). - BeamOn ignored." << endl;
+    G4cerr << " Geant4 kernel should be initialized" << G4endl;
+    G4cerr << "before the first BeamOn(). - BeamOn ignored." << G4endl;
     return false;
   }
 
@@ -165,11 +161,11 @@ G4bool G4RunManager::ConfirmBeamOnCondition()
   {
     if(verboseLevel>0)
     {
-      G4cout << "Start re-initialization because " << endl;
-      if(!geometryInitialized) G4cout << "  Geometry" << endl;
-      if(!physicsInitialized)  G4cout << "  Physics processes" << endl;
-      if(!cutoffInitialized)   G4cout << "  Cutoff" << endl;
-      G4cout << "has been modified since last Run." << endl;
+      G4cout << "Start re-initialization because " << G4endl;
+      if(!geometryInitialized) G4cout << "  Geometry" << G4endl;
+      if(!physicsInitialized)  G4cout << "  Physics processes" << G4endl;
+      if(!cutoffInitialized)   G4cout << "  Cutoff" << G4endl;
+      G4cout << "has been modified since last Run." << G4endl;
     }
     Initialize();
   }
@@ -189,7 +185,7 @@ void G4RunManager::RunInitialization()
   if(userRunAction) userRunAction->BeginOfRunAction(currentRun);
   if(geometryNeedsToBeClosed)
   {
-    if(verboseLevel>1) G4cout << "Start closing geometry." << endl;
+    if(verboseLevel>1) G4cout << "Start closing geometry." << G4endl;
     G4GeometryManager* geomManager = G4GeometryManager::GetInstance();
     geomManager->OpenGeometry();
     geomManager->CloseGeometry(geometryToBeOptimized);
@@ -206,7 +202,7 @@ void G4RunManager::RunInitialization()
 
   if(storeRandomNumberStatus==1 || storeRandomNumberStatus==-1) StoreRandomNumberStatus();
   
-  if(verboseLevel>0) G4cout << "Start Run processing." << endl;
+  if(verboseLevel>0) G4cout << "Start Run processing." << G4endl;
 }
 
 void G4RunManager::DoEventLoop(G4int n_event,const char* macroFile,G4int n_select)
@@ -250,13 +246,13 @@ void G4RunManager::DoEventLoop(G4int n_event,const char* macroFile,G4int n_selec
   if(verboseLevel>0)
   {
     timer->Stop();
-    G4cout << "Run terminated." << endl;
-    G4cout << "Run Summary" << endl;
+    G4cout << "Run terminated." << G4endl;
+    G4cout << "Run Summary" << G4endl;
     if(runAborted)
-    { G4cout << "  Run Aborted after " << i_event << " events processed." << endl; }
+    { G4cout << "  Run Aborted after " << i_event << " events processed." << G4endl; }
     else
-    { G4cout << "  Number of events processed : " << n_event << endl; }
-    G4cout << "  "  << *timer << endl;
+    { G4cout << "  Number of events processed : " << n_event << G4endl; }
+    G4cout << "  "  << *timer << G4endl;
   }
 }
 
@@ -320,7 +316,7 @@ void G4RunManager::Initialize()
   if(currentState!=PreInit && currentState!=Idle)
   {
     G4cerr << "Illegal application state - "
-         << "G4RunManager::Initialize() ignored." << endl;
+         << "G4RunManager::Initialize() ignored." << G4endl;
     return;
   }
 
@@ -340,7 +336,7 @@ void G4RunManager::InitializeGeometry()
     ("G4RunManager::InitializeGeometry - G4VUserDetectorConstruction is not defined.");
   }
 
-  if(verboseLevel>1) G4cout << "userDetector->Construct() start." << endl;
+  if(verboseLevel>1) G4cout << "userDetector->Construct() start." << G4endl;
   DefineWorldVolume(userDetector->Construct());
   geometryInitialized = true;
 }
@@ -349,7 +345,7 @@ void G4RunManager::InitializePhysics()
 {
   if(physicsList)
   {
-    if(verboseLevel>1) G4cout << "physicsList->Construct() start." << endl;
+    if(verboseLevel>1) G4cout << "physicsList->Construct() start." << G4endl;
     physicsList->Construct();
   }
   else
@@ -363,7 +359,7 @@ void G4RunManager::InitializeCutOff()
 {
   if(physicsList)
   {
-    if(verboseLevel>1) G4cout << "physicsList->setCut() start." << endl;
+    if(verboseLevel>1) G4cout << "physicsList->setCut() start." << G4endl;
     physicsList->SetCuts();
   }
   cutoffInitialized = true;
@@ -381,7 +377,7 @@ void G4RunManager::AbortRun()
   }
   else
   {
-    G4cerr << "Run is not in progress. AbortRun() ignored." << endl;
+    G4cerr << "Run is not in progress. AbortRun() ignored." << G4endl;
   }
 }
 
@@ -405,7 +401,7 @@ void G4RunManager::StoreRandomNumberStatus(G4int eventID)
   if(storeRandomNumberStatus>0 && currentRun != NULL)
   {
     char st[20];
-    ostrstream os(st,20);
+    G4std::ostrstream os(st,20);
     os << currentRun->GetRunID() << '\0';
     fileN += "R";
     fileN += st;
@@ -413,7 +409,7 @@ void G4RunManager::StoreRandomNumberStatus(G4int eventID)
   if(storeRandomNumberStatus==2 && eventID>=0)
   {
     char st[20];
-    ostrstream os(st,20);
+    G4std::ostrstream os(st,20);
     os << eventID << '\0';
     fileN += "E";
     fileN += st;
diff --git a/source/run/src/G4RunMessenger.cc b/source/run/src/G4RunMessenger.cc
index 0480fd21f7..3175ceedb6 100644
--- a/source/run/src/G4RunMessenger.cc
+++ b/source/run/src/G4RunMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RunMessenger.cc,v 1.4.8.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4RunMessenger.cc,v 1.4.8.1.2.5 1999/12/14 09:16:50 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4RunMessenger.hh"
@@ -19,11 +19,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIparameter.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4RunMessenger::G4RunMessenger(G4RunManager * runMgr)
 :runManager(runMgr)
@@ -161,7 +157,7 @@ void G4RunMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
     G4int nev;
     G4int ns;
     const char* nv = (const char*)newValue;
-    istrstream is((char*)nv);
+    G4std::istrstream is((char*)nv);
     is >> nev >> macroFileName >> ns;
     if(macroFileName=="***NULL***")
     { runManager->BeamOn(nev); }
diff --git a/source/run/src/G4UserPhysicsListMessenger.cc b/source/run/src/G4UserPhysicsListMessenger.cc
index 1ae0e32aad..073ec22c22 100644
--- a/source/run/src/G4UserPhysicsListMessenger.cc
+++ b/source/run/src/G4UserPhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserPhysicsListMessenger.cc,v 1.2.8.1 1999/12/07 20:52:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/run/src/G4UserRunAction.cc b/source/run/src/G4UserRunAction.cc
index 9f8fd67d96..967da7afa1 100644
--- a/source/run/src/G4UserRunAction.cc
+++ b/source/run/src/G4UserRunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserRunAction.cc,v 1.2.8.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UserRunAction.hh"
diff --git a/source/run/src/G4VPersistencyManager.cc b/source/run/src/G4VPersistencyManager.cc
index ddb4dcfac6..de30a2fee1 100644
--- a/source/run/src/G4VPersistencyManager.cc
+++ b/source/run/src/G4VPersistencyManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPersistencyManager.cc,v 1.1.10.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VPersistencyManager.hh"
diff --git a/source/run/src/G4VUserDetectorConstruction.cc b/source/run/src/G4VUserDetectorConstruction.cc
index 8a7d4648ce..d86b9b4810 100644
--- a/source/run/src/G4VUserDetectorConstruction.cc
+++ b/source/run/src/G4VUserDetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserDetectorConstruction.cc,v 1.1.10.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VUserDetectorConstruction.hh"
diff --git a/source/run/src/G4VUserPhysicsList.cc b/source/run/src/G4VUserPhysicsList.cc
index f2f0bfef25..8442548711 100644
--- a/source/run/src/G4VUserPhysicsList.cc
+++ b/source/run/src/G4VUserPhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VUserPhysicsList.cc,v 1.7.8.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VUserPhysicsList.cc,v 1.7.8.1.2.3 1999/12/14 07:08:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -37,7 +37,7 @@
 #include "G4UImanager.hh"
 #include "G4ios.hh"
 #include "G4UnitsTable.hh"
-#include <iomanip.h>                
+#include "g4std/iomanip"                
 
 
 G4VUserPhysicsList::G4VUserPhysicsList()
@@ -74,7 +74,7 @@ void G4VUserPhysicsList::AddProcessManager(G4ParticleDefinition* newParticle,
     if (verboseLevel >1){
       G4cout << "G4VUserPhysicsList::AddProcessManager: ";
       G4cout  << newParticle->GetParticleName();
-      G4cout << " already has ProcessManager " << endl;
+      G4cout << " already has ProcessManager " << G4endl;
     }
 #endif
     return;
@@ -117,7 +117,7 @@ void G4VUserPhysicsList::AddProcessManager(G4ParticleDefinition* newParticle,
   if (verboseLevel >2){
     G4cout << "G4VUserPhysicsList::AddProcessManager: ";
     G4cout  << "adds ProcessManager to ";
-    G4cout  << newParticle->GetParticleName() << endl;
+    G4cout  << newParticle->GetParticleName() << G4endl;
     newManager->DumpInfo();
   } 
 #endif
@@ -153,7 +153,7 @@ void G4VUserPhysicsList::RemoveProcessManager()
     if (verboseLevel >2){
       G4cout << "G4VUserPhysicsList::RemoveProcessManager: ";
       G4cout  << "remove ProcessManager from ";
-      G4cout  << particle->GetParticleName() << endl;
+      G4cout  << particle->GetParticleName() << G4endl;
     }
 #endif
   } 
@@ -194,7 +194,7 @@ void G4VUserPhysicsList::SetDefaultCutValue(G4double value)
 #ifdef G4VERBOSE    
      if (verboseLevel >0){
        G4cout << "G4VUserPhysicsList::SetDefaultCutValue: negative cut values";
-       G4cout << "  :" << value/mm << "[mm]" << endl;
+       G4cout << "  :" << value/mm << "[mm]" << G4endl;
      }
 #endif
    } else { 
@@ -202,7 +202,7 @@ void G4VUserPhysicsList::SetDefaultCutValue(G4double value)
      if (verboseLevel >1){
        G4cout << "G4VUserPhysicsList::SetDefaultCutValue:";
        G4cout << "default cut value is changed to   :" ;
-       G4cout << value/mm << "[mm]" << endl;
+       G4cout << value/mm << "[mm]" << G4endl;
      }
 #endif
      defaultCutValue = value;
@@ -214,8 +214,8 @@ void G4VUserPhysicsList::ResetCuts()
 {
 #ifdef G4VERBOSE    
   if (verboseLevel >1) {
-    G4cout << "G4VUserPhysicsList::ResetCuts()" << endl;
-    G4cout << "  cut values in energy will be calculated later" << endl;
+    G4cout << "G4VUserPhysicsList::ResetCuts()" << G4endl;
+    G4cout << "  cut values in energy will be calculated later" << G4endl;
   }
 #endif
 
@@ -257,7 +257,7 @@ void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
 #ifdef G4VERBOSE    
     if (verboseLevel >0){
       G4cout << "G4VUserPhysicsList::SetCutValueForOtherThan: negative cut values";
-      G4cout << "  :" << cutValue/mm << "[mm]" << endl;
+      G4cout << "  :" << cutValue/mm << "[mm]" << G4endl;
     }
 #endif
     return;
@@ -265,7 +265,7 @@ void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
 #ifdef G4VERBOSE    
     if (verboseLevel >1) {
       G4cout << "G4VUserPhysicsList::SetCutValueForOtherThan ";
-      G4cout << "  :" << cutValue/mm << "[mm]" << endl;
+      G4cout << "  :" << cutValue/mm << "[mm]" << G4endl;
     }
 #endif
   }
@@ -330,7 +330,7 @@ void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
       BuildPhysicsTable(particle);
 
 #ifdef G4VERBOSE    
-      if (verboseLevel >1) G4cout << "Set cuts for " << particle->GetParticleName() << endl;
+      if (verboseLevel >1) G4cout << "Set cuts for " << particle->GetParticleName() << G4endl;
 #endif
     }
   }
@@ -350,10 +350,10 @@ void G4VUserPhysicsList::SetCutValue(G4double aCut, const G4String& name)
 
 #ifdef G4VERBOSE    
   if (particle != 0){
-    if (verboseLevel >1) G4cout << "Set cuts for " << name << endl;
+    if (verboseLevel >1) G4cout << "Set cuts for " << name << G4endl;
   } else {
     if (verboseLevel >0) 
-      G4cout << name << " is not found in ParticleTable" << endl;
+      G4cout << name << " is not found in ParticleTable" << G4endl;
   }
 #endif
 }
@@ -366,7 +366,7 @@ void G4VUserPhysicsList::SetCutsWithDefault()
 #ifdef G4VERBOSE    
   if (verboseLevel >1){
     G4cout << "G4VUserPhysicsList::SetCutsWithDefault:";
-    G4cout << "CutLength : " << cut/mm << " (mm)" << endl;
+    G4cout << "CutLength : " << cut/mm << " (mm)" << G4endl;
   }  
 #endif
 
@@ -395,7 +395,7 @@ void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
 #ifdef G4VERBOSE    
     if (verboseLevel >0){
       G4cout << "G4VUserPhysicsList::SetCutValueForOthers: negative cut values";
-      G4cout << "  :" << cutValue/mm << "[mm]" << endl;
+      G4cout << "  :" << cutValue/mm << "[mm]" << G4endl;
     }
 #endif
     return;
@@ -404,7 +404,7 @@ void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
 #ifdef G4VERBOSE    
   if (verboseLevel >1) {
       G4cout << "G4VUserPhysicsList::SetCutValueForOthers ";
-      G4cout << "  :" << cutValue/mm << "[mm]" << endl;
+      G4cout << "  :" << cutValue/mm << "[mm]" << G4endl;
   }
 #endif
 
@@ -423,7 +423,7 @@ void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
 
 #ifdef G4VERBOSE    
 	if (verboseLevel >1) 
-	  G4cout << "Set cuts for " << particle->GetParticleName() << endl;
+	  G4cout << "Set cuts for " << particle->GetParticleName() << G4endl;
 #endif
       }
     }
@@ -440,14 +440,14 @@ void G4VUserPhysicsList::ReCalcCutValue(const G4String& name)
       BuildPhysicsTable(particle);
 
 #ifdef G4VERBOSE    
-      if (verboseLevel >1) G4cout << "Recalc cuts for " << name << endl;
+      if (verboseLevel >1) G4cout << "Recalc cuts for " << name << G4endl;
 #endif
     }
   } 
 
 #ifdef G4VERBOSE    
   if (( particle ==0 ) && (verboseLevel >0)) {
-    G4cout << name << " is not found in ParticleTable" << endl;
+    G4cout << name << " is not found in ParticleTable" << G4endl;
   }
 #endif
 
@@ -474,7 +474,7 @@ void G4VUserPhysicsList::ReCalcCutValueForOthers()
 
 #ifdef G4VERBOSE    
 	if (verboseLevel >1) 
-	  G4cout << "ReCalc cuts for " << particle->GetParticleName() << endl;
+	  G4cout << "ReCalc cuts for " << particle->GetParticleName() << G4endl;
 #endif
       }
     }
@@ -542,12 +542,12 @@ void G4VUserPhysicsList::DumpList() const
     G4ParticleDefinition* particle = theParticleIterator->value();
     G4cout << particle->GetParticleName();
     if ((idx++ % 4) == 3) {
-      G4cout << endl;
+      G4cout << G4endl;
     } else {
       G4cout << ", ";
     }      
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VUserPhysicsList::DumpCutValues(const G4String &particle_name) const
@@ -573,29 +573,29 @@ void G4VUserPhysicsList::DumpCutValues( G4ParticleDefinition* particle) const
 
   if (particle->IsShortLived()) {
     // name field
-    G4cout << " --- " << particle->GetParticleName() << " is a short lived particle ------ " << endl;
+    G4cout << " --- " << particle->GetParticleName() << " is a short lived particle ------ " << G4endl;
   } else {
     // name field
-    G4cout << " --- " << particle->GetParticleName() << " ------ " << endl;
+    G4cout << " --- " << particle->GetParticleName() << " ------ " << G4endl;
 
     // cut value in range field
-    G4cout << "   - Cut in range = " << G4BestUnit(particle->GetLengthCuts(),"Length") << endl;
+    G4cout << "   - Cut in range = " << G4BestUnit(particle->GetLengthCuts(),"Length") << G4endl;
 
     // material and energy cut value for the material 
     G4double*  theKineticEnergyCuts = particle->GetEnergyCuts();
     
     if (theKineticEnergyCuts != 0) {
       const G4MaterialTable* materialTable = G4Material::GetMaterialTable();
-      G4cout << "   - Material ---------------- Energy Cut ---" << endl;
+      G4cout << "   - Material ---------------- Energy Cut ---" << G4endl;
       for (G4int idx=0; idx<materialTable->entries(); idx++){
-	G4cout << "     " << setw(19) << (*materialTable)[idx]->GetName(); 
-	G4cout << " : "   << setw(10) << G4BestUnit(theKineticEnergyCuts[idx],"Energy");
-	G4cout << endl;
+	G4cout << "     " << G4std::setw(19) << (*materialTable)[idx]->GetName(); 
+	G4cout << " : "   << G4std::setw(10) << G4BestUnit(theKineticEnergyCuts[idx],"Energy");
+	G4cout << G4endl;
       }
 
     } else {
-      G4cout << "   - Cuts in energy are not calculated yet --" << endl;
-      G4cout << " Enter /run/initialize command to calculate cuts " << endl;
+      G4cout << "   - Cuts in energy are not calculated yet --" << G4endl;
+      G4cout << " Enter /run/initialize command to calculate cuts " << G4endl;
     }
 
   }
@@ -618,17 +618,17 @@ void G4VUserPhysicsList::DumpCutValuesTable() const
 
   //line 1 //-- Commented out (M.Asai)
   //G4cout << "Default cut value in range :";
-  //G4cout << defaultCutValue/mm << "[mm]" << endl;
+  //G4cout << defaultCutValue/mm << "[mm]" << G4endl;
 
   //line 2
-  G4cout << "============= The cut Energy ==============================" <<endl;
+  G4cout << "============= The cut Energy ==============================" <<G4endl;
   
   // line 3
   G4cout << "                     ";
   for (idx=0; idx <size; idx++) {
-    G4cout << " " << setw(11) << name[idx] << "    ";
+    G4cout << " " << G4std::setw(11) << name[idx] << "    ";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 
   // line 4
   G4cout << "Cut in range       ";
@@ -636,19 +636,19 @@ void G4VUserPhysicsList::DumpCutValuesTable() const
     if (particle[idx] == 0) {
       G4cout << "            ";
     } else {
-      G4cout << " " << setw(11) << G4BestUnit(particle[idx]->GetLengthCuts(),"Length");
+      G4cout << " " << G4std::setw(11) << G4BestUnit(particle[idx]->GetLengthCuts(),"Length");
     }
   }
-  G4cout << endl;
+  G4cout << G4endl;
 
   // line 5
   G4cout << "Cut in energy";
-  G4cout << endl;
+  G4cout << G4endl;
 
  // line 6 ..
   const G4MaterialTable* materialTable = G4Material::GetMaterialTable();
   for (G4int J=0; J<materialTable->entries(); J++) {
-    G4cout << " " << setw(18) << ((*materialTable)[J])->GetName();
+    G4cout << " " << G4std::setw(18) << ((*materialTable)[J])->GetName();
     for (idx=0; idx <size; idx++) {
       if (particle[idx] == 0) {
 	G4cout << "            ";
@@ -657,20 +657,20 @@ void G4VUserPhysicsList::DumpCutValuesTable() const
 	  G4cout << " ---------- ";
           IsOK = false;
 	} else {
-	  G4cout << " " << setw(11) << G4BestUnit((particle[idx]->GetEnergyCuts())[J],"Energy");
+	  G4cout << " " << G4std::setw(11) << G4BestUnit((particle[idx]->GetEnergyCuts())[J],"Energy");
 	}
       }
     }
-    G4cout << endl;
+    G4cout << G4endl;
   }
   
   if (!IsOK) {
-    G4cout << " Cuts in energy have not calculated yet !!" << endl;
-    G4cout << " Enter /run/initialize command to calculate cuts " << endl;
+    G4cout << " Cuts in energy have not calculated yet !!" << G4endl;
+    G4cout << " Enter /run/initialize command to calculate cuts " << G4endl;
   }
 
   // last line 
-  G4cout << "===================================================" << endl;
+  G4cout << "===================================================" << G4endl;
   G4cout.precision(prec);
 }
 
diff --git a/source/run/src/G4VUserPrimaryGeneratorAction.cc b/source/run/src/G4VUserPrimaryGeneratorAction.cc
index 040fce5985..06b7b8159b 100644
--- a/source/run/src/G4VUserPrimaryGeneratorAction.cc
+++ b/source/run/src/G4VUserPrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserPrimaryGeneratorAction.cc,v 1.1.10.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4VUserPrimaryGeneratorAction.hh"
diff --git a/source/track/History b/source/track/History
index c2bbcf60dc..1584017ec3 100644
--- a/source/track/History
+++ b/source/track/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.13 1999/11/07 16:31:24 kurasige Exp $
+$Id: History,v 1.14 2000/01/18 02:54:07 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,9 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Jan 18, 2000 H.Kurashige (track-V01-00-00)
+-  Fixed bugs in treatment of secondary track weight 
+
 Nov 7, 1999 H.Kurashige (track-V00-01-01)
 -  Added comments for "Software Reference Manual" 
 
diff --git a/source/track/include/G4EvtBiasMechanism.hh b/source/track/include/G4EvtBiasMechanism.hh
index 535b15a651..acf27a5098 100644
--- a/source/track/include/G4EvtBiasMechanism.hh
+++ b/source/track/include/G4EvtBiasMechanism.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EvtBiasMechanism.hh,v 1.3 1999/11/07 16:31:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ForceCondition.hh b/source/track/include/G4ForceCondition.hh
index cf5bbefd46..68513e4ac7 100644
--- a/source/track/include/G4ForceCondition.hh
+++ b/source/track/include/G4ForceCondition.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ForceCondition.hh,v 1.2 1999/11/07 16:31:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4GPILSelection.hh b/source/track/include/G4GPILSelection.hh
index 2214c1c276..2f91e0fc34 100644
--- a/source/track/include/G4GPILSelection.hh
+++ b/source/track/include/G4GPILSelection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GPILSelection.hh,v 1.2 1999/11/07 16:31:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Mars5GeVMechanism.hh b/source/track/include/G4Mars5GeVMechanism.hh
index f40d51a407..9b71c4d603 100644
--- a/source/track/include/G4Mars5GeVMechanism.hh
+++ b/source/track/include/G4Mars5GeVMechanism.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Mars5GeVMechanism.hh,v 1.3 1999/11/07 16:31:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChange.hh b/source/track/include/G4ParticleChange.hh
index d98dde8dd6..fa00aade6b 100644
--- a/source/track/include/G4ParticleChange.hh
+++ b/source/track/include/G4ParticleChange.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChange.hh,v 1.5 1999/11/07 16:31:59 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChange.icc b/source/track/include/G4ParticleChange.icc
index 03dfb18608..dc0638bd4c 100644
--- a/source/track/include/G4ParticleChange.icc
+++ b/source/track/include/G4ParticleChange.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChange.icc,v 1.4.6.1 1999/12/07 20:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChange.icc,v 1.6 2000/01/18 02:54:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 inline
@@ -190,7 +190,7 @@ inline
 inline 
   void G4ParticleChange::SetWeightChange(G4double w)
 {
-  if(fUseEB) theWeightChange = w;
+  theWeightChange = w;
 }
 
 inline  
diff --git a/source/track/include/G4ParticleChangeForDecay.hh b/source/track/include/G4ParticleChangeForDecay.hh
index 98e032c08f..48b0394c24 100644
--- a/source/track/include/G4ParticleChangeForDecay.hh
+++ b/source/track/include/G4ParticleChangeForDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForDecay.hh,v 1.4 1999/11/07 16:31:59 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForLoss.hh b/source/track/include/G4ParticleChangeForLoss.hh
index fad7dc9c9b..0b08c61b14 100644
--- a/source/track/include/G4ParticleChangeForLoss.hh
+++ b/source/track/include/G4ParticleChangeForLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForLoss.hh,v 1.3 1999/11/07 16:32:00 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForMSC.icc b/source/track/include/G4ParticleChangeForMSC.icc
index 4b6fcf21de..da463ca2b8 100644
--- a/source/track/include/G4ParticleChangeForMSC.icc
+++ b/source/track/include/G4ParticleChangeForMSC.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForMSC.icc,v 1.2.8.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForMSC.icc,v 1.3 1999/12/15 14:53:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/track/include/G4ParticleChangeForTransport.hh b/source/track/include/G4ParticleChangeForTransport.hh
index 9400a33c6e..cca47f2125 100644
--- a/source/track/include/G4ParticleChangeForTransport.hh
+++ b/source/track/include/G4ParticleChangeForTransport.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForTransport.hh,v 1.2 1999/11/07 16:32:01 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForTransport.icc b/source/track/include/G4ParticleChangeForTransport.icc
index d4e8d82ff1..0e829f6e98 100644
--- a/source/track/include/G4ParticleChangeForTransport.icc
+++ b/source/track/include/G4ParticleChangeForTransport.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForTransport.icc,v 1.1.10.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForTransport.icc,v 1.2 1999/12/15 14:53:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/track/include/G4Step.hh b/source/track/include/G4Step.hh
index 4b491c1c2c..97f0683e13 100644
--- a/source/track/include/G4Step.hh
+++ b/source/track/include/G4Step.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Step.hh,v 1.6 1999/11/07 16:32:01 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Step.hh,v 1.7 1999/12/15 14:53:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>                 // Include from 'system'
 #include "G4ios.hh"               // Include from 'system'
-#include <iomanip.h>                // Include from 'system'
+#include "g4std/iomanip"                // Include from 'system'
 #include "globals.hh"               // Include from 'global'
 #include "G4ThreeVector.hh"         // Include from 'global'
 #include "G4VPhysicalVolume.hh"     // Include from 'geometry'
diff --git a/source/track/include/G4Step.icc b/source/track/include/G4Step.icc
index c85641394e..3da710b45e 100644
--- a/source/track/include/G4Step.icc
+++ b/source/track/include/G4Step.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Step.icc,v 1.1 1999/10/06 01:21:48 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4StepPoint.hh b/source/track/include/G4StepPoint.hh
index 912ea4dd93..cef0c91497 100644
--- a/source/track/include/G4StepPoint.hh
+++ b/source/track/include/G4StepPoint.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StepPoint.hh,v 1.4 1999/11/07 16:32:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4StepStatus.hh b/source/track/include/G4StepStatus.hh
index d7fa7da677..6673b5b363 100644
--- a/source/track/include/G4StepStatus.hh
+++ b/source/track/include/G4StepStatus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StepStatus.hh,v 1.2 1999/11/07 16:32:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4SteppingControl.hh b/source/track/include/G4SteppingControl.hh
index a4484f9dbe..c298e09312 100644
--- a/source/track/include/G4SteppingControl.hh
+++ b/source/track/include/G4SteppingControl.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SteppingControl.hh,v 1.2 1999/11/07 16:32:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Track.hh b/source/track/include/G4Track.hh
index 2046f37dad..d8ba601921 100644
--- a/source/track/include/G4Track.hh
+++ b/source/track/include/G4Track.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Track.hh,v 1.5 1999/11/07 16:32:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Track.icc b/source/track/include/G4Track.icc
index e54a1ebd25..1079f3e0a2 100644
--- a/source/track/include/G4Track.icc
+++ b/source/track/include/G4Track.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Track.icc,v 1.1 1999/10/06 01:21:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //-----------------------------------------------------------------
 // Definitions of inline functions
diff --git a/source/track/include/G4TrackFastVector.hh b/source/track/include/G4TrackFastVector.hh
index c6c19b2c19..5929d4ee6d 100644
--- a/source/track/include/G4TrackFastVector.hh
+++ b/source/track/include/G4TrackFastVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrackFastVector.hh,v 1.3 1999/11/07 16:32:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4TrackStatus.hh b/source/track/include/G4TrackStatus.hh
index fb8c9abf4a..abd001e23d 100644
--- a/source/track/include/G4TrackStatus.hh
+++ b/source/track/include/G4TrackStatus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrackStatus.hh,v 1.2 1999/11/07 16:32:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4VEvtBiasMechanism.hh b/source/track/include/G4VEvtBiasMechanism.hh
index 728ea382ac..18f6c2c383 100644
--- a/source/track/include/G4VEvtBiasMechanism.hh
+++ b/source/track/include/G4VEvtBiasMechanism.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VEvtBiasMechanism.hh,v 1.3 1999/11/07 16:32:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4VParticleChange.hh b/source/track/include/G4VParticleChange.hh
index 40eeb5760b..89684aec6f 100644
--- a/source/track/include/G4VParticleChange.hh
+++ b/source/track/include/G4VParticleChange.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VParticleChange.hh,v 1.4 1999/11/07 16:32:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4VParticleChange.icc b/source/track/include/G4VParticleChange.icc
index cdc0d0d1d1..c3e0a6c460 100644
--- a/source/track/include/G4VParticleChange.icc
+++ b/source/track/include/G4VParticleChange.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VParticleChange.icc,v 1.2.8.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VParticleChange.icc,v 1.4 2000/01/18 02:54:12 kurasige Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //----------------------------------------------------------------
 // Virtual methods for updating G4Step 
@@ -184,8 +184,8 @@ inline void G4VParticleChange::InitializeSecondaries(const G4Track&)
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cerr << "G4VParticleChange::Initialize() Warning  ";
-      G4cerr << "theListOfSecondaries is not empty " << endl;
-      G4cerr << "All objects in theListOfSecondaries are destroyed!" << endl;
+      G4cerr << "theListOfSecondaries is not empty " << G4endl;
+      G4cerr << "All objects in theListOfSecondaries are destroyed!" << G4endl;
     }
 #endif
     for (G4int index= 0; index<theNumberOfSecondaries; index++){
@@ -203,8 +203,8 @@ inline void G4VParticleChange::InitializeSecondaries(const G4Track&)
 
 inline void G4VParticleChange::AddSecondary(G4Track *aTrack)
 {
-  // pass the weight of parent track if this particle change use no EB
-  aTrack->SetWeight(theParentWeight);
+  // pass the weight of parent track if the weight is larger than parent weight
+  if (aTrack->GetWeight()>theParentWeight) aTrack->SetWeight(theParentWeight);
   
   // add a secondary after size check
   if (theSizeOftheListOfSecondaries > theNumberOfSecondaries) {
@@ -214,8 +214,8 @@ inline void G4VParticleChange::AddSecondary(G4Track *aTrack)
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cerr << "G4VParticleChange::AddSecondary() Warning  ";
-      G4cerr << "theListOfSecondaries is full !! " << endl;
-      G4cerr << " The object will not be added in theListOfSecondaries" << endl;
+      G4cerr << "theListOfSecondaries is full !! " << G4endl;
+      G4cerr << " The object will not be added in theListOfSecondaries" << G4endl;
     }
 #endif
   }
diff --git a/source/track/src/G4EvtBiasMechanism.cc b/source/track/src/G4EvtBiasMechanism.cc
index 0c60c49ba6..f907561428 100644
--- a/source/track/src/G4EvtBiasMechanism.cc
+++ b/source/track/src/G4EvtBiasMechanism.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4EvtBiasMechanism.cc,v 1.2.8.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4EvtBiasMechanism.cc,v 1.3 1999/12/15 14:53:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4Mars5GeVMechanism.cc b/source/track/src/G4Mars5GeVMechanism.cc
index 2e683fa48f..5607adb5df 100644
--- a/source/track/src/G4Mars5GeVMechanism.cc
+++ b/source/track/src/G4Mars5GeVMechanism.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Mars5GeVMechanism.cc,v 1.3.8.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Mars5GeVMechanism.cc,v 1.4 1999/12/15 14:53:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -84,7 +84,7 @@ void G4Mars5GeVMechanism::GetTargetNuclei(const G4Material* material)
   const G4int numberOfElements = material->GetNumberOfElements() ;
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::GetTargetNuclei" << endl;
+    G4cout << " G4Mars5GeVMechanism::GetTargetNuclei" << G4endl;
  }
 #endif 
   
@@ -99,7 +99,7 @@ void G4Mars5GeVMechanism::GetTargetNuclei(const G4Material* material)
     if (GetVerboseLevel() > 2) {
       G4cout << iel << ": " << theAtomicNumDensityVector[iel];
       G4cout << "  Z=" << (*theElementVector)(iel)->GetZ() << "  A=" << (*theElementVector)(iel)->GetN();
-      G4cout << endl; 
+      G4cout << G4endl; 
    }
 #endif 
   }
@@ -109,7 +109,7 @@ void G4Mars5GeVMechanism::GetTargetNuclei(const G4Material* material)
   if (GetVerboseLevel() > 2) {
     G4cout << "<Z>=" << fZNucl;
     G4cout << "<A>=" << fANucl;
-    G4cout << endl; 
+    G4cout << G4endl; 
   }
 #endif 
 } 
@@ -126,7 +126,7 @@ void G4Mars5GeVMechanism::Treem5()
   if (GetVerboseLevel() > 2) {
     G4cout << " G4Mars5GeVMechanism::Treem5() ";
     G4cout << "       Incident Particle: " << incidentParticle->GetDefinition()->GetParticleName();
-    G4cout << "  : energy = " <<   pE/GeV << "[GeV]" << endl; 
+    G4cout << "  : energy = " <<   pE/GeV << "[GeV]" << G4endl; 
   }
 #endif
 
@@ -178,7 +178,7 @@ G4bool G4Mars5GeVMechanism::CoulombBarrier(G4int pType, G4double  pE){
       if ( rCoulomb < RCoulombTh ) {
 #ifdef G4VERBOSE
 	if (GetVerboseLevel() > 2) {
-	  G4cout << " Can not interact because of Coulomb Barrier " << endl; 
+	  G4cout << " Can not interact because of Coulomb Barrier " << G4endl; 
 	}
 #endif 
 	return true;
@@ -192,7 +192,7 @@ void G4Mars5GeVMechanism::CreateNucleon(G4int ib, G4int pType, G4double  pE)
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::CreateNucleon()" << endl;
+    G4cout << " G4Mars5GeVMechanism::CreateNucleon()" << G4endl;
   }
 #endif
  if ( pType == MarsGAM) {
@@ -231,7 +231,7 @@ void G4Mars5GeVMechanism::CreatePion(G4int ib, G4int pType, G4double  pE)
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::CreatePion()" << endl;
+    G4cout << " G4Mars5GeVMechanism::CreatePion()" << G4endl;
   }
 #endif
  static const G4double PionProductionEth = 0.28*GeV; 
@@ -283,7 +283,7 @@ void G4Mars5GeVMechanism::CreatePionZero(G4int ib, G4int pType, G4double  pE)
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::CreatePionZero()" << endl;
+    G4cout << " G4Mars5GeVMechanism::CreatePionZero()" << G4endl;
   }
 #endif
   static const G4double PionProductionEth = 0.28*GeV; 
@@ -319,11 +319,11 @@ void G4Mars5GeVMechanism::AddSecondary()
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::AddSecondary()" << endl;
+    G4cout << " G4Mars5GeVMechanism::AddSecondary()" << G4endl;
     G4cout << " Particle :" << selec1.Tprod;
-    G4cout << ":" << GetParticleName(selec1.Tprod) <<endl;
-    G4cout << " Energy   :" << selec1.EN <<endl;
-    G4cout << "Weight    :" <<  selec1.V * incidentWeight << endl;
+    G4cout << ":" << GetParticleName(selec1.Tprod) <<G4endl;
+    G4cout << " Energy   :" << selec1.EN <<G4endl;
+    G4cout << "Weight    :" <<  selec1.V * incidentWeight << G4endl;
   }
 #endif
   // determine direction cosine
@@ -370,11 +370,11 @@ G4double G4Mars5GeVMechanism::SelBS(G4int pType, G4double aNucl, G4double zNucl)
 
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::SelBS" << endl;
-    G4cout << "   pType = " << pType <<  "   e0    = " << e0 << endl;
-    G4cout << "   aNucl = " << aNucl <<  "   zNucl = " << zNucl << endl;
+    G4cout << " G4Mars5GeVMechanism::SelBS" << G4endl;
+    G4cout << "   pType = " << pType <<  "   e0    = " << e0 << G4endl;
+    G4cout << "   aNucl = " << aNucl <<  "   zNucl = " << zNucl << G4endl;
     G4cout << "   Treac = " <<selec1.Treac;
-    G4cout << "   Tprod = " <<selec1.Tprod << endl;
+    G4cout << "   Tprod = " <<selec1.Tprod << G4endl;
  }
 #endif 
 
@@ -410,7 +410,7 @@ G4double G4Mars5GeVMechanism::SelBS(G4int pType, G4double aNucl, G4double zNucl)
 
 #ifdef G4VERBOSE
     if (GetVerboseLevel() > 2) {
-      G4cout << "selec1.EN = " << en << endl;
+      G4cout << "selec1.EN = " << en << G4endl;
     }
 #endif 
     
@@ -452,7 +452,7 @@ G4double G4Mars5GeVMechanism::SelBS(G4int pType, G4double aNucl, G4double zNucl)
 #ifdef G4VERBOSE
     if (GetVerboseLevel() > 2) {
       G4cout << " D2N2 = " <<  v2/(dw*da*(selec1.V10));
-      G4cout << " v2 = " << v2 << endl;
+      G4cout << " v2 = " << v2 << G4endl;
     }
 #endif 
 
@@ -462,7 +462,7 @@ G4double G4Mars5GeVMechanism::SelBS(G4int pType, G4double aNucl, G4double zNucl)
       selec1.V  = 0.0;
 #ifdef G4VERBOSE
       if (GetVerboseLevel() > 2) {
-	G4cout << "exceed retry limit !!" << endl;
+	G4cout << "exceed retry limit !!" << G4endl;
       }
 #endif 
       return selec1.V;
@@ -880,7 +880,7 @@ void G4Mars5GeVMechanism::Trans(G4ThreeVector* d1,G4ThreeVector* d2)
  
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::Trans() " << endl;
+    G4cout << " G4Mars5GeVMechanism::Trans() " << G4endl;
   }
 #endif
  // Direction cosine transformation
@@ -925,7 +925,7 @@ G4VParticleChange* G4Mars5GeVMechanism::ApplyMath(
   G4VParticleChange* pChange = (pVPChange);
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " G4Mars5GeVMechanism::ApplyMath" << endl;
+    G4cout << " G4Mars5GeVMechanism::ApplyMath" << G4endl;
   }
 #endif
   G4Track* incidentTrack = aStep.GetTrack();
@@ -940,7 +940,7 @@ G4VParticleChange* G4Mars5GeVMechanism::ApplyMath(
   if ( !IsApplicable(incidentMarsEncoding) ) return pChange; 
 #ifdef G4VERBOSE
   if (GetVerboseLevel() > 2) {
-    G4cout << " OK the particle is applicable" << endl;
+    G4cout << " OK the particle is applicable" << G4endl;
   }
 #endif
 
diff --git a/source/track/src/G4ParticleChange.cc b/source/track/src/G4ParticleChange.cc
index ecfc8bc0e6..f90eeabc05 100644
--- a/source/track/src/G4ParticleChange.cc
+++ b/source/track/src/G4ParticleChange.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChange.cc,v 1.7.6.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChange.cc,v 1.9 2000/01/18 02:54:14 kurasige Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -36,7 +36,7 @@ G4ParticleChange::G4ParticleChange():G4VParticleChange(false)
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChange::G4ParticleChange() " << endl;
+    G4cout << "G4ParticleChange::G4ParticleChange() " << G4endl;
   }
 #endif
 }
@@ -45,7 +45,7 @@ G4ParticleChange::G4ParticleChange(G4bool useEB):G4VParticleChange(useEB)
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChange::G4ParticleChange() " << endl;
+    G4cout << "G4ParticleChange::G4ParticleChange() " << G4endl;
   }
 #endif
 }
@@ -54,7 +54,7 @@ G4ParticleChange::~G4ParticleChange()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChange::~G4ParticleChange() " << endl;
+    G4cout << "G4ParticleChange::~G4ParticleChange() " << G4endl;
   }
 #endif
 }
@@ -63,7 +63,7 @@ G4ParticleChange::~G4ParticleChange()
 G4ParticleChange::G4ParticleChange(const G4ParticleChange &right): G4VParticleChange(right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChange::  copy constructor is called " << endl;
+    G4cout << "G4ParticleChange::  copy constructor is called " << G4endl;
    }
    theMomentumDirectionChange = right.theMomentumDirectionChange;
    thePolarizationChange = right.thePolarizationChange;
@@ -79,7 +79,7 @@ G4ParticleChange::G4ParticleChange(const G4ParticleChange &right): G4VParticleCh
 G4ParticleChange & G4ParticleChange::operator=(const G4ParticleChange &right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChange:: assignment operator is called " << endl;
+    G4cout << "G4ParticleChange:: assignment operator is called " << G4endl;
    }
    if (this != &right)
    {
@@ -366,52 +366,50 @@ void G4ParticleChange::DumpInfo() const
   G4cout.precision(3);
 
   G4cout << "        Mass (GeV)   : " 
-       << setw(20) << theMassChange/GeV
-       << endl; 
+       << G4std::setw(20) << theMassChange/GeV
+       << G4endl; 
   G4cout << "        Charge (eplus)   : " 
-       << setw(20) << theChargeChange/eplus
-       << endl; 
+       << G4std::setw(20) << theChargeChange/eplus
+       << G4endl; 
   G4cout << "        Position - x (mm)   : " 
-       << setw(20) << thePositionChange.x()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.x()/mm
+       << G4endl; 
   G4cout << "        Position - y (mm)   : " 
-       << setw(20) << thePositionChange.y()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.y()/mm
+       << G4endl; 
   G4cout << "        Position - z (mm)   : " 
-       << setw(20) << thePositionChange.z()/mm
-       << endl;
+       << G4std::setw(20) << thePositionChange.z()/mm
+       << G4endl;
   G4cout << "        Time (ns)           : " 
-       << setw(20) << theTimeChange/ns
-       << endl;
+       << G4std::setw(20) << theTimeChange/ns
+       << G4endl;
   G4cout << "        Proper Time (ns)    : " 
-       << setw(20) << theProperTimeChange/ns
-       << endl;
+       << G4std::setw(20) << theProperTimeChange/ns
+       << G4endl;
   G4cout << "        Momentum Direct - x : " 
-       << setw(20) << theMomentumDirectionChange.x()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.x()
+       << G4endl;
   G4cout << "        Momentum Direct - y : " 
-       << setw(20) << theMomentumDirectionChange.y()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.y()
+       << G4endl;
   G4cout << "        Momentum Direct - z : " 
-       << setw(20) << theMomentumDirectionChange.z()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.z()
+       << G4endl;
   G4cout << "        Kinetic Energy (MeV): " 
-       << setw(20) << theEnergyChange/MeV
-       << endl;
+       << G4std::setw(20) << theEnergyChange/MeV
+       << G4endl;
   G4cout << "        Polarization - x    : " 
-       << setw(20) << thePolarizationChange.x()
-       << endl;
+       << G4std::setw(20) << thePolarizationChange.x()
+       << G4endl;
   G4cout << "        Polarization - y    : " 
-       << setw(20) << thePolarizationChange.y()
-       << endl;
+       << G4std::setw(20) << thePolarizationChange.y()
+       << G4endl;
   G4cout << "        Polarization - z    : " 
-       << setw(20) <<  thePolarizationChange.z()
-       << endl;
-  if (fUseEB) {
-    G4cout << "        Track Weight      : " 
-         << setw(20) <<  theWeightChange
-         << endl;	
-  }
+       << G4std::setw(20) <<  thePolarizationChange.z()
+       << G4endl;
+  G4cout << "        Track Weight      : " 
+         << G4std::setw(20) <<  theWeightChange
+         << G4endl;	
 }
 
 G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
@@ -430,8 +428,8 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
     accuracy = abs(theMomentumDirectionChange.mag2()-1.0);
     if (accuracy > accuracyForWarning) {
       G4cout << "  G4ParticleChange::CheckIt  : ";
-      G4cout << "the Momentum Change is not unit vector !!" << endl;
-      G4cout << "  Difference:  " << accuracy << endl;
+      G4cout << "the Momentum Change is not unit vector !!" << G4endl;
+      G4cout << "  Difference:  " << accuracy << G4endl;
       itsOKforMomentum = false;
       if (accuracy > accuracyForException) exitWithError = true;
     }
@@ -442,8 +440,8 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
   accuracy = (aTrack.GetGlobalTime()- theTimeChange)/ns;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChange::CheckIt    : ";
-    G4cout << "the global time goes back  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[ns] " <<endl;
+    G4cout << "the global time goes back  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[ns] " <<G4endl;
     itsOKforGlobalTime = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -452,8 +450,8 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
   accuracy = (aTrack.GetProperTime() - theProperTimeChange )/ns;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChange::CheckIt    : ";
-    G4cout << "the proper time goes back  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[ns] " <<endl;
+    G4cout << "the proper time goes back  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[ns] " <<G4endl;
     itsOKforProperTime = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -463,8 +461,8 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
   accuracy = -1.0*theEnergyChange/MeV;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChange::CheckIt    : ";
-    G4cout << "the kinetic energy is negative  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<endl;
+    G4cout << "the kinetic energy is negative  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<G4endl;
     itsOKforEnergy = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -472,8 +470,8 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
   G4bool itsOK = itsOKforMomentum && itsOKforEnergy && itsOKforProperTime && itsOKforGlobalTime;
   // dump out information of this particle change
   if (!itsOK) { 
-    G4cout << " G4ParticleChange::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4ParticleChange::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
 
diff --git a/source/track/src/G4ParticleChangeForDecay.cc b/source/track/src/G4ParticleChangeForDecay.cc
index 553a5d6f33..ec89fbd4e1 100644
--- a/source/track/src/G4ParticleChangeForDecay.cc
+++ b/source/track/src/G4ParticleChangeForDecay.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForDecay.cc,v 1.3.8.1 1999/12/07 20:53:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForDecay.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,7 +31,7 @@ G4ParticleChangeForDecay::G4ParticleChangeForDecay():G4VParticleChange()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForDecay::G4ParticleChangeForDecay() " << endl;
+    G4cout << "G4ParticleChangeForDecay::G4ParticleChangeForDecay() " << G4endl;
   }
 #endif
 }
@@ -40,7 +40,7 @@ G4ParticleChangeForDecay::~G4ParticleChangeForDecay()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForDecay::~G4ParticleChangeForDecay() " << endl;
+    G4cout << "G4ParticleChangeForDecay::~G4ParticleChangeForDecay() " << G4endl;
   }
 #endif
 }
@@ -135,8 +135,8 @@ void G4ParticleChangeForDecay::DumpInfo() const
 
   G4cout.precision(3);
   G4cout << "        Time (ns)           : " 
-       << setw(20) << theTimeChange/ns
-       << endl;
+       << G4std::setw(20) << theTimeChange/ns
+       << G4endl;
 }
 
 G4bool G4ParticleChangeForDecay::CheckIt(const G4Track& aTrack)
@@ -150,16 +150,16 @@ G4bool G4ParticleChangeForDecay::CheckIt(const G4Track& aTrack)
   accuracy = -1.0*(theTimeChange - aTrack.GetGlobalTime())/ns;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChangeForDecay::CheckIt    : ";
-    G4cout << "the global time goes back  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[ns] " <<endl;
+    G4cout << "the global time goes back  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[ns] " <<G4endl;
     itsOK = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
 
   // dump out information of this particle change
   if (!itsOK) { 
-    G4cout << " G4ParticleChangeForDecay::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4ParticleChangeForDecay::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
 
diff --git a/source/track/src/G4ParticleChangeForLoss.cc b/source/track/src/G4ParticleChangeForLoss.cc
index cf17c72aa1..40afed8bb6 100644
--- a/source/track/src/G4ParticleChangeForLoss.cc
+++ b/source/track/src/G4ParticleChangeForLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForLoss.cc,v 1.3.8.1 1999/12/07 20:53:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForLoss.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,7 +31,7 @@ G4ParticleChangeForLoss::G4ParticleChangeForLoss():G4VParticleChange()
   debugFlag = false;
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForLoss::G4ParticleChangeForLoss() " << endl;
+    G4cout << "G4ParticleChangeForLoss::G4ParticleChangeForLoss() " << G4endl;
   }
 #endif
 }
@@ -40,7 +40,7 @@ G4ParticleChangeForLoss::~G4ParticleChangeForLoss()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForLoss::~G4ParticleChangeForLoss() " << endl;
+    G4cout << "G4ParticleChangeForLoss::~G4ParticleChangeForLoss() " << G4endl;
   }
 #endif
 }
@@ -49,7 +49,7 @@ G4ParticleChangeForLoss::~G4ParticleChangeForLoss()
 G4ParticleChangeForLoss::G4ParticleChangeForLoss(const G4ParticleChangeForLoss &right): G4VParticleChange(right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChangeForLoss::  copy constructor is called " << endl;
+    G4cout << "G4ParticleChangeForLoss::  copy constructor is called " << G4endl;
    }
    theEnergyChange = right.theEnergyChange;
 }
@@ -58,7 +58,7 @@ G4ParticleChangeForLoss::G4ParticleChangeForLoss(const G4ParticleChangeForLoss &
 G4ParticleChangeForLoss & G4ParticleChangeForLoss::operator=(const G4ParticleChangeForLoss &right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChangeForLoss:: assignment operator is called " << endl;
+    G4cout << "G4ParticleChangeForLoss:: assignment operator is called " << G4endl;
    }
    if (this != &right)
    {
@@ -140,8 +140,8 @@ void G4ParticleChangeForLoss::DumpInfo() const
 
   G4cout.precision(3);
   G4cout << "        Kinetic Energy (MeV): " 
-       << setw(20) << theEnergyChange/MeV
-       << endl;
+       << G4std::setw(20) << theEnergyChange/MeV
+       << G4endl;
 }
 
 G4bool G4ParticleChangeForLoss::CheckIt(const G4Track& aTrack)
@@ -155,16 +155,16 @@ G4bool G4ParticleChangeForLoss::CheckIt(const G4Track& aTrack)
   accuracy = ( theEnergyChange - aTrack.GetKineticEnergy())/MeV;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChangeForLoss::CheckIt    : ";
-    G4cout << "the energy becoes larger than the initial value !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<endl;
+    G4cout << "the energy becoes larger than the initial value !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<G4endl;
     itsOK = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
 
   // dump out information of this particle change
   if (!itsOK) { 
-    G4cout << " G4ParticleChangeForLoss::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4ParticleChangeForLoss::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
 
diff --git a/source/track/src/G4ParticleChangeForMSC.cc b/source/track/src/G4ParticleChangeForMSC.cc
index 4208c56bab..f1dc4a11d9 100644
--- a/source/track/src/G4ParticleChangeForMSC.cc
+++ b/source/track/src/G4ParticleChangeForMSC.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForMSC.cc,v 1.4.8.1 1999/12/07 20:53:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForMSC.cc,v 1.5 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -30,7 +30,7 @@ G4ParticleChangeForMSC::G4ParticleChangeForMSC():G4VParticleChange()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForMSC::G4ParticleChangeForMSC() " << endl;
+    G4cout << "G4ParticleChangeForMSC::G4ParticleChangeForMSC() " << G4endl;
   }
 #endif
 }
@@ -39,7 +39,7 @@ G4ParticleChangeForMSC::~G4ParticleChangeForMSC()
 {
 #ifdef G4VERBOSE
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForMSC::~G4ParticleChangeForMSC() " << endl;
+    G4cout << "G4ParticleChangeForMSC::~G4ParticleChangeForMSC() " << G4endl;
   }
 #endif
 }
@@ -48,7 +48,7 @@ G4ParticleChangeForMSC::G4ParticleChangeForMSC(
              const G4ParticleChangeForMSC &right): G4VParticleChange(right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChangeForMSC::  copy constructor is called " << endl;
+    G4cout << "G4ParticleChangeForMSC::  copy constructor is called " << G4endl;
    }
       theMomentumDirectionChange = right.theMomentumDirectionChange;
       thePositionChange = right.thePositionChange;
@@ -60,7 +60,7 @@ G4ParticleChangeForMSC & G4ParticleChangeForMSC::operator=(
                                    const G4ParticleChangeForMSC &right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChangeForMSC:: assignment operator is called " << endl;
+    G4cout << "G4ParticleChangeForMSC:: assignment operator is called " << G4endl;
    }
    if (this != &right)
    {  
@@ -153,23 +153,23 @@ void G4ParticleChangeForMSC::DumpInfo() const
 
   G4cout.precision(3);
   G4cout << "        Position - x (mm)   : " 
-       << setw(20) << thePositionChange.x()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.x()/mm
+       << G4endl; 
   G4cout << "        Position - y (mm)   : " 
-       << setw(20) << thePositionChange.y()/mm
-       << endl; 
+       << G4std::setw(20) << thePositionChange.y()/mm
+       << G4endl; 
   G4cout << "        Position - z (mm)   : " 
-       << setw(20) << thePositionChange.z()/mm
-       << endl;
+       << G4std::setw(20) << thePositionChange.z()/mm
+       << G4endl;
   G4cout << "     Momentum Direction - x : " 
-       << setw(20) << theMomentumDirectionChange.x()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.x()
+       << G4endl;
   G4cout << "     Momentum Direction - y : " 
-       << setw(20) << theMomentumDirectionChange.y()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.y()
+       << G4endl;
   G4cout << "     Momentum Direction - z : " 
-       << setw(20) << theMomentumDirectionChange.z()
-       << endl;
+       << G4std::setw(20) << theMomentumDirectionChange.z()
+       << G4endl;
 }
 
 
@@ -186,16 +186,16 @@ G4bool G4ParticleChangeForMSC::CheckIt(const G4Track& aTrack)
   accuracy = abs(theMomentumDirectionChange.mag2()-1.0);
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4ParticleChangeForMSC::CheckIt  : ";
-    G4cout << "the Momentum Change is not unit vector !!" << endl;
-    G4cout << "  Difference:  " << accuracy << endl;
+    G4cout << "the Momentum Change is not unit vector !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy << G4endl;
     itsOK = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
 
   // dump out information of this particle change
   if (!itsOK) { 
-    G4cout << " G4ParticleChangeForMSC::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4ParticleChangeForMSC::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
 
diff --git a/source/track/src/G4ParticleChangeForTransport.cc b/source/track/src/G4ParticleChangeForTransport.cc
index 9b3c4a03ee..1127e8433d 100644
--- a/source/track/src/G4ParticleChangeForTransport.cc
+++ b/source/track/src/G4ParticleChangeForTransport.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForTransport.cc,v 1.4.8.1 1999/12/07 20:53:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ParticleChangeForTransport.cc,v 1.5 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -31,14 +31,14 @@
 G4ParticleChangeForTransport::G4ParticleChangeForTransport():G4ParticleChange()
 {
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForTransport::G4ParticleChangeForTransport() " << endl;
+    G4cout << "G4ParticleChangeForTransport::G4ParticleChangeForTransport() " << G4endl;
   }
 }
 
 G4ParticleChangeForTransport::~G4ParticleChangeForTransport() 
 {
   if (verboseLevel>2) {
-    G4cout << "G4ParticleChangeForTransport::~G4ParticleChangeForTransport() " << endl;
+    G4cout << "G4ParticleChangeForTransport::~G4ParticleChangeForTransport() " << G4endl;
   }
 }
 
@@ -46,7 +46,7 @@ G4ParticleChangeForTransport::~G4ParticleChangeForTransport()
 G4ParticleChangeForTransport::G4ParticleChangeForTransport(const G4ParticleChangeForTransport &right):G4ParticleChange(right)
 {
   if (verboseLevel>0) {
-    G4cout << "G4ParticleChangeForTransport::  copy constructor is called " << endl;
+    G4cout << "G4ParticleChangeForTransport::  copy constructor is called " << G4endl;
   }
   theTouchableChange = right.theTouchableChange;
 }
@@ -55,7 +55,7 @@ G4ParticleChangeForTransport::G4ParticleChangeForTransport(const G4ParticleChang
 G4ParticleChangeForTransport & G4ParticleChangeForTransport::operator=(const G4ParticleChangeForTransport &right)
 {
    if (verboseLevel>1) {
-    G4cout << "G4ParticleChangeForTransport:: assignment operator is called " << endl;
+    G4cout << "G4ParticleChangeForTransport:: assignment operator is called " << G4endl;
    }
    if (this != &right)
    {
@@ -84,8 +84,8 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForAtRest(G4Step* pStep)
 { 
   // Nothing happens for AtRestDoIt
   if (verboseLevel>0) {
-    G4cout << "G4ParticleChangeForTransport::UpdateStepForAtRest() is called" << endl; 
-    G4cout << " Nothing happens for this method " << endl; 
+    G4cout << "G4ParticleChangeForTransport::UpdateStepForAtRest() is called" << G4endl; 
+    G4cout << " Nothing happens for this method " << G4endl; 
   }
   //  Update the G4Step specific attributes 
   return UpdateStepInfo(pStep);
@@ -198,8 +198,8 @@ void G4ParticleChangeForTransport::DumpInfo() const
 
   G4cout.precision(3);
   G4cout << "        Touchable (pointer) : " 
-       << setw(20) << theTouchableChange
-       << endl; 
+       << G4std::setw(20) << theTouchableChange
+       << G4endl; 
 }
 
 
diff --git a/source/track/src/G4Step.cc b/source/track/src/G4Step.cc
index 4e0c3c6f24..3a28fa68bc 100644
--- a/source/track/src/G4Step.cc
+++ b/source/track/src/G4Step.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Step.cc,v 1.3.8.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Step.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4StepPoint.cc b/source/track/src/G4StepPoint.cc
index e341eaf166..01401eb38e 100644
--- a/source/track/src/G4StepPoint.cc
+++ b/source/track/src/G4StepPoint.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StepPoint.cc,v 1.1.10.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4StepPoint.cc,v 1.2 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4Track.cc b/source/track/src/G4Track.cc
index 9e42742371..fb508e58ca 100644
--- a/source/track/src/G4Track.cc
+++ b/source/track/src/G4Track.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Track.cc,v 1.2.6.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Track.cc,v 1.3 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4VEvtBiasMechanism.cc b/source/track/src/G4VEvtBiasMechanism.cc
index 6fe46d79f5..a2e7f3f14f 100644
--- a/source/track/src/G4VEvtBiasMechanism.cc
+++ b/source/track/src/G4VEvtBiasMechanism.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VEvtBiasMechanism.cc,v 1.1.8.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VEvtBiasMechanism.cc,v 1.2 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4VParticleChange.cc b/source/track/src/G4VParticleChange.cc
index b3056a3e38..bad915791f 100644
--- a/source/track/src/G4VParticleChange.cc
+++ b/source/track/src/G4VParticleChange.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VParticleChange.cc,v 1.3.8.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VParticleChange.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -153,31 +153,31 @@ void G4VParticleChange::DumpInfo() const
 // Show header
   G4cout.precision(3);
   G4cout << "      -----------------------------------------------" 
-       << endl;
-  G4cout << "        G4ParticleChange Information  " << setw(20) << endl;
+       << G4endl;
+  G4cout << "        G4ParticleChange Information  " << G4std::setw(20) << G4endl;
   G4cout << "      -----------------------------------------------" 
-       << endl;
+       << G4endl;
 
   G4cout << "        # of 2ndaries       : " 
-       << setw(20) << theNumberOfSecondaries
-       << endl;
+       << G4std::setw(20) << theNumberOfSecondaries
+       << G4endl;
 
   if (theNumberOfSecondaries >0) {
     G4cout << "        Pointer to 2ndaries : " 
-         << setw(20) << GetSecondary(0)
-         << endl;
+         << G4std::setw(20) << GetSecondary(0)
+         << G4endl;
     G4cout << "        (Showed only 1st one)"
-         << endl;
+         << G4endl;
   }
   G4cout << "      -----------------------------------------------" 
-       << endl;
+       << G4endl;
 
   G4cout << "        Energy Deposit (MeV): " 
-       << setw(20) << theLocalEnergyDeposit/MeV
-       << endl;
+       << G4std::setw(20) << theLocalEnergyDeposit/MeV
+       << G4endl;
 
   G4cout << "        Track Status        : " 
-       << setw(20);
+       << G4std::setw(20);
        if( theStatusChange == fAlive ){
          G4cout << " Alive";
        } else if( theStatusChange == fStopButAlive ){
@@ -191,20 +191,20 @@ void G4VParticleChange::DumpInfo() const
        } else if( theStatusChange == fPostponeToNextEvent ){
            G4cout << " PostponeToNextEvent";
        }
-       G4cout << endl;
+       G4cout << G4endl;
   G4cout << "        True Path Length (mm) : " 
-       << setw(20) << theTrueStepLength/mm
-       << endl;
+       << G4std::setw(20) << theTrueStepLength/mm
+       << G4endl;
   G4cout << "        Stepping Control     : " 
-       << setw(20) << theSteppingControlFlag
-       << endl;   
+       << G4std::setw(20) << theSteppingControlFlag
+       << G4endl;   
   G4cout << "        Event Biasing        : ";
   if (fUseEB) {
-    G4cout << setw(20) << theEBMechanism->GetName();
+    G4cout << G4std::setw(20) << theEBMechanism->GetName();
   } else {
     G4cout << " not used ";
   }
-  G4cout << endl;      
+  G4cout << G4endl;      
 }
 
 G4bool G4VParticleChange::CheckIt(const G4Track& aTrack)
@@ -219,8 +219,8 @@ G4bool G4VParticleChange::CheckIt(const G4Track& aTrack)
   accuracy = -1.0*theLocalEnergyDeposit/MeV;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4VParticleChange::CheckIt    : ";
-    G4cout << "the energy deposit  is negative  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<endl;
+    G4cout << "the energy deposit  is negative  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<G4endl;
     itsOKforEnergy = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -230,8 +230,8 @@ G4bool G4VParticleChange::CheckIt(const G4Track& aTrack)
   accuracy = -1.0*theTrueStepLength/mm;
   if (accuracy > accuracyForWarning) {
     G4cout << "  G4VParticleChange::CheckIt    : ";
-    G4cout << "the true step length is negative  !!" << endl;
-    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<endl;
+    G4cout << "the true step length is negative  !!" << G4endl;
+    G4cout << "  Difference:  " << accuracy  << "[MeV] " <<G4endl;
     itsOKforStepLength = false;
     if (accuracy > accuracyForException) exitWithError = true;
   }
@@ -239,8 +239,8 @@ G4bool G4VParticleChange::CheckIt(const G4Track& aTrack)
   G4bool itsOK = itsOKforStepLength && itsOKforEnergy ;
   // dump out information of this particle change
   if (! itsOK ){
-    G4cout << " G4VParticleChange::CheckIt " <<endl;
-    G4cout << " pointer : " << this <<endl ;
+    G4cout << " G4VParticleChange::CheckIt " <<G4endl;
+    G4cout << " pointer : " << this <<G4endl ;
     DumpInfo();
   }
 
diff --git a/source/tracking/History b/source/tracking/History
index 23deb41ed0..17884c72f9 100644
--- a/source/tracking/History
+++ b/source/tracking/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.8 1999/10/22 03:20:48 tsasaki Exp $
+$Id: History,v 1.9 2000/01/23 09:51:16 tsasaki Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,9 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Jan 23, 00 T.Sasaki 
+- GetCurrentValue() in G4TrackingMessenger.cc have a return value
+- SetUserAction in G4SteppingManager.hh protected null pointers
 Oct 22, 99 T.Sasaki G4SteppingMangaer.cc fixed the UserLmit problem     
 Oct 13, 99 T.Sasaki updated G4SteppingVerbose and G4VSteppingVerbose 
 Jun 29, 99 G.Folger have the ctor always assign a SteppingVerbose to fVerbose
diff --git a/source/tracking/include/G4SteppingManager.hh b/source/tracking/include/G4SteppingManager.hh
index 3dd14e9a06..da7d98f8b1 100644
--- a/source/tracking/include/G4SteppingManager.hh
+++ b/source/tracking/include/G4SteppingManager.hh
@@ -5,9 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingManager.hh,v 1.6.4.1.2.1 1999/12/07 20:53:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
-//
+// $Id: G4SteppingManager.hh,v 1.11 2000/01/26 04:20:30 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 //---------------------------------------------------------------
 //
@@ -33,7 +32,7 @@ class G4SteppingManager;
 #define G4SteppingManager_h 1
 
 #include "G4ios.hh"                 // Include from 'system'
-#include <iomanip.h>                  // Include from 'system'
+#include "g4std/iomanip"                  // Include from 'system'
 #include "globals.hh"                 // Include from 'global'
 #include "Randomize.hh"               // Include from 'global'
 #include "G4Navigator.hh"             // Include from 'geometry'
@@ -474,8 +473,7 @@ class G4SteppingManager
   }
 
   inline void G4SteppingManager::SetUserAction(G4UserSteppingAction* apAction){
-    if (fUserSteppingAction) delete fUserSteppingAction;
-    fUserSteppingAction = apAction;
+    if (apAction != NULL) fUserSteppingAction = apAction;
   }
   inline G4UserSteppingAction* G4SteppingManager::GetUserAction(){
     return fUserSteppingAction;
@@ -498,7 +496,7 @@ class G4SteppingManager
   }
 
   inline G4double G4SteppingManager::CalculateSafety(){
-    return max( endpointSafety -
+    return G4std::max( endpointSafety -
 		(endpointSafOrigin - fPostStepPoint->GetPosition()).mag(),
 	        0.);
   }
diff --git a/source/tracking/include/G4SteppingManager.icc b/source/tracking/include/G4SteppingManager.icc
index b098cd97eb..3da058b4e8 100644
--- a/source/tracking/include/G4SteppingManager.icc
+++ b/source/tracking/include/G4SteppingManager.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingManager.icc,v 1.3.6.1 1999/12/07 20:53:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SteppingManager.icc,v 1.4 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -289,10 +289,10 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
             if( tBelowCutEnergyAndSafety ){
                 if( !(tempSecondaryTrack->IsGoodForTracking()) ){
 
-////                   G4cout << "!! Warning - G4SteppingManager:" << endl; 
+////                   G4cout << "!! Warning - G4SteppingManager:" << G4endl; 
 ////                        << " This physics process generated a secondary"
 ////                        << " of which energy is below cut but" 
-////                        << " GoodForTracking is off !!!!!" << endl;
+////                        << " GoodForTracking is off !!!!!" << G4endl;
 
                    // Add kinetic energy to the total energy deposit
                    fStep->AddTotalEnergyDeposit(
@@ -394,10 +394,10 @@ inline void G4SteppingManager::InvokeAlongStepDoItProcs()
             if( tBelowCutEnergyAndSafety ){
                 if( !(tempSecondaryTrack->IsGoodForTracking()) ){
 
-////                   G4cout << "!! Warning - G4SteppingManager:" << endl; 
+////                   G4cout << "!! Warning - G4SteppingManager:" << G4endl; 
 ////                        << " This physics process generated a secondary"
 ////                        << " of which energy is below cut but" 
-////                        << " GoodForTracking is off !!!!!" << endl;
+////                        << " GoodForTracking is off !!!!!" << G4endl;
 
                    // Add kinetic energy to the total energy deposit
                    fStep->AddTotalEnergyDeposit(
@@ -505,10 +505,10 @@ inline void G4SteppingManager::InvokePostStepDoItProcs()
                if( tBelowCutEnergyAndSafety ){
                    if( !(tempSecondaryTrack->IsGoodForTracking()) ){
 
-////                      G4cout << "!! Warning - G4SteppingManager:" << endl; 
+////                      G4cout << "!! Warning - G4SteppingManager:" << G4endl; 
 ////                           << " This physics process generated a secondary"
 ////                           << " of which energy is below cut but" 
-////                           << " GoodForTracking is off !!!!!" << endl;
+////                           << " GoodForTracking is off !!!!!" << G4endl;
 
                       // Add kinetic energy to the total energy deposit
                       fStep->AddTotalEnergyDeposit(
diff --git a/source/tracking/include/G4SteppingVerbose.hh b/source/tracking/include/G4SteppingVerbose.hh
index aa9f05ef5a..92d4d9860e 100644
--- a/source/tracking/include/G4SteppingVerbose.hh
+++ b/source/tracking/include/G4SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingVerbose.hh,v 1.6.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SteppingVerbose.hh,v 1.7 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4TrackVector.hh b/source/tracking/include/G4TrackVector.hh
index 0055784bec..b992a14d5b 100644
--- a/source/tracking/include/G4TrackVector.hh
+++ b/source/tracking/include/G4TrackVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackVector.hh,v 1.3.4.1.2.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackVector.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4TrackingManager.hh b/source/tracking/include/G4TrackingManager.hh
index ac5ab43002..7aab8d5921 100644
--- a/source/tracking/include/G4TrackingManager.hh
+++ b/source/tracking/include/G4TrackingManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingManager.hh,v 1.4.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackingManager.hh,v 1.7 2000/01/26 04:20:30 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -156,14 +156,17 @@ class G4TrackingManager
    }
 
    inline void G4TrackingManager::SetUserAction(G4UserTrackingAction* apAction){
-     if (fpUserTrackingAction) delete fpUserTrackingAction;
      fpUserTrackingAction = apAction;
-     apAction->SetTrackingManagerPointer(this);
+     if(apAction != NULL){
+       apAction->SetTrackingManagerPointer(this);
+     }	
    }
 
    inline void G4TrackingManager::SetUserAction(G4UserSteppingAction* apAction){
      fpSteppingManager->SetUserAction(apAction);
-     apAction->SetSteppingManagerPointer(fpSteppingManager);  
+     if(apAction != NULL){
+       apAction->SetSteppingManagerPointer(fpSteppingManager);  
+     }	
    }
 
    inline void G4TrackingManager::SetVerboseLevel(G4int vLevel){ 
diff --git a/source/tracking/include/G4TrackingMessenger.hh b/source/tracking/include/G4TrackingMessenger.hh
index fe8b94ad53..4d37b86f5b 100644
--- a/source/tracking/include/G4TrackingMessenger.hh
+++ b/source/tracking/include/G4TrackingMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingMessenger.hh,v 1.4.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackingMessenger.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4Trajectory.hh b/source/tracking/include/G4Trajectory.hh
index de88a49834..59fd43db10 100644
--- a/source/tracking/include/G4Trajectory.hh
+++ b/source/tracking/include/G4Trajectory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trajectory.hh,v 1.6.4.1.2.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trajectory.hh,v 1.9 2000/01/26 04:20:31 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -89,6 +89,7 @@ class G4Trajectory : public G4VTrajectory
    virtual int GetPointEntries() const { return positionRecord->entries(); }
    virtual G4VTrajectoryPoint* GetPoint(G4int i) const 
    { return (*positionRecord)[i]; }
+   virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
 
    G4ParticleDefinition* GetParticleDefinition();
 
diff --git a/source/tracking/include/G4TrajectoryPoint.hh b/source/tracking/include/G4TrajectoryPoint.hh
index f2d37c280a..d85097e2cc 100644
--- a/source/tracking/include/G4TrajectoryPoint.hh
+++ b/source/tracking/include/G4TrajectoryPoint.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoryPoint.hh,v 1.4.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoryPoint.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4UserSteppingAction.hh b/source/tracking/include/G4UserSteppingAction.hh
index 4c1878a3c8..adf9480680 100644
--- a/source/tracking/include/G4UserSteppingAction.hh
+++ b/source/tracking/include/G4UserSteppingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserSteppingAction.hh,v 1.4.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserSteppingAction.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4UserTrackingAction.hh b/source/tracking/include/G4UserTrackingAction.hh
index 375324aef2..1687b322f0 100644
--- a/source/tracking/include/G4UserTrackingAction.hh
+++ b/source/tracking/include/G4UserTrackingAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserTrackingAction.hh,v 1.4.6.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserTrackingAction.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4VSteppingVerbose.hh b/source/tracking/include/G4VSteppingVerbose.hh
index c909fb7b18..53405608a8 100644
--- a/source/tracking/include/G4VSteppingVerbose.hh
+++ b/source/tracking/include/G4VSteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSteppingVerbose.hh,v 1.2.4.1.2.1 1999/12/07 20:53:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSteppingVerbose.hh,v 1.4 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4VTrajectory.hh b/source/tracking/include/G4VTrajectory.hh
index a0275f05bf..7f5806fac4 100644
--- a/source/tracking/include/G4VTrajectory.hh
+++ b/source/tracking/include/G4VTrajectory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTrajectory.hh,v 1.2.6.1 1999/12/07 20:53:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VTrajectory.hh,v 1.4 2000/01/26 04:20:31 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -45,6 +45,7 @@ class G4VTrajectory
    virtual void AppendStep(const G4Step*) = 0;
    virtual int GetPointEntries() const = 0;
    virtual G4VTrajectoryPoint* GetPoint(int) const = 0;
+   virtual void MergeTrajectory(G4VTrajectory*) = 0;
 };
 
 #endif
diff --git a/source/tracking/include/G4VTrajectoryPoint.hh b/source/tracking/include/G4VTrajectoryPoint.hh
index 3ebd8cbf49..319d43da77 100644
--- a/source/tracking/include/G4VTrajectoryPoint.hh
+++ b/source/tracking/include/G4VTrajectoryPoint.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTrajectoryPoint.hh,v 1.2.6.1 1999/12/07 20:53:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VTrajectoryPoint.hh,v 1.3 1999/12/15 14:53:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VTrajectoryPoint_h
diff --git a/source/tracking/src/G4SteppingManager.cc b/source/tracking/src/G4SteppingManager.cc
index 197e83312f..63ff7e873f 100644
--- a/source/tracking/src/G4SteppingManager.cc
+++ b/source/tracking/src/G4SteppingManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingManager.cc,v 1.7.6.1 1999/12/07 20:53:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SteppingManager.cc,v 1.8 1999/12/15 14:53:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -168,7 +168,7 @@ G4StepStatus G4SteppingManager::Stepping()
 
      // Update safety after invocation of all AlongStepDoIts
      endpointSafOrigin= fPostStepPoint->GetPosition();
-     endpointSafety=  max( proposedSafety - GeomStepLength, 0.);
+     endpointSafety=  G4std::max( proposedSafety - GeomStepLength, 0.);
 
      fStep->GetPostStepPoint()->SetSafety( endpointSafety );
 
diff --git a/source/tracking/src/G4SteppingVerbose.cc b/source/tracking/src/G4SteppingVerbose.cc
index 9b94edeae9..626e86f932 100644
--- a/source/tracking/src/G4SteppingVerbose.cc
+++ b/source/tracking/src/G4SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingVerbose.cc,v 1.5.6.1 1999/12/07 20:53:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SteppingVerbose.cc,v 1.6 1999/12/15 14:53:58 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -41,7 +41,7 @@ G4SteppingVerbose::G4SteppingVerbose()
 //////////////////////////////////////////////////
 {
 #ifdef G4_TRACKING_DEBUG
-   G4cout << "G4SteppingVerbose has instantiated" << endl;
+   G4cout << "G4SteppingVerbose has instantiated" << G4endl;
 #endif
 }
 
@@ -67,7 +67,7 @@ void G4SteppingVerbose::AtRestDoItInvoked()
 
    if(verboseLevel >= 3 ){     
      G4int npt=0;
-     G4cout << " **List of AtRestDoIt invoked:" << endl;
+     G4cout << " **List of AtRestDoIt invoked:" << G4endl;
      for(size_t np=0; np < MAXofAtRestLoops; np++){
        size_t npGPIL = MAXofAtRestLoops-np-1;
        if( (*fSelectedAtRestDoItVector)(npGPIL) == 2 ){
@@ -75,44 +75,44 @@ void G4SteppingVerbose::AtRestDoItInvoked()
 	 ptProcManager = (*fAtRestDoItVector)(np);
 	 G4cout << "   # " << npt << " : " 
 	   << ptProcManager->GetProcessName() 
-	     << " (Forced)" << endl;
+	     << " (Forced)" << G4endl;
        } else if ( (*fSelectedAtRestDoItVector)(npGPIL) == 1 ){
 	 npt++;                
 	 ptProcManager = (*fAtRestDoItVector)(np);
 	 G4cout << "   # " << npt << " : " 
-	   << ptProcManager->GetProcessName() << endl;
+	   << ptProcManager->GetProcessName() << G4endl;
        }
      }
      
-     G4cout << "   Generated secondries # : " << fN2ndariesAtRestDoIt << endl;
+     G4cout << "   Generated secondries # : " << fN2ndariesAtRestDoIt << G4endl;
      
      if( fN2ndariesAtRestDoIt > 0 ){
        G4cout << "   -- List of secondaries generated : " 
-	 << "(x,y,z,kE,t,PID) --" << endl; 
+	 << "(x,y,z,kE,t,PID) --" << G4endl; 
        for( G4int lp1=(*fSecondary).entries()-fN2ndariesAtRestDoIt; 
 	   lp1<(*fSecondary).entries(); lp1++){
 	 G4cout << "      "
-		<< setw( 9)
+		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length") << " "
-		<< setw( 9)
+		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length") << " "
-		<< setw( 9)
+		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length") << " "
-		<< setw( 9)
+		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy") << " "
-		<< setw( 9)
+		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetGlobalTime(),"Time") << " "
-		<< setw(18)
+		<< G4std::setw(18)
 		<< (*fSecondary)[lp1]->GetDefinition()
 	                             ->GetParticleName();
-	 G4cout << endl;
+	 G4cout << G4endl;
        }
      }
    }
    
    if( verboseLevel >= 4 ){ 
      ShowStep();
-     G4cout << endl;
+     G4cout << G4endl;
    }
 }
 /////////////////////////////////////////////////////
@@ -124,42 +124,42 @@ void G4SteppingVerbose::AlongStepDoItAllDone()
    CopyState();
 
      if(verboseLevel >= 3){ 
-        G4cout << endl;
-        G4cout << " >>AlongStepDoIt (after all invocations):" << endl;
-        G4cout << "    ++List of invoked processes " << endl;
+        G4cout << G4endl;
+        G4cout << " >>AlongStepDoIt (after all invocations):" << G4endl;
+        G4cout << "    ++List of invoked processes " << G4endl;
  
         for(size_t ci=0; ci<MAXofAlongStepLoops; ci++){
             ptProcManager = (*fAlongStepDoItVector)(ci);
             G4cout << "      " << ci+1 << ") ";
             if(ptProcManager != NULL){
-               G4cout << ptProcManager->GetProcessName() << endl;
+               G4cout << ptProcManager->GetProcessName() << G4endl;
             }
         }         
 
         ShowStep();
-        G4cout << endl;
+        G4cout << G4endl;
         G4cout << "    ++List of secondaries generated " 
              << "(x,y,z,kE,t,PID):"
              << "  No. of secodaries = " 
-             << (*fSecondary).entries() << endl;
+             << (*fSecondary).entries() << G4endl;
 
         if((*fSecondary).entries()>0){
            for(G4int lp1=0; lp1<(*fSecondary).entries(); lp1++){
                G4cout << "      "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetGlobalTime(),"Time")  << " "
-                    << setw(18)
+                    << G4std::setw(18)
                     << (*fSecondary)[lp1]->GetDefinition()
                                          ->GetParticleName();
-               G4cout << endl;
+               G4cout << G4endl;
 	   }
 	}
      }
@@ -176,9 +176,9 @@ void G4SteppingVerbose::PostStepDoItAllDone()
 
    if(verboseLevel >= 3){ 
         G4int npt=0;
-        G4cout << endl;
-        G4cout << " **PostStepDoIt (after all invocations):" << endl;
-        G4cout << "    ++List of invoked processes " << endl;
+        G4cout << G4endl;
+        G4cout << " **PostStepDoIt (after all invocations):" << G4endl;
+        G4cout << "    ++List of invoked processes " << G4endl;
 
         for(size_t np=0; np < MAXofPostStepLoops; np++){
 	    size_t npGPIL = MAXofPostStepLoops-np-1;
@@ -187,41 +187,41 @@ void G4SteppingVerbose::PostStepDoItAllDone()
                ptProcManager = (*fPostStepDoItVector)(np);
                G4cout << "      " << npt << ") " 
                     << ptProcManager->GetProcessName()  
-                    << " (Forced)" << endl;
+                    << " (Forced)" << G4endl;
 	     } else if ((*fSelectedPostStepDoItVector)(npGPIL) == 1){
                npt++;                
                ptProcManager = (*fPostStepDoItVector)(np);
                G4cout << "      " << npt << ") " 
-                    << ptProcManager->GetProcessName() << endl;
+                    << ptProcManager->GetProcessName() << G4endl;
 	     }
 	  }
 
         ShowStep();
-        G4cout << endl;
+        G4cout << G4endl;
         G4cout << "    ++List of secondaries generated " 
              << "(x,y,z,kE,t,PID):"
              << "  No. of secodaries = " 
-             << (*fSecondary).entries() << endl;
+             << (*fSecondary).entries() << G4endl;
         G4cout << "      [Note]Secondaries from AlongStepDoIt included."
-             << endl; 
+             << G4endl; 
 
         if((*fSecondary).entries()>0){
 	  for(G4int lp1=0; lp1<(*fSecondary).entries(); lp1++){
                G4cout << "      "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().y() , "Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().z() , "Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy() , "Energy") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetGlobalTime() , "Time") << " "
-                    << setw(18)
+                    << G4std::setw(18)
                     << (*fSecondary)[lp1]->GetDefinition()
                                          ->GetParticleName();
-               G4cout << endl;
+               G4cout << G4endl;
 	     }
 	}
       }
@@ -238,46 +238,46 @@ void G4SteppingVerbose::StepInfo()
   if( verboseLevel >= 1 ){
     if( verboseLevel >= 4 ) VerboseTrack();
     if( verboseLevel >= 3 ){
-      G4cout << endl;
+      G4cout << G4endl;
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE      
-      G4cout << setw( 5) << "#Step#" << " "
-	     << setw( 8) << "X"      << "     "
-	     << setw( 8) << "Y"      << "     "  
-	     << setw( 8) << "Z"      << "     "
-	     << setw( 9) << "KineE"  << "     "
-	     << setw( 8) << "dE"     << "     "  
-	     << setw(12) << "StepLeng"   << " "  
-	     << setw(12) << "TrackLeng"  << " "
-	     << setw(12) << "NextVolume" << " "
-	     << setw( 8) << "ProcName"   << endl;	       
+      G4cout << G4std::setw( 5) << "#Step#" << " "
+	     << G4std::setw( 8) << "X"      << "     "
+	     << G4std::setw( 8) << "Y"      << "     "  
+	     << G4std::setw( 8) << "Z"      << "     "
+	     << G4std::setw( 9) << "KineE"  << "     "
+	     << G4std::setw( 8) << "dE"     << "     "  
+	     << G4std::setw(12) << "StepLeng"   << " "  
+	     << G4std::setw(12) << "TrackLeng"  << " "
+	     << G4std::setw(12) << "NextVolume" << " "
+	     << G4std::setw( 8) << "ProcName"   << G4endl;	       
 #else
-      G4cout << setw( 5) << "#Step#"     << " "
-	     << setw( 8) << "X(mm)"      << " "
-	     << setw( 8) << "Y(mm)"      << " "  
-	     << setw( 8) << "Z(mm)"      << " "
-	     << setw( 9) << "KinE(MeV)"  << " "
-	     << setw( 8) << "dE(MeV)"    << " "  
-	     << setw( 8) << "StepLeng"   << " "  
-	     << setw( 9) << "TrackLeng"  << " "  
-	     << setw(11) << "NextVolume" << " "
-	     << setw( 8) << "ProcName"   << endl;
+      G4cout << G4std::setw( 5) << "#Step#"     << " "
+	     << G4std::setw( 8) << "X(mm)"      << " "
+	     << G4std::setw( 8) << "Y(mm)"      << " "  
+	     << G4std::setw( 8) << "Z(mm)"      << " "
+	     << G4std::setw( 9) << "KinE(MeV)"  << " "
+	     << G4std::setw( 8) << "dE(MeV)"    << " "  
+	     << G4std::setw( 8) << "StepLeng"   << " "  
+	     << G4std::setw( 9) << "TrackLeng"  << " "  
+	     << G4std::setw(11) << "NextVolume" << " "
+	     << G4std::setw( 8) << "ProcName"   << G4endl;
 #endif	     
     }
 
-    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().x() , "Length") << " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().y() , "Length") << " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().z() , "Length") << " "
-	   << setw( 9) << G4BestUnit(fTrack->GetKineticEnergy() , "Energy") << " "
-	   << setw( 8) << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << " "
-	   << setw( 8) << G4BestUnit(fStep->GetStepLength() , "Length") << " "
-	   << setw( 9) << G4BestUnit(fTrack->GetTrackLength() , "Length") << " ";
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().x() , "Length") << " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().y() , "Length") << " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().z() , "Length") << " "
+	   << G4std::setw( 9) << G4BestUnit(fTrack->GetKineticEnergy() , "Energy") << " "
+	   << G4std::setw( 8) << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << " "
+	   << G4std::setw( 8) << G4BestUnit(fStep->GetStepLength() , "Length") << " "
+	   << G4std::setw( 9) << G4BestUnit(fTrack->GetTrackLength() , "Length") << " ";
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << setw(11) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(11) << fTrack->GetNextVolume()->GetName() << " ";
     } else {
-      G4cout << setw(11) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(11) << "OutOfWorld" << " ";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
@@ -287,7 +287,7 @@ void G4SteppingVerbose::StepInfo()
       G4cout << "User Limit";
     }
 
-    G4cout << endl;
+    G4cout << G4endl;
 
     if( verboseLevel == 2 ){
       G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
@@ -295,36 +295,36 @@ void G4SteppingVerbose::StepInfo()
 	                    fN2ndariesPostStepDoIt;
       if(tN2ndariesTot>0){
 	G4cout << "    :----- List of 2ndaries - "
-	       << "#SpawnInStep=" << setw(3) << tN2ndariesTot 
-	       << "(Rest=" << setw(2) << fN2ndariesAtRestDoIt
-	       << ",Along=" << setw(2) << fN2ndariesAlongStepDoIt
-	       << ",Post="  << setw(2) << fN2ndariesPostStepDoIt
+	       << "#SpawnInStep=" << G4std::setw(3) << tN2ndariesTot 
+	       << "(Rest=" << G4std::setw(2) << fN2ndariesAtRestDoIt
+	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
+	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
 	       << " ---------------"
-	       << endl;
+	       << G4endl;
 
 	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
                         lp1<(*fSecondary).entries(); lp1++){
 	  G4cout << "    : "
-		 << setw( 9)
+		 << G4std::setw( 9)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
-		 << setw( 9)
+		 << G4std::setw( 9)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y() , "Length")<< " "
-		 << setw( 9)
+		 << G4std::setw( 9)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z() , "Length") << " "
-		 << setw( 9)
+		 << G4std::setw( 9)
 		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy() , "Energy")<< " "
-		 << setw(18)
+		 << G4std::setw(18)
 		 << (*fSecondary)[lp1]->GetDefinition()
  	                              ->GetParticleName();
-	  G4cout << endl;
+	  G4cout << G4endl;
 	}
               
 	G4cout << "    :-----------------------------"
 	       << "----------------------------------"
 	       << "-- EndOf2ndaries Info ---------------"
-	       << endl;
+	       << G4endl;
       }
     }
     
@@ -339,9 +339,9 @@ void G4SteppingVerbose::DPSLStarted()
   CopyState();
 
   if( verboseLevel > 5 ){
-    G4cout << endl;
+    G4cout << G4endl;
     G4cout << " >>DefinePhysicalStepLength (List of proposed StepLengths): "
-      << endl;
+      << G4endl;
   }
 }
 //////////////////////////////////////////////
@@ -351,12 +351,12 @@ void G4SteppingVerbose::DPSLUserLimit()
   CopyState();
 
   if( verboseLevel > 5 ){
-    G4cout << endl << endl;
-    G4cout << "=== Defined Physical Step Length (DPSL)" << endl;
+    G4cout << G4endl << G4endl;
+    G4cout << "=== Defined Physical Step Length (DPSL)" << G4endl;
     G4cout << "    ++ProposedStep(UserLimit) = " 
-      << setw( 9) << physIntLength
+      << G4std::setw( 9) << physIntLength
 	<< " : ProcName = User defined maximum allowed Step"
-	  << endl;
+	  << G4endl;
   }
 }
 /////////////////////////////////////////////
@@ -367,21 +367,21 @@ void G4SteppingVerbose::DPSLPostStep()
 
   if( verboseLevel > 5 ){
     G4cout << "    ++ProposedStep(PostStep ) = " 
-      << setw( 9) << physIntLength
+      << G4std::setw( 9) << physIntLength
 	<< " : ProcName = "
 	  << fCurrentProcess->GetProcessName() 
             << " (";
     if(fCondition==ExclusivelyForced){
-      G4cout << "ExclusivelyForced)" << endl;
+      G4cout << "ExclusivelyForced)" << G4endl;
     }
     else if(fCondition==Conditionally){
-      G4cout << "Conditionally)" << endl;
+      G4cout << "Conditionally)" << G4endl;
     }
     else if(fCondition==Forced){
-      G4cout << "Forced)" << endl;
+      G4cout << "Forced)" << G4endl;
     }
     else{
-      G4cout << "No ForceCondition)" << endl;
+      G4cout << "No ForceCondition)" << G4endl;
     }
   }
 }
@@ -392,18 +392,18 @@ void G4SteppingVerbose::DPSLAlongStep()
   CopyState();
   if( verboseLevel > 5 ){
     G4cout << "    ++ProposedStep(AlongStep) = " 
-	   << setw( 9) << G4BestUnit(physIntLength , "Length")
+	   << G4std::setw( 9) << G4BestUnit(physIntLength , "Length")
 	   << " : ProcName = "
 	   << fCurrentProcess->GetProcessName() 
 	   << " (";
     if(fGPILSelection==CandidateForSelection){
-      G4cout << "CandidateForSelection)" << endl;
+      G4cout << "CandidateForSelection)" << G4endl;
     }
     else if(fGPILSelection==NotCandidateForSelection){
-      G4cout << "NotCandidateForSelection)" << endl;
+      G4cout << "NotCandidateForSelection)" << G4endl;
     }
     else{
-      G4cout << "???)" << endl;
+      G4cout << "???)" << G4endl;
     }
   }
 }
@@ -419,44 +419,44 @@ G4int prec = G4cout.precision(3);
   if( verboseLevel > 0 ){
 
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
-    G4cout << setw( 5) << "Step#"  << " "
-           << setw( 8) << "X"      << "     "
-	   << setw( 8) << "Y"      << "     "  
-	   << setw( 8) << "Z"      << "     "
-	   << setw( 9) << "KineE"  << "     "
-	   << setw( 8) << "dE"     << "     "  
-	   << setw(12) << "StepLeng"   << " "  
-	   << setw(12) << "TrackLeng"  << " "
-	   << setw(12) << "NextVolume" << " "
-	   << setw( 8) << "ProcName"   << endl;	     
+    G4cout << G4std::setw( 5) << "Step#"  << " "
+           << G4std::setw( 8) << "X"      << "     "
+	   << G4std::setw( 8) << "Y"      << "     "  
+	   << G4std::setw( 8) << "Z"      << "     "
+	   << G4std::setw( 9) << "KineE"  << "     "
+	   << G4std::setw( 8) << "dE"     << "     "  
+	   << G4std::setw(12) << "StepLeng"   << " "  
+	   << G4std::setw(12) << "TrackLeng"  << " "
+	   << G4std::setw(12) << "NextVolume" << " "
+	   << G4std::setw( 8) << "ProcName"   << G4endl;	     
 #else
-    G4cout << setw( 5) << "Step#"      << " "
-	   << setw( 8) << "X(mm)"      << " "
-	   << setw( 8) << "Y(mm)"      << " "  
-	   << setw( 8) << "Z(mm)"      << " "
-	   << setw( 9) << "KinE(MeV)"  << " "
-	   << setw( 8) << "dE(MeV)"    << " "  
-	   << setw( 8) << "StepLeng"   << " "  
-	   << setw( 9) << "TrackLeng"  << " "
-	   << setw(11) << "NextVolume" << " "
-	   << setw( 8) << "ProcName"   << endl;	     
+    G4cout << G4std::setw( 5) << "Step#"      << " "
+	   << G4std::setw( 8) << "X(mm)"      << " "
+	   << G4std::setw( 8) << "Y(mm)"      << " "  
+	   << G4std::setw( 8) << "Z(mm)"      << " "
+	   << G4std::setw( 9) << "KinE(MeV)"  << " "
+	   << G4std::setw( 8) << "dE(MeV)"    << " "  
+	   << G4std::setw( 8) << "StepLeng"   << " "  
+	   << G4std::setw( 9) << "TrackLeng"  << " "
+	   << G4std::setw(11) << "NextVolume" << " "
+	   << G4std::setw( 8) << "ProcName"   << G4endl;	     
 #endif
 
-    G4cout << setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().x(),"Length")<< " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().y(),"Length") << " "
-	   << setw( 8) << G4BestUnit(fTrack->GetPosition().z(),"Length")<< " "
-	   << setw( 9) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")<< " "
-	   << setw( 8) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy") << " "
-	   << setw( 8) << G4BestUnit(fStep->GetStepLength(),"Length")<< " "
-	   << setw( 9) << G4BestUnit(fTrack->GetTrackLength(),"Length") << " ";
+    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().x(),"Length")<< " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().y(),"Length") << " "
+	   << G4std::setw( 8) << G4BestUnit(fTrack->GetPosition().z(),"Length")<< " "
+	   << G4std::setw( 9) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")<< " "
+	   << G4std::setw( 8) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy") << " "
+	   << G4std::setw( 8) << G4BestUnit(fStep->GetStepLength(),"Length")<< " "
+	   << G4std::setw( 9) << G4BestUnit(fTrack->GetTrackLength(),"Length") << " ";
 
     if(fTrack->GetNextVolume()){
-      G4cout << setw(11) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(11) << fTrack->GetNextVolume()->GetName() << " ";
     } else {
-      G4cout << setw(11) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(11) << "OutOfWorld" << " ";
     }
-    G4cout << "initStep" << endl;
+    G4cout << "initStep" << G4endl;
   }
   G4cout.precision(prec);
 }
@@ -466,43 +466,43 @@ void G4SteppingVerbose::AlongStepDoItOneByOne()
 { 
   CopyState();
     if(verboseLevel >= 4){ 
-        G4cout << endl;
+        G4cout << G4endl;
         G4cout << " >>AlongStepDoIt (process by process): "
              << "   Process Name = " 
-             << fCurrentProcess->GetProcessName() << endl;
+             << fCurrentProcess->GetProcessName() << G4endl;
 
         ShowStep();
         G4cout << "          "
 	       << "!Note! Safety of PostStep is only valid "
 	       << "after all DoIt invocations."
-	       << endl; 
+	       << G4endl; 
 
         VerboseParticleChange();    
-        G4cout << endl;
+        G4cout << G4endl;
 
         G4cout << "    ++List of secondaries generated " 
 	       << "(x,y,z,kE,t,PID):"
 	       << "  No. of secodaries = " 
-	       << fN2ndariesAlongStepDoIt << endl;
+	       << fN2ndariesAlongStepDoIt << G4endl;
 
         if(fN2ndariesAlongStepDoIt>0){
            for(G4int lp1=(*fSecondary).entries()-fN2ndariesAlongStepDoIt; 
                      lp1<(*fSecondary).entries(); lp1++){
                G4cout << "      "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().y() , "Length")<< " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().z() , "Length")<< " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy() , "Energy")<< " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetGlobalTime() , "Time")<< " "
-                    << setw(18)
+                    << G4std::setw(18)
                     << (*fSecondary)[lp1]->GetDefinition()
                                          ->GetParticleName();
-               G4cout << endl;
+               G4cout << G4endl;
 	   }
 	}
      }
@@ -516,39 +516,39 @@ void G4SteppingVerbose::PostStepDoItOneByOne()
      if(fStepStatus != fPostStepDoItProc) return;
 
      if(verboseLevel >= 4){ 
-        G4cout << endl;
+        G4cout << G4endl;
         G4cout << " >>PostStepDoIt (process by process): "
              << "   Process Name = " 
-             << fCurrentProcess->GetProcessName() << endl;
+             << fCurrentProcess->GetProcessName() << G4endl;
 
         ShowStep();
-        G4cout << endl;
+        G4cout << G4endl;
         VerboseParticleChange();    
-        G4cout << endl;
+        G4cout << G4endl;
          
         G4cout << "    ++List of secondaries generated " 
              << "(x,y,z,kE,t,PID):"
              << "  No. of secodaries = " 
-             << fN2ndariesPostStepDoIt << endl;
+             << fN2ndariesPostStepDoIt << G4endl;
 
         if(fN2ndariesPostStepDoIt>0){
            for(G4int lp1=(*fSecondary).entries()-fN2ndariesPostStepDoIt; 
                      lp1<(*fSecondary).entries(); lp1++){
                G4cout << "      "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(), "Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(), "Length") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(), "Energy") << " "
-                    << setw( 9)
+                    << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetGlobalTime(), "Time") << " "
-                    << setw(18)
+                    << G4std::setw(18)
                     << (*fSecondary)[lp1]->GetDefinition()
                                          ->GetParticleName();
-               G4cout << endl;
+               G4cout << G4endl;
 	   }
 	}
      }
@@ -562,97 +562,97 @@ void G4SteppingVerbose::VerboseTrack()
 {
   CopyState();
 // Show header
-  G4cout << endl;
-  G4cout << "    ++G4Track Information " << endl;
+  G4cout << G4endl;
+  G4cout << "    ++G4Track Information " << G4endl;
   G4int prec = G4cout.precision(3);
 
 
   G4cout << "      -----------------------------------------------" 
-       << endl;
-  G4cout << "        G4Track Information  " << setw(20) << endl;
+       << G4endl;
+  G4cout << "        G4Track Information  " << G4std::setw(20) << G4endl;
   G4cout << "      -----------------------------------------------" 
-       << endl;
+       << G4endl;
 
   G4cout << "        Step number         : " 
-       << setw(20) << fTrack->GetCurrentStepNumber()
-       << endl; 
+       << G4std::setw(20) << fTrack->GetCurrentStepNumber()
+       << G4endl; 
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
   G4cout << "        Position - x        : " 
-       << setw(20) << G4BestUnit(fTrack->GetPosition().x(), "Length")
-       << endl; 
+       << G4std::setw(20) << G4BestUnit(fTrack->GetPosition().x(), "Length")
+       << G4endl; 
   G4cout << "        Position - y        : " 
-       << setw(20) << G4BestUnit(fTrack->GetPosition().y(), "Length")
-       << endl; 
+       << G4std::setw(20) << G4BestUnit(fTrack->GetPosition().y(), "Length")
+       << G4endl; 
   G4cout << "        Position - z        : " 
-       << setw(20) << G4BestUnit(fTrack->GetPosition().z(), "Length")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetPosition().z(), "Length")
+       << G4endl;
   G4cout << "        Global Time         : " 
-       << setw(20) << G4BestUnit(fTrack->GetGlobalTime(), "Time")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetGlobalTime(), "Time")
+       << G4endl;
   G4cout << "        Local Time          : " 
-       << setw(20) << G4BestUnit(fTrack->GetLocalTime(), "Time")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetLocalTime(), "Time")
+       << G4endl;
 #else
   G4cout << "        Position - x (mm)   : " 
-       << setw(20) << fTrack->GetPosition().x() /mm
-       << endl; 
+       << G4std::setw(20) << fTrack->GetPosition().x() /mm
+       << G4endl; 
   G4cout << "        Position - y (mm)   : " 
-       << setw(20) << fTrack->GetPosition().y() /mm
-       << endl; 
+       << G4std::setw(20) << fTrack->GetPosition().y() /mm
+       << G4endl; 
   G4cout << "        Position - z (mm)   : " 
-       << setw(20) << fTrack->GetPosition().z() /mm
-       << endl;
+       << G4std::setw(20) << fTrack->GetPosition().z() /mm
+       << G4endl;
   G4cout << "        Global Time (ns)    : " 
-       << setw(20) << fTrack->GetGlobalTime() /ns
-       << endl;
+       << G4std::setw(20) << fTrack->GetGlobalTime() /ns
+       << G4endl;
   G4cout << "        Local Time (ns)     : " 
-       << setw(20) << fTrack->GetLocalTime() /ns
-       << endl;
+       << G4std::setw(20) << fTrack->GetLocalTime() /ns
+       << G4endl;
 #endif
   G4cout << "        Momentum Direct - x : " 
-       << setw(20) << fTrack->GetMomentumDirection().x()
-       << endl;
+       << G4std::setw(20) << fTrack->GetMomentumDirection().x()
+       << G4endl;
   G4cout << "        Momentum Direct - y : " 
-       << setw(20) << fTrack->GetMomentumDirection().y()
-       << endl;
+       << G4std::setw(20) << fTrack->GetMomentumDirection().y()
+       << G4endl;
   G4cout << "        Momentum Direct - z : " 
-       << setw(20) << fTrack->GetMomentumDirection().z()
-       << endl;
+       << G4std::setw(20) << fTrack->GetMomentumDirection().z()
+       << G4endl;
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
   G4cout << "        Kinetic Energy      : " 
 #else
   G4cout << "        Kinetic Energy (MeV): " 
 #endif
-       << setw(20) << G4BestUnit(fTrack->GetKineticEnergy(), "Energy")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetKineticEnergy(), "Energy")
+       << G4endl;
   G4cout << "        Polarization - x    : " 
-       << setw(20) << fTrack->GetPolarization().x()
-       << endl;
+       << G4std::setw(20) << fTrack->GetPolarization().x()
+       << G4endl;
   G4cout << "        Polarization - y    : " 
-       << setw(20) << fTrack->GetPolarization().y()
-       << endl;
+       << G4std::setw(20) << fTrack->GetPolarization().y()
+       << G4endl;
   G4cout << "        Polarization - z    : " 
-       << setw(20) << fTrack->GetPolarization().z()
-       << endl;
+       << G4std::setw(20) << fTrack->GetPolarization().z()
+       << G4endl;
   G4cout << "        Track Length        : " 
-       << setw(20) << G4BestUnit(fTrack->GetTrackLength(), "Length")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetTrackLength(), "Length")
+       << G4endl;
   G4cout << "        Track ID #          : " 
-       << setw(20) << fTrack->GetTrackID()
-       << endl;
+       << G4std::setw(20) << fTrack->GetTrackID()
+       << G4endl;
   G4cout << "        Parent Track ID #   : " 
-       << setw(20) << fTrack->GetParentID()
-       << endl;
+       << G4std::setw(20) << fTrack->GetParentID()
+       << G4endl;
   G4cout << "        Next Volume         : " 
-       << setw(20);
+       << G4std::setw(20);
        if( fTrack->GetNextVolume() != 0 ) { 
          G4cout << fTrack->GetNextVolume()->GetName() << " ";
        } else {
          G4cout << "OutOfWorld" << " ";
        }
-       G4cout << endl;
+       G4cout << G4endl;
   G4cout << "        Track Status        : " 
-       << setw(20);
+       << G4std::setw(20);
        if( fTrack->GetTrackStatus() == fAlive ){
          G4cout << " Alive";
        } else if( fTrack->GetTrackStatus() == fStopButAlive ){
@@ -666,55 +666,55 @@ void G4SteppingVerbose::VerboseTrack()
        } else if( fTrack->GetTrackStatus() == fPostponeToNextEvent ){
            G4cout << " PostponeToNextEvent";
        }
-       G4cout << endl;
+       G4cout << G4endl;
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
   G4cout << "        Vertex - x          : " 
-       << setw(20) << G4BestUnit(fTrack->GetVertexPosition().x(),"Length")
-       << endl; 
+       << G4std::setw(20) << G4BestUnit(fTrack->GetVertexPosition().x(),"Length")
+       << G4endl; 
   G4cout << "        Vertex - y          : " 
-       << setw(20) << G4BestUnit(fTrack->GetVertexPosition().y(),"Length")
-       << endl; 
+       << G4std::setw(20) << G4BestUnit(fTrack->GetVertexPosition().y(),"Length")
+       << G4endl; 
   G4cout << "        Vertex - z          : " 
-       << setw(20) << G4BestUnit(fTrack->GetVertexPosition().z(),"Length")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetVertexPosition().z(),"Length")
+       << G4endl;
 #else
   G4cout << "        Vertex - x (mm)     : " 
-       << setw(20) << fTrack->GetVertexPosition().x()/mm
-       << endl; 
+       << G4std::setw(20) << fTrack->GetVertexPosition().x()/mm
+       << G4endl; 
   G4cout << "        Vertex - y (mm)     : " 
-       << setw(20) << fTrack->GetVertexPosition().y()/mm
-       << endl; 
+       << G4std::setw(20) << fTrack->GetVertexPosition().y()/mm
+       << G4endl; 
   G4cout << "        Vertex - z (mm)     : " 
-       << setw(20) << fTrack->GetVertexPosition().z()/mm
-       << endl;
+       << G4std::setw(20) << fTrack->GetVertexPosition().z()/mm
+       << G4endl;
 #endif
   G4cout << "        Vertex - Px (MomDir): " 
-       << setw(20) << fTrack->GetVertexMomentumDirection().x()
-       << endl;
+       << G4std::setw(20) << fTrack->GetVertexMomentumDirection().x()
+       << G4endl;
   G4cout << "        Vertex - Py (MomDir): " 
-       << setw(20) << fTrack->GetVertexMomentumDirection().y()
-       << endl;
+       << G4std::setw(20) << fTrack->GetVertexMomentumDirection().y()
+       << G4endl;
   G4cout << "        Vertex - Pz (MomDir): " 
-       << setw(20) << fTrack->GetVertexMomentumDirection().z()
-       << endl;
+       << G4std::setw(20) << fTrack->GetVertexMomentumDirection().z()
+       << G4endl;
 #ifdef G4_USE_G4BESTUNIT_FOR_VERBOSE
   G4cout << "        Vertex - KineE      : " 
 #else
   G4cout << "        Vertex - KineE (MeV): " 
 #endif
-       << setw(20) << G4BestUnit(fTrack->GetVertexKineticEnergy(),"Energy")
-       << endl;
+       << G4std::setw(20) << G4BestUnit(fTrack->GetVertexKineticEnergy(),"Energy")
+       << G4endl;
   
   G4cout << "        Creator Process     : " 
-       << setw(20);
+       << G4std::setw(20);
   if( fTrack->GetCreatorProcess() == NULL){
-    G4cout << " Event Generator" << endl;
+    G4cout << " Event Generator" << G4endl;
   } else {
-    G4cout << fTrack->GetCreatorProcess()->GetProcessName() << endl;
+    G4cout << fTrack->GetCreatorProcess()->GetProcessName() << G4endl;
   }
 
   G4cout << "      -----------------------------------------------" 
-       << endl;
+       << G4endl;
        
  G4cout.precision(prec);      
 }
@@ -726,8 +726,8 @@ void G4SteppingVerbose::VerboseParticleChange()
 {
 
 // Show header
-  G4cout << endl;
-  G4cout << "    ++G4ParticleChange Information " << endl;
+  G4cout << G4endl;
+  G4cout << "    ++G4ParticleChange Information " << G4endl;
   fParticleChange->DumpInfo();
 }
 /////////////////////////////////////////
@@ -736,130 +736,130 @@ void G4SteppingVerbose::ShowStep() const
 {
 
 // Show header
-   G4cout << endl;
-   G4cout << "    ++G4Step Information " << endl;
+   G4cout << G4endl;
+   G4cout << "    ++G4Step Information " << G4endl;
    G4cout.precision(3);
 
 // Show G4Step specific information
-   G4cout << "      Address of G4Track    : " << fStep->GetTrack() << endl;
-   G4cout << "      Step Length (mm)      : " << fStep->GetTrack()->GetStepLength() << endl;
-   G4cout << "      Energy Deposit (MeV)  : " << fStep->GetTotalEnergyDeposit() << endl;
+   G4cout << "      Address of G4Track    : " << fStep->GetTrack() << G4endl;
+   G4cout << "      Step Length (mm)      : " << fStep->GetTrack()->GetStepLength() << G4endl;
+   G4cout << "      Energy Deposit (MeV)  : " << fStep->GetTotalEnergyDeposit() << G4endl;
 
 // Show G4StepPoint specific information
    G4cout << "      -------------------------------------------------------" 
-        << "----------------" <<  endl;
-   G4cout << "        StepPoint Information  " << setw(20) << "PreStep" 
-                                             << setw(20) << "PostStep" << endl;
+        << "----------------" <<  G4endl;
+   G4cout << "        StepPoint Information  " << G4std::setw(20) << "PreStep" 
+                                             << G4std::setw(20) << "PostStep" << G4endl;
    G4cout << "      -------------------------------------------------------" 
-        << "----------------" <<  endl;
+        << "----------------" <<  G4endl;
    G4cout << "         Position - x (mm)   : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPosition().x() 
-        << setw(20) << fStep->GetPostStepPoint()->GetPosition().x() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPosition().x() 
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPosition().x() << G4endl;
    G4cout << "         Position - y (mm)   : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPosition().y() 
-        << setw(20) << fStep->GetPostStepPoint()->GetPosition().y() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPosition().y() 
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPosition().y() << G4endl;
    G4cout << "         Position - z (mm)   : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPosition().z() 
-        << setw(20) << fStep->GetPostStepPoint()->GetPosition().z() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPosition().z() 
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPosition().z() << G4endl;
    G4cout << "         Global Time (ns)    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetGlobalTime()
-        << setw(20) << fStep->GetPostStepPoint()->GetGlobalTime() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetGlobalTime()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetGlobalTime() << G4endl;
    G4cout << "         Local Time (ns)     : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetLocalTime() 
-        << setw(20) << fStep->GetPostStepPoint()->GetLocalTime() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetLocalTime() 
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetLocalTime() << G4endl;
    G4cout << "         Proper Time (ns)    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetProperTime()
-        << setw(20) << fStep->GetPostStepPoint()->GetProperTime() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetProperTime()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetProperTime() << G4endl;
    G4cout << "         Momentum Direct - x : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().x()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().x() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().x()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().x() << G4endl;
    G4cout << "         Momentum Direct - y : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().y()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().y() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().y()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().y() << G4endl;
    G4cout << "         Momentum Direct - z : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().z()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().z() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentumDirection().z()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentumDirection().z() << G4endl;
    G4cout << "         Momentum - x (MeV/c): " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentum().x()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentum().x() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentum().x()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentum().x() << G4endl;
    G4cout << "         Momentum - y (MeV/c): " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentum().y()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentum().y() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentum().y()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentum().y() << G4endl;
    G4cout << "         Momentum - z (MeV/c): " 
-        << setw(20) << fStep->GetPreStepPoint()->GetMomentum().z()
-        << setw(20) << fStep->GetPostStepPoint()->GetMomentum().z() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetMomentum().z()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetMomentum().z() << G4endl;
    G4cout << "         Total Energy (MeV)  : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetTotalEnergy()
-        << setw(20) << fStep->GetPostStepPoint()->GetTotalEnergy() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetTotalEnergy()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetTotalEnergy() << G4endl;
    G4cout << "         Kinetic Energy (MeV): " 
-        << setw(20) << fStep->GetPreStepPoint()->GetKineticEnergy()
-        << setw(20) << fStep->GetPostStepPoint()->GetKineticEnergy() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetKineticEnergy()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetKineticEnergy() << G4endl;
    G4cout << "         Velocity (mm/ns)    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetVelocity()
-        << setw(20) << fStep->GetPostStepPoint()->GetVelocity() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetVelocity()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetVelocity() << G4endl;
    G4cout << "         Volume Name         : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()
-        << setw(20) << fStep->GetPostStepPoint()->GetPhysicalVolume()->GetName() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPhysicalVolume()->GetName() << G4endl;
    G4cout << "         Safety (mm)         : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetSafety()
-        << setw(20) << fStep->GetPostStepPoint()->GetSafety() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetSafety()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetSafety() << G4endl;
    G4cout << "         Polarization - x    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPolarization().x()
-        << setw(20) << fStep->GetPostStepPoint()->GetPolarization().x() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPolarization().x()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPolarization().x() << G4endl;
    G4cout << "         Polarization - y    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPolarization().y()
-        << setw(20) << fStep->GetPostStepPoint()->GetPolarization().y() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPolarization().y()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPolarization().y() << G4endl;
    G4cout << "         Polarization - Z    : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetPolarization().z()
-        << setw(20) << fStep->GetPostStepPoint()->GetPolarization().z() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetPolarization().z()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetPolarization().z() << G4endl;
    G4cout << "         Weight              : " 
-        << setw(20) << fStep->GetPreStepPoint()->GetWeight()
-        << setw(20) << fStep->GetPostStepPoint()->GetWeight() << endl;
+        << G4std::setw(20) << fStep->GetPreStepPoint()->GetWeight()
+        << G4std::setw(20) << fStep->GetPostStepPoint()->GetWeight() << G4endl;
    G4cout << "         Step Status         : " ;
         G4StepStatus  tStepStatus = fStep->GetPreStepPoint()->GetStepStatus();
         if( tStepStatus == fGeomBoundary ){
-           G4cout << setw(20) << "Geom Limit";
+           G4cout << G4std::setw(20) << "Geom Limit";
         } else if ( tStepStatus == fAlongStepDoItProc ){
-          G4cout << setw(20) << "AlongStep Proc.";
+          G4cout << G4std::setw(20) << "AlongStep Proc.";
         } else if ( tStepStatus == fPostStepDoItProc ){
-           G4cout << setw(20) << "PostStep Proc";
+           G4cout << G4std::setw(20) << "PostStep Proc";
         } else if ( tStepStatus == fAtRestDoItProc ){
-           G4cout << setw(20) << "AtRest Proc";
+           G4cout << G4std::setw(20) << "AtRest Proc";
         } else if ( tStepStatus == fUndefined ){
-           G4cout << setw(20) << "Undefined";
+           G4cout << G4std::setw(20) << "Undefined";
         }
 
         tStepStatus = fStep->GetPostStepPoint()->GetStepStatus();
         if( tStepStatus == fGeomBoundary ){
-           G4cout << setw(20) << "Geom Limit";
+           G4cout << G4std::setw(20) << "Geom Limit";
         } else if ( tStepStatus == fAlongStepDoItProc ){
-           G4cout << setw(20) << "AlongStep Proc.";
+           G4cout << G4std::setw(20) << "AlongStep Proc.";
         } else if ( tStepStatus == fPostStepDoItProc ){
-           G4cout << setw(20) << "PostStep Proc";
+           G4cout << G4std::setw(20) << "PostStep Proc";
         } else if ( tStepStatus == fAtRestDoItProc ){
-           G4cout << setw(20) << "AtRest Proc";
+           G4cout << G4std::setw(20) << "AtRest Proc";
         } else if ( tStepStatus == fUndefined ){
-           G4cout << setw(20) << "Undefined";
+           G4cout << G4std::setw(20) << "Undefined";
         }
 
-        G4cout << endl;
+        G4cout << G4endl;
         G4cout << "         Process defined Step: " ;
         if( fStep->GetPreStepPoint()->GetProcessDefinedStep() == NULL ){
- 	   G4cout << setw(20) << "Undefined";
+ 	   G4cout << G4std::setw(20) << "Undefined";
         } else {
-  	   G4cout << setw(20) << fStep->GetPreStepPoint()->GetProcessDefinedStep()
+  	   G4cout << G4std::setw(20) << fStep->GetPreStepPoint()->GetProcessDefinedStep()
                                              ->GetProcessName();
         }
         if( fStep->GetPostStepPoint()->GetProcessDefinedStep() == NULL){
-  	   G4cout << setw(20) << "Undefined";
+  	   G4cout << G4std::setw(20) << "Undefined";
         } else {
- 	   G4cout << setw(20) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+ 	   G4cout << G4std::setw(20) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
                                               ->GetProcessName(); 
         }
 
-   G4cout << endl;
+   G4cout << G4endl;
    G4cout << "      -------------------------------------------------------" 
-        << "----------------" << endl;
+        << "----------------" << G4endl;
 }
 
 
diff --git a/source/tracking/src/G4TrackingManager.cc b/source/tracking/src/G4TrackingManager.cc
index e1db6bc26e..876233879d 100644
--- a/source/tracking/src/G4TrackingManager.cc
+++ b/source/tracking/src/G4TrackingManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingManager.cc,v 1.4.6.1 1999/12/07 20:53:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackingManager.cc,v 1.5 1999/12/15 14:53:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -146,21 +146,21 @@ void G4TrackingManager::Verbose(G4String select)
   if( select == "ProcessOneTrack" ){
 #ifdef G4VERBOSE
      if(verboseLevel >= 1) { 
-       G4cout << endl;
+       G4cout << G4endl;
        G4cout << "*******************************************************"
             << "**************************************************"
-            << endl;
+            << G4endl;
        G4cout << "* G4Track Information: " 
             << "  Particle = " << fpTrack->GetDefinition()->GetParticleName() 
             << "," 
 	    << "   Track ID = " << fpTrack->GetTrackID() 
             << "," 
 	    << "   Parent ID = " << fpTrack->GetParentID() 
-            << endl;
+            << G4endl;
        G4cout << "*******************************************************"
             << "**************************************************"
-            << endl;
-       G4cout << endl;
+            << G4endl;
+       G4cout << G4endl;
       
      }
 #endif
diff --git a/source/tracking/src/G4TrackingMessenger.cc b/source/tracking/src/G4TrackingMessenger.cc
index 6c1cae252e..7164d5bb9e 100644
--- a/source/tracking/src/G4TrackingMessenger.cc
+++ b/source/tracking/src/G4TrackingMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingMessenger.cc,v 1.4.6.1 1999/12/07 20:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrackingMessenger.cc,v 1.6 2000/01/23 09:51:36 tsasaki Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 //---------------------------------------------------------------
@@ -36,11 +36,7 @@
 #include "G4TrackStatus.hh"
 #include "G4ios.hh"
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 ///////////////////////////////////////////////////////////////////
 G4TrackingMessenger::G4TrackingMessenger(G4TrackingManager * trMan)
@@ -106,7 +102,7 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
   if( command == VerboseCmd ){
     G4int vl;
     const char* t = newValues;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     is >> vl;
     trackingManager->SetVerboseLevel(vl);
   }
@@ -123,7 +119,7 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
   if( command == StoreTrajectoryCmd ){
     G4int vl;
     const char* t = newValues;
-    istrstream is((char*)t);
+    G4std::istrstream is((char*)t);
     is >> vl;
     trackingManager->SetStoreTrajectory(vl!=0);
   }
@@ -136,10 +132,15 @@ G4String G4TrackingMessenger::GetCurrentValue(G4UIcommand * command)
 {
   if( command == VerboseCmd ){
     char line[100];
-    ostrstream os(line,100);
+    G4std::ostrstream os(line,100);
     os << trackingManager->GetVerboseLevel() << '\0';
     return G4String(line);
   }
+  else if( command == StoreTrajectoryCmd ){
+    G4String ll = "0";
+    if(trackingManager->GetStoreTrajectory()) ll = "1";
+    return ll;
+  }
   return G4String('\0');
 }
 
diff --git a/source/tracking/src/G4Trajectory.cc b/source/tracking/src/G4Trajectory.cc
index 564b60e38b..8f9a9cb317 100644
--- a/source/tracking/src/G4Trajectory.cc
+++ b/source/tracking/src/G4Trajectory.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trajectory.cc,v 1.5.4.1.2.1 1999/12/07 20:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Trajectory.cc,v 1.8 2000/01/26 04:20:34 asaim Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
@@ -91,17 +91,17 @@ G4Trajectory::~G4Trajectory()
 void G4Trajectory::ShowTrajectory() const
 ///////////////////////////////////
 {
-   G4cout << endl << "TrackID =" << fTrackID 
-        << ":ParentID=" << fParentID << endl;
+   G4cout << G4endl << "TrackID =" << fTrackID 
+        << ":ParentID=" << fParentID << G4endl;
    G4cout << "Particle name : " << ParticleName 
-        << "  Charge : " << PDGCharge << endl;
+        << "  Charge : " << PDGCharge << G4endl;
    G4cout << "  Current trajectory has " << positionRecord->entries() 
-        << " points." << endl;
+        << " points." << G4endl;
 
    for( size_t i=0 ; i < positionRecord->entries() ; i++){
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[i]);
        G4cout << "Point[" << i << "]" 
-            << " Position= " << aTrajectoryPoint->GetPosition() << endl;
+            << " Position= " << aTrajectoryPoint->GetPosition() << G4endl;
    }
 }
 
@@ -167,3 +167,18 @@ G4ParticleDefinition* G4Trajectory::GetParticleDefinition()
    return (G4ParticleTable::GetParticleTable()->FindParticle(ParticleName));
 }
 
+/////////////////////////////////////////////
+void G4Trajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
+/////////////////////////////////////////////
+{
+  if(!secondTrajectory) return;
+
+  G4Trajectory* seco = (G4Trajectory*)secondTrajectory;
+  G4int ent = seco->GetPointEntries();
+  for(int i=1;i<ent;i++) // initial point of the second trajectory should not be merged
+  { 
+    positionRecord->append(seco->positionRecord->removeAt(1));
+  }
+}
+
+
diff --git a/source/tracking/src/G4TrajectoryPoint.cc b/source/tracking/src/G4TrajectoryPoint.cc
index 428d08e4d5..4ad7acb484 100644
--- a/source/tracking/src/G4TrajectoryPoint.cc
+++ b/source/tracking/src/G4TrajectoryPoint.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoryPoint.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoryPoint.cc,v 1.4 1999/12/15 14:53:59 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserSteppingAction.cc b/source/tracking/src/G4UserSteppingAction.cc
index 6ee0131fde..df05ced678 100644
--- a/source/tracking/src/G4UserSteppingAction.cc
+++ b/source/tracking/src/G4UserSteppingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserSteppingAction.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserSteppingAction.cc,v 1.4 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserTrackingAction.cc b/source/tracking/src/G4UserTrackingAction.cc
index da9fb9d25f..233e3a9cc3 100644
--- a/source/tracking/src/G4UserTrackingAction.cc
+++ b/source/tracking/src/G4UserTrackingAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserTrackingAction.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UserTrackingAction.cc,v 1.4 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4VSteppingVerbose.cc b/source/tracking/src/G4VSteppingVerbose.cc
index ec4509c63a..4ae42f203f 100644
--- a/source/tracking/src/G4VSteppingVerbose.cc
+++ b/source/tracking/src/G4VSteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSteppingVerbose.cc,v 1.2.6.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSteppingVerbose.cc,v 1.3 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
index c315965679..ab4859340a 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILE.hh,v 1.4.8.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILE.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE driver factory.
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
index 5709c2325e..ffe475014a 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILESceneHandler.hh,v 1.3.4.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILESceneHandler.hh,v 1.5 1999/12/16 17:24:48 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 
@@ -64,6 +64,12 @@ public:
   void AddThis ( const G4Sphere& sphere );
   void AddThis ( const G4Para&   para   );
   void AddThis ( const G4Torus&  torus  );
+  void AddThis ( const G4Polycone& polycone ) {
+    G4VSceneHandler::AddThis (polycone);
+  }
+  void AddThis ( const G4Polyhedra& polyhedra) {
+    G4VSceneHandler::AddThis (polyhedra);
+  }
   void AddThis ( const G4VSolid& solid  );
 
   void ClearStore (){}
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
index d2e8686e2f..bf5a4cee6a 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILEViewer.hh,v 1.4.4.1 1999/12/07 20:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILEViewer.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE viewer - opens window, hard copy, etc.
@@ -44,7 +44,7 @@ public:
   const char* GetG4PrimViewer          () { return fG4PrimViewer ;}
   const char* GetG4PrimViewerInvocation() { return fG4PrimViewerInvocation ;}
   const char* GetPSViewer              () { return fPSViewer ;}
-  void  SendDrawingStyleToDAWNGUI( ostream& out ) ;
+  void  SendDrawingStyleToDAWNGUI( G4std::ostream& out ) ;
 
 private:
   G4DAWNFILESceneHandler& fSceneHandler; // Reference to Graphics Scene for this view.
diff --git a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
index df60af62db..e167069350 100644
--- a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRClientServer.hh,v 1.2.8.1 1999/12/07 20:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRClientServer.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA, Wed Jul  3 14:13:52 JST 1996
 ////////////////////////////////
diff --git a/source/visualization/FukuiRenderer/include/G4FRConst.hh b/source/visualization/FukuiRenderer/include/G4FRConst.hh
index 38ee8ba94e..91d01d2535 100644
--- a/source/visualization/FukuiRenderer/include/G4FRConst.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRConst.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRConst.hh,v 1.3.4.1 1999/12/07 20:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRConst.hh,v 1.4 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA, Tue Jul  2 15:30:49 JST 1996
 ///////////////////////////////////
diff --git a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
index 7a286e05c8..56852f586d 100644
--- a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRFeatures.hh,v 1.2.8.1 1999/12/07 20:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRFeatures.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #if !defined G4_FR_FEATURES_HH
 #define      G4_FR_FEATURES_HH
diff --git a/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh b/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
index b28db33ea8..e92003f93e 100644
--- a/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRSocketConfig.hh,v 1.2.8.1 1999/12/07 20:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRSocketConfig.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////
 ///// G4FRSocketConfig.h   /////
diff --git a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh b/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
index b20e8dd40c..d731de72c9 100644
--- a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRSocketMacro.hh,v 1.2.8.1 1999/12/07 20:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRSocketMacro.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ///////////////////////////////
 ///// G4FRSocketMacro.hh  /////
diff --git a/source/visualization/FukuiRenderer/include/G4FRofstream.hh b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
index abba20022a..e259a437f3 100644
--- a/source/visualization/FukuiRenderer/include/G4FRofstream.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
@@ -5,10 +5,10 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRofstream.hh,v 1.2.8.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRofstream.hh,v 1.3 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
-#include<fstream.h>
+#include"g4std/fstream"
 
 #if !defined G4_FR_OFSTREAM_HH
 #define      G4_FR_OFSTREAM_HH
@@ -49,7 +49,7 @@ class G4FRofstream {
 
  protected:
 	G4bool flag_file_open ;
-	ofstream fout ;
+	G4std::ofstream fout ;
 } ;
 
 
@@ -73,7 +73,7 @@ inline  void G4FRofstream::Close ()
 inline  void    G4FRofstream::SendLine ( const char* message ) 
 {
 	if ( IsOpen() ) {
-		fout << message << endl;
+		fout << message << G4endl;
 	}		
 }
 
@@ -82,7 +82,7 @@ inline  G4bool  G4FRofstream::DoesFileExist ( const char* filename )
 {
 	G4bool status = false ;
 
-	ifstream fout_tmp( filename ) ; 
+	G4std::ifstream fout_tmp( filename ) ; 
 	if( fout_tmp ) { status = true ; }
 	fout_tmp.close();
 
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
index ce0b137639..36bcbcdcbe 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRenderer.hh,v 1.4.8.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRenderer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
index 4d9c73caf4..f4c4ccf192 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRendererSceneHandler.hh,v 1.3.4.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRendererSceneHandler.hh,v 1.5 1999/12/16 17:24:49 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
@@ -63,6 +63,12 @@ public:
   void AddThis ( const G4Sphere& sphere );
   void AddThis ( const G4Para&   para   );
   void AddThis ( const G4Torus&  torus  );
+  void AddThis ( const G4Polycone& polycone) {
+    G4VSceneHandler::AddThis (polycone);
+  }
+  void AddThis ( const G4Polyhedra& polyhedra) {
+    G4VSceneHandler::AddThis (polyhedra);
+  }
   void AddThis ( const G4VSolid& solid  );
 
   void ClearStore (){}
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
index f3f1d1303c..b033a8995d 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRendererViewer.hh,v 1.4.4.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRendererViewer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 12:10:14 JST 1996
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
index 11e3d70123..6a2790dc29 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILE.cc,v 1.4.4.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILE.cc,v 1.5 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE factory.
@@ -49,7 +49,7 @@ G4VSceneHandler* G4DAWNFILE::CreateSceneHandler (const G4String& name)
 	G4VSceneHandler* p = new G4DAWNFILESceneHandler (*this, name);
 
 	G4cout	<< G4DAWNFILESceneHandler::GetSceneCount ()
-		<< ' ' << fName << " scenes extanct." << endl;
+		<< ' ' << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
index e95910e898..b1a68bd222 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILESceneHandler.cc,v 1.2.4.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILESceneHandler.cc,v 1.3 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE scene.
@@ -22,7 +22,7 @@
 // #define DEBUG_FR_SCENE
 
      //----- header files
-#include <fstream.h>
+#include "g4std/fstream"
 #include <stdlib.h>
 #include <string.h>
 #include "globals.hh"
@@ -95,7 +95,7 @@ COMMAND_BUF_SIZE       (G4FRofstream::SEND_BUFMAX)
 G4DAWNFILESceneHandler::~G4DAWNFILESceneHandler () 
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4DAWNFILESceneHandler" << endl;
+	G4cerr << "***** ~G4DAWNFILESceneHandler" << G4endl;
 #endif 
   fSceneCount--;
   ClearStore (); // clear current scene
@@ -119,13 +119,13 @@ void	G4DAWNFILESceneHandler::SetG4PrimFileName()
 
 		// Message
 		if( fMaxFileNum > 1 && i == MAX_FILE_INDEX ) {
-		  G4cerr << "==========================================="   << endl; 
-		  G4cerr << "WARNING MESSAGE from DAWNFILE driver:      "   << endl;
-		  G4cerr << "  This file name is the final one in the   "   << endl;
-		  G4cerr << "  automatic updation of the output file name." << endl; 
-		  G4cerr << "  You may overwrite an existing file of   "    << endl; 
-                  G4cerr << "  the same name.                          "    << endl;
-		  G4cerr << "==========================================="   << endl; 
+		  G4cerr << "==========================================="   << G4endl; 
+		  G4cerr << "WARNING MESSAGE from DAWNFILE driver:      "   << G4endl;
+		  G4cerr << "  This file name is the final one in the   "   << G4endl;
+		  G4cerr << "  automatic updation of the output file name." << G4endl; 
+		  G4cerr << "  You may overwrite an existing file of   "    << G4endl; 
+                  G4cerr << "  the same name.                          "    << G4endl;
+		  G4cerr << "==========================================="   << G4endl; 
 		}
 
 		// re-determine file to G4DAWNFILE_DEST_DIR/g4_i.prim for i>0
@@ -134,7 +134,7 @@ void	G4DAWNFILESceneHandler::SetG4PrimFileName()
 		}
 
 		// check validity of the file name
-		ifstream  fin ; 
+		G4std::ifstream  fin ; 
 		fin.open(fG4PrimFileName) ;
 		if(!fin) { 
 			// new file	
@@ -147,11 +147,11 @@ void	G4DAWNFILESceneHandler::SetG4PrimFileName()
 
 	} // for 
 
-	G4cerr << "===========================================" << endl; 
-	G4cerr << "Output file: " <<    fG4PrimFileName         << endl; 
-	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << endl; 
-	G4cerr << "  (Customizable as: setenv G4DAWNFILE_MAX_FILE_NUM number) " << endl;
-	G4cerr << "===========================================" << endl; 
+	G4cerr << "===========================================" << G4endl; 
+	G4cerr << "Output file: " <<    fG4PrimFileName         << G4endl; 
+	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << G4endl; 
+	G4cerr << "  (Customizable as: setenv G4DAWNFILE_MAX_FILE_NUM number) " << G4endl;
+	G4cerr << "===========================================" << G4endl; 
 
 } // G4DAWNFILESceneHandler::SetG4PrimFileName()
 
@@ -167,7 +167,7 @@ void	G4DAWNFILESceneHandler::BeginSavingG4Prim( void )
 	{ 
 #if defined DEBUG_FR_SCENE
 	        G4cerr << "*****                   (started) " ;
-	        G4cerr << "(open g4.prim, ##)"  << endl;
+	        G4cerr << "(open g4.prim, ##)"  << G4endl;
 #endif
 		SetG4PrimFileName() ; // returned to fG4PrimFileName
 		fPrimDest.Open(fG4PrimFileName)   ;
@@ -186,7 +186,7 @@ void	G4DAWNFILESceneHandler::EndSavingG4Prim  ( void )
 	if(  IsSavingG4Prim() )
 	{
 #if defined DEBUG_FR_SCENE
-          G4cerr << "*****                 (started) (close g4.prim)" << endl;
+          G4cerr << "*****                 (started) (close g4.prim)" << G4endl;
 #endif
 		fPrimDest.Close()               ;
 		flag_saving_g4_prim = false ; 
@@ -200,7 +200,7 @@ void G4DAWNFILESceneHandler::FRBeginModeling( void )
 	if( !FRIsInModeling() )  	
 	{
 #if defined DEBUG_FR_SCENE
-	  G4cerr << "***** G4DAWNFILESceneHandler::FRBeginModeling (called & started)" << endl;
+	  G4cerr << "***** G4DAWNFILESceneHandler::FRBeginModeling (called & started)" << G4endl;
 #endif
 
 			//----- Send saving command and heading comment
@@ -211,19 +211,19 @@ void G4DAWNFILESceneHandler::FRBeginModeling( void )
 
 			//----- send SET_CAMERA command 
 #if defined DEBUG_FR_SCENE
-		G4cerr << "*****   (!SetCamera in FRBeginModeling())" << endl;
+		G4cerr << "*****   (!SetCamera in FRBeginModeling())" << G4endl;
 #endif
 		SendStr( FR_SET_CAMERA );
 
 		//----- open device
 #if defined DEBUG_FR_SCENE
-		G4cerr << "*****   (!OpenDevice in FRBeginModeling())" << endl;
+		G4cerr << "*****   (!OpenDevice in FRBeginModeling())" << G4endl;
 #endif
 		SendStr( FR_OPEN_DEVICE      );
 
 		//----- begin sending primitives
 #if defined DEBUG_FR_SCENE
-		G4cerr << "*****   (!BeginModeling in FRBeginModeling())" << endl;
+		G4cerr << "*****   (!BeginModeling in FRBeginModeling())" << G4endl;
 #endif
 		SendStr( FR_BEGIN_MODELING );  FRflag_in_modeling = true ;
 
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
index c336bd00fe..a973d84b49 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DAWNFILEViewer.cc,v 1.5.4.1 1999/12/07 20:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4DAWNFILEViewer.cc,v 1.6 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE view - opens window, hard copy, etc.
@@ -81,7 +81,7 @@ G4DAWNFILEViewer::~G4DAWNFILEViewer ()
 void G4DAWNFILEViewer::SetView () 
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4DAWNFILEViewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4DAWNFILEViewer::SetView(): No effects" << G4endl;
 #endif 
 // Do nothing, since DAWN is running as a different process.
 // SendViewParameters () will do this job instead.
@@ -93,7 +93,7 @@ void
 G4DAWNFILEViewer::ClearView( void )
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4DAWNFILEViewer::ClearView (): No effects " << endl;
+	G4cerr << "***** G4DAWNFILEViewer::ClearView (): No effects " << G4endl;
 #endif
 
 }
@@ -103,7 +103,7 @@ G4DAWNFILEViewer::ClearView( void )
 void G4DAWNFILEViewer::DrawView () 
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4DAWNFILEViewer::DrawView () " << endl;
+	G4cerr << "***** G4DAWNFILEViewer::DrawView () " << G4endl;
 #endif
 		//----- 
 	fSceneHandler.FRBeginModeling() ;
@@ -122,7 +122,7 @@ void G4DAWNFILEViewer::DrawView ()
 void G4DAWNFILEViewer::ShowView( void )
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4DAWNFILEViewer::ShowView () " << endl;
+	G4cerr << "***** G4DAWNFILEViewer::ShowView () " << G4endl;
 #endif
 
 	if( fSceneHandler.FRIsInModeling() ) 
@@ -151,19 +151,19 @@ void G4DAWNFILEViewer::ShowView( void )
 		if( false == G4FRofstream::DoesFileExist( fSceneHandler.GetG4PrimFileName() ) )   
 		{
 			G4cout << "ERROR: Failed to generate file  ";
-			G4cout << fSceneHandler.GetG4PrimFileName() << endl;
+			G4cout << fSceneHandler.GetG4PrimFileName() << G4endl;
 
 		} else 	if( strcmp( GetG4PrimViewerInvocation(), "" ) )  
 		{
 			G4cout << "File  " << fSceneHandler.GetG4PrimFileName() ;
-			G4cout << "  is generated." << endl;
-			G4cout << GetG4PrimViewerInvocation() << endl;
+			G4cout << "  is generated." << G4endl;
+			G4cout << GetG4PrimViewerInvocation() << G4endl;
 			system( GetG4PrimViewerInvocation() );
 
 		} else { // no view, i.e., only file generation
 			G4cout << "File  " << fSceneHandler.GetG4PrimFileName() ; 
-			G4cout << "  is generated." << endl;
-			G4cout << "No viewer is invoked." << endl;
+			G4cout << "  is generated." << G4endl;
+			G4cout << "No viewer is invoked." << G4endl;
 		}
 
 	}
@@ -171,12 +171,12 @@ void G4DAWNFILEViewer::ShowView( void )
 } // G4DAWNFILEViewer::ShowView()
 
 
-	//----- G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( ostream& out ) 
-void  G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( ostream& out ) 
+	//----- G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( G4std::ostream& out ) 
+void  G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( G4std::ostream& out ) 
 {
 ///////////////////////
 //#if defined DEBUG_FR_VIEW
-//  G4cerr << "***** G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI()" << endl;
+//  G4cerr << "***** G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI()" << G4endl;
 //#endif
 //////////////////////
 
@@ -188,17 +188,17 @@ void  G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( ostream& out )
 	switch( style )
 	{
 	  case G4ViewParameters::wireframe: 
-		out <<  FR_WIREFRAME << endl;
+		out <<  FR_WIREFRAME << G4endl;
 		break;
 	  case G4ViewParameters::hlr:
-		out <<  FR_HID2      << endl; // LINE
+		out <<  FR_HID2      << G4endl; // LINE
 		break;
 	  case G4ViewParameters::hsr:
 	  case G4ViewParameters::hlhsr:
-		out <<  FR_HID       << endl; // SURFACE
+		out <<  FR_HID       << G4endl; // SURFACE
 		break;
 	  default:
-		out <<  FR_WIREFRAME << endl;
+		out <<  FR_WIREFRAME << G4endl;
 		break;
 	}
 
@@ -215,7 +215,7 @@ void G4DAWNFILEViewer::SendViewParameters ()
 
 #if defined DEBUG_FR_VIEW
   G4cerr << "***** G4DAWNFILEViewer::SendViewParameters()  "; 
-  G4cerr << "(GUI parameters)" << endl;
+  G4cerr << "(GUI parameters)" << G4endl;
 #endif 
 
 		//----- Magic number to decide camera distance automatically
@@ -243,8 +243,8 @@ void G4DAWNFILEViewer::SendViewParameters ()
 	}
 
 	if ( camera_distance < radius ) { 
-		G4cerr << "WARNING from DAWNFILE driver:" << endl;
-		G4cerr << "  Camera cannot enter inside objects"      << endl;
+		G4cerr << "WARNING from DAWNFILE driver:" << G4endl;
+		G4cerr << "  Camera cannot enter inside objects"      << G4endl;
 		camera_distance = radius ; 
 	}
 
@@ -257,27 +257,27 @@ void G4DAWNFILEViewer::SendViewParameters ()
 
 	//########### Generation of the file .DAWN.history for DAWN GUI
 		//-----
-	ofstream gui_out (".DAWN_1.history") ; 
+	G4std::ofstream gui_out (".DAWN_1.history") ; 
 
 	// ######### P1 
 
 		//----- camera position
-	gui_out << camera_distance << endl;
-	gui_out << v_angle  << endl ;
-        gui_out << h_angle  << endl ;
-        gui_out << "0"  << endl     ; // auto target
+	gui_out << camera_distance << G4endl;
+	gui_out << v_angle  << G4endl ;
+        gui_out << h_angle  << G4endl ;
+        gui_out << "0"  << G4endl     ; // auto target
 
 		//----- target point 
 	const G4Point3D&  target_point = fVP.GetCurrentTargetPoint();
-	gui_out << target_point.x()          << endl ;
-	gui_out << target_point.y()          << endl ;
-	gui_out << target_point.z()          << endl ;
+	gui_out << target_point.x()          << G4endl ;
+	gui_out << target_point.y()          << G4endl ;
+	gui_out << target_point.z()          << G4endl ;
 
 		//----- Magnification
 	const G4double   zoom_factor  = fVP.GetZoomFactor();
 	if( half_view_angle < MIN_HALF_ANGLE ) {
 
-		gui_out << zoom_factor << endl;
+		gui_out << zoom_factor << G4endl;
 
 	} else {
 		const G4double FR_HALF_SCREEN_SIZE = 0.5 ;
@@ -285,33 +285,33 @@ void G4DAWNFILEViewer::SendViewParameters ()
 		  = FR_HALF_SCREEN_SIZE / tan( half_view_angle ); 
 		focal_distance *= zoom_factor ;
 
-		gui_out << "fd" << focal_distance << endl;
+		gui_out << "fd" << focal_distance << G4endl;
 
 	}
 	SendDrawingStyleToDAWNGUI( gui_out ) ; // gui_out, viewing mode
-	gui_out << "0.001" << endl           ; // 3D Tolerance 
-	gui_out << "0"     << endl           ; // not display parameters
+	gui_out << "0.001" << G4endl           ; // 3D Tolerance 
+	gui_out << "0"     << G4endl           ; // not display parameters
 
 
 	// ######### P2
-	gui_out << 1 << endl;   // Source light 
-	gui_out << 1 << endl;   
-	gui_out << 1 << endl;   
-	gui_out << 0.5 << endl; // Ambient light
-	gui_out << 0.5 << endl;
-	gui_out << 0.5 << endl;
-	gui_out << 19.0 << endl; // Light direction (Polar)
-	gui_out << 71.0 << endl; // Light direction (Azimuthal)
+	gui_out << 1 << G4endl;   // Source light 
+	gui_out << 1 << G4endl;   
+	gui_out << 1 << G4endl;   
+	gui_out << 0.5 << G4endl; // Ambient light
+	gui_out << 0.5 << G4endl;
+	gui_out << 0.5 << G4endl;
+	gui_out << 19.0 << G4endl; // Light direction (Polar)
+	gui_out << 71.0 << G4endl; // Light direction (Azimuthal)
 
 	// ######### P3
-	gui_out << 0.1 << endl;    // Real edge width
-	gui_out << 0.1 << endl;    // outline   width
-	gui_out << 0.1 << endl;    // aux edge  width
-	gui_out << 3   << endl;      // aux edge  style
-	gui_out << 70.0<< endl;   // aux-edge threshold angle
-	gui_out << 0.1 << endl;       // line width
-	gui_out << 0   << endl;        // haloing
-	gui_out << 1   << endl;        // Dashed edged for back faces
+	gui_out << 0.1 << G4endl;    // Real edge width
+	gui_out << 0.1 << G4endl;    // outline   width
+	gui_out << 0.1 << G4endl;    // aux edge  width
+	gui_out << 3   << G4endl;      // aux edge  style
+	gui_out << 70.0<< G4endl;   // aux-edge threshold angle
+	gui_out << 0.1 << G4endl;       // line width
+	gui_out << 0   << G4endl;        // haloing
+	gui_out << 1   << G4endl;        // Dashed edged for back faces
 
 	//######### P4
                //----- drawing device
@@ -321,14 +321,14 @@ void G4DAWNFILEViewer::SendViewParameters ()
             ( ( getenv( FR_ENV_MULTI_WINDOW2 ) != NULL        ) && \
               ( strcmp( getenv( FR_ENV_MULTI_WINDOW2 ),"0"  ) )      )     )
         {
-                gui_out << 2 << endl; // OpenWindow
+                gui_out << 2 << G4endl; // OpenWindow
         } else {
-                gui_out << 1 << endl; // Invoke PS viewer
+                gui_out << 1 << G4endl; // Invoke PS viewer
         }
 
-	gui_out << GetPSViewer() << endl; // PS viewer
-	gui_out << 0 << endl            ; // Do not add showpage 
-	gui_out << 0 << endl            ; // Non-append mode
+	gui_out << GetPSViewer() << G4endl; // PS viewer
+	gui_out << 0 << G4endl            ; // Do not add showpage 
+	gui_out << 0 << G4endl            ; // Non-append mode
 
 	gui_out.close();
 	//########### end of generating file .DAWN.history 
diff --git a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
index 6164880c16..53131dd2d1 100644
--- a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRClientServer.cc,v 1.2.8.1 1999/12/07 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRClientServer.cc,v 1.3 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Satoshi TANAKA, Wed Jul  3 14:14:29 JST 1996
 ////////////////////////////////
@@ -101,7 +101,7 @@ void	G4FRClientServer::Receive()
 	}
 
 #if defined DEBUG_CLIENT_SERVER
-	G4cerr << ">>>>> receivedMessage = " << fReceivedMessage << endl;
+	G4cerr << ">>>>> receivedMessage = " << fReceivedMessage << G4endl;
 #endif
 
 }
@@ -132,7 +132,7 @@ void	G4FRClientServer::Send()
 	}
 
 #if defined DEBUG_CLIENT_SERVER
-	G4cerr << "<<<<< SentMessage = " << fSendingMessage << endl;
+	G4cerr << "<<<<< SentMessage = " << fSendingMessage << G4endl;
 #endif
 
 } // G4FRClientServer::Send()
@@ -253,7 +253,7 @@ int G4FRClientServer::ConnectINET()
 
 
 // #if defined DEBUG_CLIENT_SERVER
-	G4cerr << "***** Trying connection to  " << server_hostname << endl;
+	G4cerr << "***** Trying connection to  " << server_hostname << G4endl;
 // #endif 
 	
 
diff --git a/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc b/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
index cbc408e7f4..31200f713a 100644
--- a/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
+++ b/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRSceneFunc.icc,v 1.9.2.1 1999/12/07 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRSceneFunc.icc,v 1.10 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 
@@ -113,8 +113,8 @@ void G4FRSCENE::AddPrimitive ( const G4Text& text )
 		//----- create buffer and copy the string there
 	int   MAX_STR_LENGTH   =  COMMAND_BUF_SIZE - 100 ;
 	if  ( MAX_STR_LENGTH <= 0 ) { 
-		G4cerr << "ERROR (FukuiRenderer) : Not enough buffer size for data transferring." << endl;
-		G4cerr << "                        G4Text Visualization is aborted" << endl;
+		G4cerr << "ERROR (FukuiRenderer) : Not enough buffer size for data transferring." << G4endl;
+		G4cerr << "                        G4Text Visualization is aborted" << G4endl;
 		return ;
 	}
 	char*  buf  = new char [ (MAX_STR_LENGTH + 1) ] ; 
@@ -301,7 +301,7 @@ void G4FRSCENE::SendNdiv ( void )
 {
 //////////////////////////////////////////////////
 //#if defined DEBUG_FR_SCENE
-//	G4cerr << "***** SendNdiv() (/Ndiv)" << endl;
+//	G4cerr << "***** SendNdiv() (/Ndiv)" << G4endl;
 //#endif
 //////////////////////////////////////////////////
 
@@ -315,7 +315,7 @@ void G4FRSCENE::SendNdiv ( void )
 #if defined DEBUG_FR_SCENE
 	   G4cerr << "WARNING: GetNoOfSides() failed. " ;
 	   G4cerr << "The default value " << num_division ;
-	   G4cerr << " is assigned." << endl;
+	   G4cerr << " is assigned." << G4endl;
 #endif
 	}
 
@@ -324,7 +324,7 @@ void G4FRSCENE::SendNdiv ( void )
 
 //////////////////////////////////////////////////
 //#if defined DEBUG_FR_SCENE
-//	G4cerr << "Ndiv = " << num_division << endl;
+//	G4cerr << "Ndiv = " << num_division << G4endl;
 //#endif
 //////////////////////////////////////////////////
 
@@ -339,13 +339,13 @@ void G4FRSCENE::FREndModeling ()
 {
 		//----- 		
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** FREndModeling (called)" << endl;
+	G4cerr << "***** FREndModeling (called)" << G4endl;
 #endif
 	if( FRIsInModeling() ) {
 
 #if defined DEBUG_FR_SCENE
 		G4cerr << "***** FREndModeling (started) " ; 
-		G4cerr << "(/EndModeling, /DrawAll, /CloseDevice)" << endl;
+		G4cerr << "(/EndModeling, /DrawAll, /CloseDevice)" << G4endl;
 #endif
 
 		SendStr( "#--------------------" );	
@@ -653,9 +653,9 @@ void G4FRSCENE::AddThis (const G4Para& para)
 		//----- parameters preprocessing
 	G4double cosTheta                  = para.GetSymAxis().z() ;
 	if( cosTheta < epsilon ) {
-		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << endl;
-		G4cerr << "  Invalid parameter for parallelepiped."   << endl;
-		G4cerr << "  Drawing is skipped."                     << endl;
+		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << G4endl;
+		G4cerr << "  Invalid parameter for parallelepiped."   << G4endl;
+		G4cerr << "  Drawing is skipped."                     << G4endl;
 		return ;
 	}
 	G4double tanTheta_cosPhi_cosTheta  = para.GetSymAxis().x() ;
@@ -709,9 +709,9 @@ void G4FRSCENE::AddThis (const G4Trap& trap)
 		//----- parameters preprocessing
 	G4double cosTheta                  = trap.GetSymAxis().z() ;
 	if( cosTheta < epsilon ) {
-		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << endl;
-		G4cerr << "  Invalid parameter for trap, 1" << endl;
-		G4cerr << "  Drawing is skipped."           << endl;
+		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << G4endl;
+		G4cerr << "  Invalid parameter for trap, 1" << G4endl;
+		G4cerr << "  Drawing is skipped."           << G4endl;
 		return ;
 	}
 
@@ -897,7 +897,7 @@ G4bool G4FRSCENE::IsVisible()
 void G4FRSCENE::SendBoundingBox( void )
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** SendBoundingBox ()  (/BoundingBox)" << endl;
+	G4cerr << "***** SendBoundingBox ()  (/BoundingBox)" << G4endl;
 #endif
 
 		//----- (1A) CALC bounding box of the bounding sphere
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
index e073e5588a..a5cb364621 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRenderer.cc,v 1.3.8.1 1999/12/07 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRenderer.cc,v 1.4 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA
@@ -77,7 +77,7 @@ G4VSceneHandler* G4FukuiRenderer::CreateSceneHandler (const G4String& name)
 	if(!flag_connected) { delete p ;  p = NULL ; }
 
 	G4cout	<< G4FukuiRendererSceneHandler::GetSceneCount ()
-		<< ' ' << fName << " scenes extanct." << endl;
+		<< ' ' << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
@@ -97,7 +97,7 @@ void G4FukuiRenderer::UseInetDomainAuto()
 	int		pid ;
 
 #if defined DEBUG_FR_SYSTEM
-	G4cerr << "***** Unix Inet Domain (AUTO mode)" << endl;
+	G4cerr << "***** Unix Inet Domain (AUTO mode)" << G4endl;
 #endif
 	fIPMode = G4FukuiRenderer::IP_UNIX ;
 
@@ -127,11 +127,11 @@ void G4FukuiRenderer::UseInetDomainAuto()
 	}
 
 	if(!flag_connected) { 
-	  G4cerr << "***** ERROR: Connection failed" << endl; 
+	  G4cerr << "***** ERROR: Connection failed" << G4endl; 
 	}
 	else { 
 	  G4cerr << "***** GEANT4 is connected to FukuiRenderer DAWN ";
-	  G4cerr << "in the same host" << endl; 
+	  G4cerr << "in the same host" << G4endl; 
 	}
 
 } //  G4FukuiRenderer::UseInetDomainAuto()
@@ -142,18 +142,18 @@ void
 G4FukuiRenderer::UseInetDomain()
 {
 #if defined DEBUG_FR_SYSTEM
-	G4cerr << "***** INET Domain " << endl;
+	G4cerr << "***** INET Domain " << G4endl;
 #endif
 	fIPMode = G4FukuiRenderer::IP_INET ;
 
 	this->ConnectPort();
 
 	if(!flag_connected) {
-	  G4cerr << "***** ERROR: Connection failed" << endl; 
+	  G4cerr << "***** ERROR: Connection failed" << G4endl; 
 	}
 	else { 
 	  G4cerr << "GEANT4 is connected to FukuiRenderer DAWN via socket" ; 
-	  G4cerr << endl; 
+	  G4cerr << G4endl; 
 	}
 
 } // G4FukuiRenderer::UseInetDomain()
@@ -166,10 +166,10 @@ G4FukuiRenderer::ConnectPort( int max_port_incr )
   while(1) {
     if ( ++connect_trial > max_port_incr ) {
 	this->flag_connected = 0 ;
-	G4cerr << "***** INET Connection failed."                << endl;
-	G4cerr << "      Maybe, you have not invoked DAWN yet,"  << endl;
-	G4cerr << "      or too many DAWN's are already running" << endl;
-	G4cerr << "      in the server host."                    << endl;
+	G4cerr << "***** INET Connection failed."                << G4endl;
+	G4cerr << "      Maybe, you have not invoked DAWN yet,"  << G4endl;
+	G4cerr << "      or too many DAWN's are already running" << G4endl;
+	G4cerr << "      in the server host."                    << G4endl;
 	fPrimDest.IncrementPortNumber( (- FR_MAX_PORT_INCR) );
 	return ;
     } else if ( fPrimDest.ConnectINET() ) { 
@@ -177,14 +177,14 @@ G4FukuiRenderer::ConnectPort( int max_port_incr )
 	this->flag_connected = 1 ;
 	G4cerr << "***** GEANT4 is connected to port  " ;
 	G4cerr << fPrimDest.GetPortNumber() ; 
-	G4cerr << "  of server" << endl;
+	G4cerr << "  of server" << G4endl;
 	break ; 
     } else { 
 	    // Connection failed. Try the next port.
       this->flag_connected = 0 ;
       fPrimDest.IncrementPortNumber();
       G4cerr << "***** GEANT4 incremented targeting port to " ;
-      G4cerr << fPrimDest.GetPortNumber() << endl;
+      G4cerr << fPrimDest.GetPortNumber() << G4endl;
 
     } // if-elseif-else
 
@@ -198,7 +198,7 @@ void G4FukuiRenderer::UseBSDUnixDomainAuto()
 	int     pid ;
 
 #if defined DEBUG_FR_SYSTEM
-	G4cerr << "***** UseBSDUnixDomainAuto " << endl;
+	G4cerr << "***** UseBSDUnixDomainAuto " << G4endl;
 #endif
 	fIPMode = G4FukuiRenderer::IP_UNIX ; // Unix domain
 
@@ -224,10 +224,10 @@ void G4FukuiRenderer::UseBSDUnixDomainAuto()
 
 			//----- display status
 		if(!flag_connected) {
-		  G4cerr << "***** ERROR: Connection failed" << endl; 
+		  G4cerr << "***** ERROR: Connection failed" << G4endl; 
 		} else { 
 		  G4cerr << "*** GEANT4 is connected to FukuiRenderer DAWN ";
-		  G4cerr <<  "in the same host" << endl; 
+		  G4cerr <<  "in the same host" << G4endl; 
 		}
 
 	} // if--else
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
index 7e7f7c3ddd..6d9926d9ca 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRendererSceneHandler.cc,v 1.2.4.1 1999/12/07 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRendererSceneHandler.cc,v 1.3 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:34:24 JST 1996
@@ -23,7 +23,7 @@
 // #define DEBUG_FR_SCENE
 
      //----- header files
-#include <fstream.h>
+#include "g4std/fstream"
 //#include <strstream.h>
 #include <string.h>
 #include "globals.hh"
@@ -96,7 +96,7 @@ COMMAND_BUF_SIZE       (G4FRClientServer::SEND_BUFMAX)
 G4FukuiRendererSceneHandler::~G4FukuiRendererSceneHandler () 
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4FukuiRendererSceneHandler" << endl;
+	G4cerr << "***** ~G4FukuiRendererSceneHandler" << G4endl;
 #endif 
   fSceneCount--;
   ClearStore (); // clear current scene
@@ -109,7 +109,7 @@ void G4FukuiRendererSceneHandler::FRBeginModeling( void )
 	if( !FRIsInModeling() )  	
 	{
 #if defined DEBUG_FR_SCENE
-	  G4cerr << "***** G4FukuiRendererSceneHandler::FRBeginModeling (called & started)" << endl;
+	  G4cerr << "***** G4FukuiRendererSceneHandler::FRBeginModeling (called & started)" << G4endl;
 #endif
 
 	  //----- Begin Saving g4.prim file
@@ -145,21 +145,21 @@ void G4FukuiRendererSceneHandler::FRBeginModeling( void )
 	  //----- send SET_CAMERA command 
 	  //   !SetCamera
 #if defined DEBUG_FR_SCENE
-		G4cerr << "*****   (!SetCamera in FRBeginModeling())" << endl;
+		G4cerr << "*****   (!SetCamera in FRBeginModeling())" << G4endl;
 #endif
 	  SendStr( FR_SET_CAMERA );
 
 	  //----- open device
 	  //   !OpenDevice
 #if defined DEBUG_FR_SCENE
-		G4cerr << "*****   (!OpenDevice in FRBeginModeling())" << endl;
+		G4cerr << "*****   (!OpenDevice in FRBeginModeling())" << G4endl;
 #endif
 	  SendStr( FR_OPEN_DEVICE      );
 
 	  //----- begin sending primitives
 	  //   !BeginModeling
 #if defined DEBUG_FR_SCENE
-	  G4cerr << "*****   (!BeginModeling in FRBeginModeling())" << endl;
+	  G4cerr << "*****   (!BeginModeling in FRBeginModeling())" << G4endl;
 #endif
 	  SendStr( FR_BEGIN_MODELING );  FRflag_in_modeling = true ;
 
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
index 52d6a7459d..e09a6f3acb 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FukuiRendererViewer.cc,v 1.3.4.1 1999/12/07 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FukuiRendererViewer.cc,v 1.4 1999/12/15 14:54:01 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 12:09:11 JST 1996
@@ -53,7 +53,7 @@ G4FukuiRendererViewer::~G4FukuiRendererViewer ()
 void G4FukuiRendererViewer::SetView () 
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4FukuiRendererViewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4FukuiRendererViewer::SetView(): No effects" << G4endl;
 #endif 
 // Do nothing, since DAWN is running as a different process.
 // SendViewParameters () will do this job instead.
@@ -64,7 +64,7 @@ void
 G4FukuiRendererViewer::ClearView( void )
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4FukuiRendererViewer::ClearView (): No effects " << endl;
+  G4cerr << "***** G4FukuiRendererViewer::ClearView (): No effects " << G4endl;
 #endif
 
 }
@@ -74,7 +74,7 @@ G4FukuiRendererViewer::ClearView( void )
 void G4FukuiRendererViewer::DrawView () 
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::DrawView () " << endl;
+	G4cerr << "***** G4FukuiRendererViewer::DrawView () " << G4endl;
 #endif
 
 	//----- Begin modeling 3D 
@@ -93,7 +93,7 @@ void G4FukuiRendererViewer::DrawView ()
 void G4FukuiRendererViewer::ShowView( void )
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::ShowView () " << endl;
+	G4cerr << "***** G4FukuiRendererViewer::ShowView () " << G4endl;
 #endif
 
 	if( fSceneHandler.FRIsInModeling() ) 
@@ -114,12 +114,12 @@ void G4FukuiRendererViewer::ShowView( void )
 void  G4FukuiRendererViewer::Wait()
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::Wait () : Begin" << endl;
+	G4cerr << "***** G4FukuiRendererViewer::Wait () : Begin" << G4endl;
 #endif
   fSceneHandler.SendStr    ( FR_WAIT );
   fSceneHandler.GetPrimDest().WaitSendBack( FR_WAIT );
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::Wait () : end" << endl;
+	G4cerr << "***** G4FukuiRendererViewer::Wait () : end" << G4endl;
 #endif
 
 }
@@ -130,7 +130,7 @@ void
 G4FukuiRendererViewer::SendDevice( FRDEV dev )
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::SendDevice() " << endl;
+	G4cerr << "***** G4FukuiRendererViewer::SendDevice() " << G4endl;
 #endif
 
   //	enum {PS=1, XWIN=2, PS2=3, XWIN2=4, OPEN_GL=5, DEVICE_END=6};
@@ -145,7 +145,7 @@ G4FukuiRendererViewer::SendDevice( FRDEV dev )
 void  G4FukuiRendererViewer::SendDrawingStyle() 
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4FukuiRendererViewer::SendDrawingStyle() " << endl;
+	G4cerr << "***** G4FukuiRendererViewer::SendDrawingStyle() " << G4endl;
 #endif
 
 	G4int  style = fVP.GetDrawingStyle();
@@ -178,7 +178,7 @@ void G4FukuiRendererViewer::SendViewParameters ()
   // later due to user interaction via visualization system's GUI.)
 
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4FukuiRendererViewer::SendViewParameters()" << endl;
+  G4cerr << "***** G4FukuiRendererViewer::SendViewParameters()" << G4endl;
 #endif 
 
 		//----- Magic number to decide camera distance automatically
@@ -206,8 +206,8 @@ void G4FukuiRendererViewer::SendViewParameters ()
 	}
 
 	if ( camera_distance < radius ) { 
-		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << endl;
-		G4cerr << "  Camera cannot enter inside objects"      << endl;
+		G4cerr << "WARNING from FukuiRenderer (DAWN) driver:" << G4endl;
+		G4cerr << "  Camera cannot enter inside objects"      << G4endl;
 		camera_distance = radius ; 
 	}
 
diff --git a/source/visualization/History b/source/visualization/History
index d9e05b2ea6..eb46ce746d 100644
--- a/source/visualization/History
+++ b/source/visualization/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.54 1999/12/07 11:05:52 johna Exp $
+$Id: History,v 1.59 2000/01/17 10:36:40 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -24,6 +24,31 @@ committal in the CVS repository !
 History file for visualization category
 ---------------------------------------
 
+vis-V01-00-03  17th January 2000  John Allison
+- Added protection for no voxelisation in G4LogicalVolumeModel.cc.
+- Changed endl to G4endl in G4VisCommandsViewer.cc and G4GoSceneHandler.cc.
+
+14th January 2000  John Allison
+- Added protection for no viewer in G4VisCommandsViewer.cc.
+
+vis-V01-00-02  11th January 2000  John Allison
+- General handling of displaced solid (G4PhysicalVolumeModel).
+- Introduced /vis/viewer/show (/vis/viewer/update is synonym).
+- Improved printing in /vis/camera/reset.
+
+vis-V01-00-01  27th December 1999  Satoshi Tanaka
+- VRML-V01-00-00 27th December 1999  Satoshi Tanaka
+- G4endl ==> "\n" for fDest objects ... for ISO standard C++ compiler
+
+vis-V01-00-00  16th December 1999  John Allison
+- (Note: NOT FOR SYSTEM TESTING - this tag still has problems with
+   displaying logical volumes and text.)
+- Added /vis/viewer/refresh.
+- Rationalised command lists for keeping parameter lists up to date,
+  G4VVisCommand::sceneNameCommands, etc.
+- Added AddThis(const G4Polycone&), etc., to prevent hiding warnings.
+- Developments in test - see test/History.
+
 vis-V00-01-14a  7th December 1999  John Allison
 - Added `class' keyword in friend statement in G4VisStateDependent.hh
   to keep HP happy.
diff --git a/source/visualization/OPACS/include/G4GoSceneHandler.hh b/source/visualization/OPACS/include/G4GoSceneHandler.hh
index f9fbd60d6c..7951f0d721 100644
--- a/source/visualization/OPACS/include/G4GoSceneHandler.hh
+++ b/source/visualization/OPACS/include/G4GoSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GoSceneHandler.hh,v 1.3.8.1 1999/12/07 20:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GoSceneHandler.hh,v 1.5 1999/12/16 17:25:02 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -47,6 +47,8 @@ public:
   void AddThis         (const G4Sphere&);
   void AddThis         (const G4Para&);
   void AddThis         (const G4Torus&);
+  void AddThis         (const G4Polycone&);
+  void AddThis         (const G4Polyhedra&);
   void AddThis         (const G4VSolid&);
  
   void BeginPrimitives (const G4Transform3D& objectTransformation);
diff --git a/source/visualization/OPACS/include/G4Wo.hh b/source/visualization/OPACS/include/G4Wo.hh
index b19b42628e..0d451b11f7 100644
--- a/source/visualization/OPACS/include/G4Wo.hh
+++ b/source/visualization/OPACS/include/G4Wo.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Wo.hh,v 1.4.8.1 1999/12/07 20:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Wo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4WoViewer.hh b/source/visualization/OPACS/include/G4WoViewer.hh
index e63c2e0baa..75c013bc03 100644
--- a/source/visualization/OPACS/include/G4WoViewer.hh
+++ b/source/visualization/OPACS/include/G4WoViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4WoViewer.hh,v 1.3.8.1 1999/12/07 20:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4WoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4Xo.hh b/source/visualization/OPACS/include/G4Xo.hh
index 55823b18a7..786523ac60 100644
--- a/source/visualization/OPACS/include/G4Xo.hh
+++ b/source/visualization/OPACS/include/G4Xo.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Xo.hh,v 1.4.8.1 1999/12/07 20:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Xo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4XoViewer.hh b/source/visualization/OPACS/include/G4XoViewer.hh
index ceff5e9215..e2513560ac 100644
--- a/source/visualization/OPACS/include/G4XoViewer.hh
+++ b/source/visualization/OPACS/include/G4XoViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XoViewer.hh,v 1.3.8.1 1999/12/07 20:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4GoSceneHandler.cc b/source/visualization/OPACS/src/G4GoSceneHandler.cc
index ca73f1afc1..0e6ea131aa 100644
--- a/source/visualization/OPACS/src/G4GoSceneHandler.cc
+++ b/source/visualization/OPACS/src/G4GoSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GoSceneHandler.cc,v 1.4.4.1 1999/12/07 20:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GoSceneHandler.cc,v 1.7 2000/01/17 10:28:50 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -59,7 +59,7 @@ G4GoSceneHandler::G4GoSceneHandler (
 /*.........................................................................*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::G4GoSceneHandler" << endl;
+  G4cout << "G4GoSceneHandler::G4GoSceneHandler" << G4endl;
 #endif
   fSceneCount++;
 }
@@ -87,7 +87,7 @@ void G4GoSceneHandler::AddPrimitive (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyline&) " << line.entries () << endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyline&) " << line.entries () << G4endl;
 #endif
   SetColour        (GetColour(line));
   int              nPoints = line.entries ();
@@ -111,7 +111,7 @@ void G4GoSceneHandler::AddPrimitive (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polymarker&) " << line.entries () << endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polymarker&) " << line.entries () << G4endl;
 #endif
   SetColour  (GetColour(line));
   int        nPoints = line.entries ();
@@ -142,7 +142,7 @@ void G4GoSceneHandler::AddPrimitive (
     << " x : " << center.x() 
     << " y : " << center.y() 
     << " z : " << center.z() 
-    << " ,radius : " << radius << endl;
+    << " ,radius : " << radius << G4endl;
 #endif
   // Direction of circle ?
   //GoAddCircleToNode (fGoNode,radius,center.x(),center.y(),center.z(),0.,0.,1.);
@@ -157,7 +157,7 @@ void G4GoSceneHandler::AddPrimitive (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyhedron&) " << endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyhedron&) " << G4endl;
 #endif
   SetColour     (GetColour(polyhedron));
 
@@ -227,7 +227,7 @@ void G4GoSceneHandler::AddPrimitive (
 {
   SetColour (GetTextColour(text));
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Text&) " << endl; 
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Text&) " << G4endl; 
 #endif
   CWarnF ("G4GoSceneHandler::AddPrimitive G4Text : not yet implemented.\n");
 }
@@ -241,7 +241,7 @@ void G4GoSceneHandler::AddPrimitive (
 {
   SetColour (GetColour(Square));
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Square&) " << endl; 
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Square&) " << G4endl; 
 #endif
   CWarnF ("G4GoSceneHandler::AddPrimitive G4Square : not yet implemented.\n");
 }
@@ -256,7 +256,7 @@ void G4GoSceneHandler::AddPrimitive (
 {
   SetColour (GetColour(nurb));
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4NURBS&) " << endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4NURBS&) " << G4endl;
 #endif
   CWarnF ("G4GoSceneHandler::AddPrimitive G4NURBS : not yet implemented.\n");
 }
@@ -268,7 +268,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Box&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Box&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (box);
 }
@@ -280,7 +280,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Cons&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Cons&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (cons);
 }
@@ -292,7 +292,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Tubs&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Tubs&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (tubs);
 }
@@ -304,7 +304,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Trd&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Trd&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (trd);
 }
@@ -316,7 +316,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Trap&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Trap&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (trap);
 }
@@ -328,7 +328,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Sphere&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Sphere&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (sphere);
 }
@@ -340,7 +340,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Para&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Para&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (para);
 }
@@ -352,11 +352,35 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4Torus&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4Torus&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (torus);
 }
 /***************************************************************************/
+void G4GoSceneHandler::AddThis (
+ const G4Polycone& polycone
+) 
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+#ifdef DEBUG
+  G4cout << "G4GoSceneHandler::AddThis(G4Polycone&) " << G4endl;
+#endif
+  G4VSceneHandler::AddThis (polycone);
+}
+/***************************************************************************/
+void G4GoSceneHandler::AddThis (
+ const G4Polyhedra& polyhedra
+) 
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+#ifdef DEBUG
+  G4cout << "G4GoSceneHandler::AddThis(G4Polyhedra&) " << G4endl;
+#endif
+  G4VSceneHandler::AddThis (polyhedra);
+}
+/***************************************************************************/
 void G4GoSceneHandler::AddThis (
  const G4VSolid& solid
 ) 
@@ -364,7 +388,7 @@ void G4GoSceneHandler::AddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddThis(G4VSolid&) " << endl;
+  G4cout << "G4GoSceneHandler::AddThis(G4VSolid&) " << G4endl;
 #endif
   G4VSceneHandler::AddThis (solid);
 }
@@ -388,7 +412,7 @@ void G4GoSceneHandler::PreAddThis (
   nodeName = CStringCreateF (15+64,"PhysicalVolume/%lu",currentPhysicalVolume );
 
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::PreAddThis : " << nodeName << endl;
+  G4cout << "G4GoSceneHandler::PreAddThis : " << nodeName << G4endl;
 #endif
 }
 /***************************************************************************/
@@ -398,7 +422,7 @@ void G4GoSceneHandler::PostAddThis (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::PostAddThis" << endl;
+  G4cout << "G4GoSceneHandler::PostAddThis" << G4endl;
 #endif
   CStringDelete (nodeName);
   nodeName      = NULL;
@@ -412,7 +436,7 @@ void G4GoSceneHandler::BeginPrimitives (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::BeginPrimitives" << endl;
+  G4cout << "G4GoSceneHandler::BeginPrimitives" << G4endl;
 #endif
 
   G4VSceneHandler::BeginPrimitives (objectTransformation);
@@ -439,7 +463,7 @@ void G4GoSceneHandler::EndPrimitives (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::EndPrimitives" << endl;
+  G4cout << "G4GoSceneHandler::EndPrimitives" << G4endl;
 #endif
   HepRotation     rot = transformation.getRotation();
   Hep3Vector      tra = transformation.getTranslation();
@@ -460,7 +484,7 @@ void G4GoSceneHandler::ClearStore (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::ClearStore" << endl;
+  G4cout << "G4GoSceneHandler::ClearStore" << G4endl;
 #endif
   if(ONodeIsValid(fTransientRootGoNode)==0) fTransientRootGoNode = NULL;
   ONodeDestroyChildren (fTransientRootGoNode);
@@ -474,7 +498,7 @@ void G4GoSceneHandler::ClearTransientStore (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::ClearTransientStore" << endl;
+  G4cout << "G4GoSceneHandler::ClearTransientStore" << G4endl;
 #endif
   if(ONodeIsValid(fTransientRootGoNode)==0) fTransientRootGoNode = NULL;
   ONodeDestroyChildren (fTransientRootGoNode);
@@ -489,7 +513,7 @@ void G4GoSceneHandler::RequestPrimitives (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::RequestPrimitives" << endl;
+  G4cout << "G4GoSceneHandler::RequestPrimitives" << G4endl;
 #endif
   G4VSceneHandler::RequestPrimitives (solid);
 }
@@ -500,7 +524,7 @@ ONode G4GoSceneHandler::GetRootNode (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::RequestPrimitives" << endl;
+  G4cout << "G4GoSceneHandler::RequestPrimitives" << G4endl;
 #endif
   if(ONodeIsValid(fRootGoNode)==0) {
     fRootGoNode = NULL;
@@ -522,7 +546,7 @@ void G4GoSceneHandler::SetColour (
   G4cout << "G4GoSceneHandler::SetColour : red : " << a_colour.GetRed ()   <<
                               " green : " << a_colour.GetGreen () <<  
                                " blue : " << a_colour.GetBlue ()  <<
-                              " index : " << index                << endl;
+                              " index : " << index                << G4endl;
 #endif
   OContextSetColorIndex (OContextGetStaticInstance(),index);
 }
diff --git a/source/visualization/OPACS/src/G4Wo.cc b/source/visualization/OPACS/src/G4Wo.cc
index 8f2c1bc25b..2b410db547 100644
--- a/source/visualization/OPACS/src/G4Wo.cc
+++ b/source/visualization/OPACS/src/G4Wo.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Wo.cc,v 1.3.8.1 1999/12/07 20:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Wo.cc,v 1.4 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4WoViewer.cc b/source/visualization/OPACS/src/G4WoViewer.cc
index b6ffb5d08c..8e699e9f03 100644
--- a/source/visualization/OPACS/src/G4WoViewer.cc
+++ b/source/visualization/OPACS/src/G4WoViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4WoViewer.cc,v 1.2.8.1 1999/12/07 20:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4WoViewer.cc,v 1.3 1999/12/15 14:54:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -47,7 +47,7 @@ G4WoViewer::G4WoViewer (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4WoViewer::G4WoViewer" << endl;
+  G4cout << "G4WoViewer::G4WoViewer" << G4endl;
 #endif
 
   if(WoIsInitialized()==0) {
@@ -149,13 +149,13 @@ void G4WoViewer::SetView (
     target + cameraDistance * fVP.GetViewpointDirection().unit();
 
 #ifdef DEBUG
-  G4cout << "G4WoViewer::SetView : target.x " << target.x() << " target.y " << target.y() << " target.z " << target.z() << endl;
+  G4cout << "G4WoViewer::SetView : target.x " << target.x() << " target.y " << target.y() << " target.z " << target.z() << G4endl;
   G4cout << "G4WoViewer::SetView :  dir.x " <<  fVP.GetViewpointDirection().unit().x() << 
                              "  dir.y " <<  fVP.GetViewpointDirection().unit().y() << 
-                             "  dir.z " <<  fVP.GetViewpointDirection().unit().z() << endl;
-  G4cout << "G4WoViewer::SetView : cameraDistance " << cameraDistance << endl;
-  G4cout << "G4WoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << endl;
-  G4cout << "G4WoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << endl;
+                             "  dir.z " <<  fVP.GetViewpointDirection().unit().z() << G4endl;
+  G4cout << "G4WoViewer::SetView : cameraDistance " << cameraDistance << G4endl;
+  G4cout << "G4WoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << G4endl;
+  G4cout << "G4WoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << G4endl;
 #endif
 
   OCameraSetCenter          (fGoCamera,target.x() ,target.y() ,target.z());
diff --git a/source/visualization/OPACS/src/G4Xo.cc b/source/visualization/OPACS/src/G4Xo.cc
index 39b3e9536f..41c6d21fc5 100644
--- a/source/visualization/OPACS/src/G4Xo.cc
+++ b/source/visualization/OPACS/src/G4Xo.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Xo.cc,v 1.4.4.1 1999/12/07 20:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Xo.cc,v 1.5 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4XoViewer.cc b/source/visualization/OPACS/src/G4XoViewer.cc
index da962094e6..ef9fb598ad 100644
--- a/source/visualization/OPACS/src/G4XoViewer.cc
+++ b/source/visualization/OPACS/src/G4XoViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4XoViewer.cc,v 1.3.8.1 1999/12/07 20:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4XoViewer.cc,v 1.4 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -53,7 +53,7 @@ G4XoViewer::G4XoViewer (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4XoViewer::G4XoViewer" << endl;
+  G4cout << "G4XoViewer::G4XoViewer" << G4endl;
 #endif
 
   G4VInteractorManager* interactorManager = G4Xo::GetInteractorManager();
@@ -153,12 +153,12 @@ void G4XoViewer::SetView (
     target + cameraDistance * fVP.GetViewpointDirection().unit();
 
 #ifdef DEBUG
-  G4cout << "G4XoViewer::SetView : target.x " << target.x() << " target.y " << target.y() << " target.z " << target.z() << endl;
+  G4cout << "G4XoViewer::SetView : target.x " << target.x() << " target.y " << target.y() << " target.z " << target.z() << G4endl;
   G4cout << "G4XoViewer::SetView :  dir.x " <<  fVP.GetViewpointDirection().unit().x() << 
                              "  dir.y " <<  fVP.GetViewpointDirection().unit().y() << 
-                             "  dir.z " <<  fVP.GetViewpointDirection().unit().z() << endl;
-  G4cout << "G4XoViewer::SetView : cameraDistance " << cameraDistance << endl;
-  G4cout << "G4XoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << endl;
+                             "  dir.z " <<  fVP.GetViewpointDirection().unit().z() << G4endl;
+  G4cout << "G4XoViewer::SetView : cameraDistance " << cameraDistance << G4endl;
+  G4cout << "G4XoViewer::SetView : pCamera.x " << pCamera.x() << " pCamera.y " << pCamera.y() << " pCamera.z " << pCamera.z() << G4endl;
 #endif
 
   OCameraSetCenter          (fGoCamera,target.x() ,target.y() ,target.z());
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
index 63d8e4dc4d..3490313cd1 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.2.8.1 1999/12/07 20:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.3 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
index 62f38f0483..be63ba3456 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateViewer.hh,v 1.3.2.1 1999/12/07 20:53:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateViewer.hh,v 1.4 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
index 26367f5b32..76da1ed560 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateWin32.hh,v 1.3.8.1 1999/12/07 20:53:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateWin32.hh,v 1.4 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
index 7ac9b00296..e73cd0ec37 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.2.2.1 1999/12/07 20:53:15 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.3 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
index d53ac0077a..8ff402fa7d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateX.hh,v 1.4.8.1 1999/12/07 20:53:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateX.hh,v 1.5 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
index 2dd514b553..20a0954174 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXViewer.hh,v 1.3.2.1 1999/12/07 20:53:16 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXViewer.hh,v 1.4 1999/12/15 14:54:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
index 4d939fc8a7..9b058dbd5d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXm.hh,v 1.3.8.1 1999/12/07 20:53:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXm.hh,v 1.4 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
index 46f78f8998..06e4e16f60 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXmViewer.hh,v 1.2.2.1 1999/12/07 20:53:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXmViewer.hh,v 1.3 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
index dea9f7d7ef..227ee36ff5 100644
--- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.3.8.1 1999/12/07 20:53:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLSceneHandler.hh,v 1.5 1999/12/16 17:25:05 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -47,6 +47,8 @@ public:
   void AddThis (const G4Sphere&);
   void AddThis (const G4Para&);
   void AddThis (const G4Torus&);
+  void AddThis (const G4Polycone&);
+  void AddThis (const G4Polyhedra&);
   void AddThis (const G4VSolid&);
 
 protected:
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
index 96d11d1777..12d3dd1a5c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
+++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLSceneHandler.icc,v 1.1.8.1 1999/12/07 20:53:17 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLSceneHandler.icc,v 1.3 1999/12/16 17:25:06 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  20th January 1998
@@ -43,6 +43,14 @@ inline void G4OpenGLSceneHandler::AddThis (const G4Torus& torus) {
   G4VSceneHandler::AddThis (torus);
 }
 
+inline void G4OpenGLSceneHandler::AddThis (const G4Polycone& polycone) {
+  G4VSceneHandler::AddThis (polycone);
+}
+
+inline void G4OpenGLSceneHandler::AddThis (const G4Polyhedra& polyhedra) {
+  G4VSceneHandler::AddThis (polyhedra);
+}
+
 inline void G4OpenGLSceneHandler::AddThis (const G4VSolid& vsolid) {
   G4VSceneHandler::AddThis (vsolid);
 }
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
index 5dec986c61..1f0466f754 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.6.2.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.7 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -59,7 +59,7 @@ friend class G4OpenGLStoredViewer;
   
   // Stop-gap solution of structure re-use.
   // A proper implementation would use geometry hierarchy.
-  G4std::map <const G4VSolid*, G4int, less <const G4VSolid*> > fSolidMap;
+  G4std::map <const G4VSolid*, G4int, G4std::less <const G4VSolid*> > fSolidMap;
 };
 
 inline G4int G4OpenGLStoredSceneHandler::GetSceneCount () {
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
index 80f0018fa0..5fa1abee49 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredViewer.hh,v 1.4.2.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredViewer.hh,v 1.5 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
index b76b0f8db9..3d3c9e4129 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredWin32.hh,v 1.3.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredWin32.hh,v 1.4 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
index 81aac64280..738afee5d2 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.1.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.2 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
index de8d9c600e..05c3bfcb42 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredX.hh,v 1.4.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredX.hh,v 1.5 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
index ba076d348e..b0c011e215 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXViewer.hh,v 1.2.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXViewer.hh,v 1.3 1999/12/15 14:54:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
index 3cc4576f22..4d07983484 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXm.hh,v 1.3.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXm.hh,v 1.4 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
index fc8e9b7685..9fb220d1e5 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXmViewer.hh,v 1.1.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXmViewer.hh,v 1.2 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
index b1e867f113..913341ac79 100644
--- a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLTransform3D.hh,v 1.2.8.1 1999/12/07 20:53:18 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLTransform3D.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLViewer.hh b/source/visualization/OpenGL/include/G4OpenGLViewer.hh
index 7ee358932c..2a3099fb08 100644
--- a/source/visualization/OpenGL/include/G4OpenGLViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLViewer.hh,v 1.4.2.1 1999/12/07 20:53:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLViewer.hh,v 1.5 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
index 82116e0a8f..3fd4c0070c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLWin32Viewer.hh,v 1.2.2.1 1999/12/07 20:53:19 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLWin32Viewer.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
diff --git a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
index b8bfa56118..39445c0ba0 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXViewer.hh,v 1.5.2.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXViewer.hh,v 1.6 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
index 12a5e965ab..1b4b31a90f 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmBox.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmBox.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Box container class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh b/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
index 55c360dea6..5b9f2262ee 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmConvenienceRoutines.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmConvenienceRoutines.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
index 4f695fe762..2869389dad 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
index c7f13e05c2..970e907358 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmFramedBox.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmFramedBox.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Framed box container class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
index a1c75a70be..bcefd66a4c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmMainMenubarCallbacks.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmMainMenubarCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
index c48edf72c8..b828ac982d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmPanningCallbacks.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmPanningCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
index eb99a69201..9cb1b904ea 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmPushButton.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmPushButton.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
index 727c6b375b..ed6a32493b 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmRadioButton.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmRadioButton.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
index ace6846678..c4b08ec3b1 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmResources.hh,v 1.2.8.1 1999/12/07 20:53:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmResources.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Default resources file for GEANT4 OpenGL Motif windows.
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
index 38a11716bd..2e1430ed64 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmRotationCallbacks.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmRotationCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
index 5ddd1ebd6a..4b854426ba 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmSeparator.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmSeparator.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
index e2389d47ea..62177229ab 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmSliderBar.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmSliderBar.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
index f3655c6fa9..37e03d94f1 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmStyleCallbacks.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmStyleCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
index 35a40ece78..6d6a13f843 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmTextField.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmTextField.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
index 794755f9e4..f765b2a277 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmTopLevelShell.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmTopLevelShell.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Top level shell class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
index 980364c47c..ebc7c15af2 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Base class for all Motif component widgets
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
index 40e8cfbd78..c6bd941c80 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Base class for all Motif container widgets
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
index ed995f65f3..913eecd00c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetObject.hh,v 1.2.8.1 1999/12/07 20:53:21 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetObject.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Virtual base class for all Motif widgets.
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
index 65ed7781d4..a44dcb2c86 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetShell.hh,v 1.2.8.1 1999/12/07 20:53:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetShell.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //Base class for all Motif window widgets (shells)
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
index 70e555c1f3..f91592b08e 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmViewer.hh,v 1.2.2.1 1999/12/07 20:53:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmViewer.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
index 4e0a613b87..2411e8e4af 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmWindowHandlingCallbacks.hh,v 1.2.8.1 1999/12/07 20:53:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmWindowHandlingCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
index a465462292..9af65edfdb 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.2.8.1 1999/12/07 20:53:22 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -54,7 +54,7 @@ G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler ()
   fSceneCount--;
 }
 
-#include <iomanip.h>
+#include "g4std/iomanip"
 
 void G4OpenGLImmediateSceneHandler::BeginPrimitives
 (const G4Transform3D& objectTransformation) {
@@ -67,9 +67,9 @@ void G4OpenGLImmediateSceneHandler::BeginPrimitives
   G4cout << "G4OpenGLTransform3D matrix:";
   for (int i = 0; i < 16; i++) {
     if ((i % 4) == 0) G4cout << '\n';
-    G4cout << setw (15) << m[i];
+    G4cout << G4std::setw (15) << m[i];
   }
-  G4cout << endl;
+  G4cout << G4endl;
   *****************************************/
 
   glMultMatrixd (oglt.GetGLMatrix ());
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
index 9556fae58c..59b769274c 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateViewer.cc,v 1.2.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateViewer.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
index 0d54cab934..5d56d4d5ee 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateWin32.cc,v 1.3.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateWin32.cc,v 1.4 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
@@ -33,7 +33,7 @@ G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 ():
 G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler () {
   G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this);
   G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -45,14 +45,14 @@ G4VViewer* G4OpenGLImmediateWin32::CreateViewer (G4VSceneHandler& scene) {
       G4cerr << "G4OpenGLImmediateWin32::CreateViewer: error flagged by negative"
 	" view id in G4OpenGLImmediateWin32Viewer creation."
 	"\n Destroying view and returning null pointer."
-	   << endl;
+	   << G4endl;
       delete pView;
       pView = 0;
     }
   }
   else {
     G4cerr << "G4OpenGLImmediateWin32::CreateViewer: null pointer on"
-      " new G4OpenGLImmediateWin32Viewer." << endl;
+      " new G4OpenGLImmediateWin32Viewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
index 1070bd71c5..eeda456dde 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.1.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.2 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
index 8bbb157e05..08ce55cf6b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateX.cc,v 1.4.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateX.cc,v 1.5 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -36,7 +36,7 @@ G4OpenGLImmediateX::~G4OpenGLImmediateX () {}
 G4VSceneHandler* G4OpenGLImmediateX::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
   G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -49,14 +49,14 @@ G4VViewer* G4OpenGLImmediateX::CreateViewer (G4VSceneHandler& scene,
       G4cerr << "G4OpenGLImmediateX::CreateViewer: error flagged by negative"
 	" view id in G4OpenGLImmediateXViewer creation."
 	"\n Destroying view and returning null pointer."
-	   << endl;
+	   << G4endl;
       delete pView;
       pView = 0;
     }
   }
   else {
     G4cerr << "G4OpenGLImmediateX::CreateViewer: null pointer on"
-      " new G4OpenGLImmediateXViewer." << endl;
+      " new G4OpenGLImmediateXViewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
index e6f56bc201..3cfbfccbb5 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXViewer.cc,v 1.2.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXViewer.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -40,7 +40,7 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
 // ensure a suitable window was found
   if (!vi_immediate) {
     G4cerr << "G4OpenGLImmediateXViewer::G4OpenGLImmediateXViewer -"
-      " G4OpenGLXViewer couldn't get a visual." << endl;  
+      " G4OpenGLXViewer couldn't get a visual." << G4endl;  
     fViewId = -1;  // This flags an error.
     return;
   }
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
index af6ccb3b24..1ecfb88384 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXm.cc,v 1.3.8.1 1999/12/07 20:53:23 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXm.cc,v 1.4 1999/12/15 14:54:07 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -34,7 +34,7 @@ G4OpenGLImmediateXm::G4OpenGLImmediateXm ():
 G4VSceneHandler* G4OpenGLImmediateXm::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
   G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -46,14 +46,14 @@ G4VViewer* G4OpenGLImmediateXm::CreateViewer (G4VSceneHandler& scene,
     if (pView -> GetViewId () < 0) {
       G4cerr << "G4OpenGLImmediateXm::CreateViewer: error flagged by"
 	" negative view id in G4OpenGLImmediateXmViewer creation."
-	"\n Destroying view and returning null pointer." << endl;
+	"\n Destroying view and returning null pointer." << G4endl;
       delete pView;
       pView = 0;
     }
   }
   else {
     G4cerr << "G4OpenGLImmediateXm::CreateViewer: null pointer on"
-      " new G4OpenGLImmediateXmViewer." << endl;
+      " new G4OpenGLImmediateXmViewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
index 326ce49fc4..7322594a88 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLImmediateXmViewer.cc,v 1.1.8.1 1999/12/07 20:53:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLImmediateXmViewer.cc,v 1.2 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -38,7 +38,7 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
 // ensure a suitable window was found
   if (!vi_immediate) {
     G4cerr << "G4OpenGLImmediateXmViewer::G4OpenGLImmediateXmViewer -"
-      " G4OpenGLXmViewer couldn't get a visual." << endl;  
+      " G4OpenGLXmViewer couldn't get a visual." << G4endl;  
     fViewId = -1;  // This flags an error.
     return;
   }
diff --git a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
index 3405fd8390..0e3444416b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.3.8.1 1999/12/07 20:53:24 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLSceneHandler.cc,v 1.4 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -90,7 +90,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
     << ", size " << size
     << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
     << ", type " << sizeType
-    << endl;
+    << G4endl;
 }
 
 void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
@@ -122,7 +122,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
     
   default:
     G4cerr << "Unrecognised fill style for G4Circle in G4OpenGLSceneHandler."
-	 << "\nUsing G4VMarker::filled." << endl;
+	 << "\nUsing G4VMarker::filled." << G4endl;
     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
     break;
     
@@ -181,12 +181,12 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
     //      }
     //    }
 
-    //    G4cout << "proj is : \n" << proj << endl;
+    //    G4cout << "proj is : \n" << proj << G4endl;
 
     //    proj.invert(ierr);
 
-    //    G4cout << "ierr is " << ierr << endl;
-    //    G4cout << "proj^-1 is : \n" << proj << endl;
+    //    G4cout << "ierr is " << ierr << G4endl;
+    //    G4cout << "proj^-1 is : \n" << proj << G4endl;
     
     //    for (col = 1; col < 5; col++) {
     //      for (row = 1; row < 5; row++) {
@@ -242,7 +242,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Square& Square) {
     
   default:
     G4cerr << "Unrecognised fill style for G4Square in G4OpenGLSceneHandler."
-	 << "\nUsing G4VMarker::filled." << endl;
+	 << "\nUsing G4VMarker::filled." << G4endl;
     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
     break;
 
@@ -329,7 +329,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
     
     //  case (G4ViewParameters::hlhsr):
     //    cout << "Hidden edge not implememented in G4OpenGL.\n"
-    // << "Using hidden surface removal." << endl;
+    // << "Using hidden surface removal." << G4endl;
     
   case (G4ViewParameters::hsr):
     {
@@ -501,7 +501,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4NURBS& nurb) {
 
   case (G4ViewParameters::hlhsr):
     //    G4cout << "Hidden line removal not implememented in G4OpenGL.\n"
-    // << "Using hidden surface removal." << endl;
+    // << "Using hidden surface removal." << G4endl;
   case (G4ViewParameters::hsr):
     {
       glEnable (GL_LIGHTING);
@@ -520,7 +520,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4NURBS& nurb) {
     }
   case (G4ViewParameters::hlr):
     //    G4cout << "Hidden line removal not implememented in G4OpenGL.\n"
-    // << "Using wireframe." << endl;
+    // << "Using wireframe." << G4endl;
   case (G4ViewParameters::wireframe):
   default:
     glDisable (GL_LIGHTING);
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
index 753c15c00a..d49e62ed26 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.5.4.1 1999/12/07 20:53:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.6 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -67,7 +67,7 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives
       G4cout << "********************* WARNING! ********************\n"
 	   <<"Unable to allocate any more display lists in OpenGL.\n "
 	   << "      Continuing drawing in IMMEDIATE MODE.\n"
-	   << "***************************************************" << endl;
+	   << "***************************************************" << G4endl;
       fMemoryForDisplayLists = false;
     }
   }
@@ -117,14 +117,14 @@ void G4OpenGLStoredSceneHandler::ClearStore () {
     if (fPODLList (i)) {
       glDeleteLists (fPODLList (i), 1);
     } else {
-      G4cerr << "Warning : NULL display List in fPODLList." << endl;
+      G4cerr << "Warning : NULL display List in fPODLList." << G4endl;
     }
   }
   for (i = 0; i < fTODLList.entries (); i++) {
     if (fTODLList (i)) {
       glDeleteLists (fTODLList (i), 1);
     } else {
-      G4cerr << "Warning : NULL display List in fTODLList." << endl;
+      G4cerr << "Warning : NULL display List in fTODLList." << G4endl;
     }
   }
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
index dc0a342d09..3279336b29 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.3.8.1 1999/12/07 20:53:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredViewer.cc,v 1.4 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
index 917057d254..c09585eea7 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredWin32.cc,v 1.3.8.1 1999/12/07 20:53:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredWin32.cc,v 1.4 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
@@ -34,7 +34,7 @@ G4OpenGLStoredWin32::G4OpenGLStoredWin32 ():
 G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler () {
   G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this);
   G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -47,12 +47,12 @@ G4VViewer* G4OpenGLStoredWin32::CreateViewer (G4VSceneHandler& scene) {
       pView = 0;
       G4cerr << "G4OpenGLStoredWin32::CreateViewer: error flagged by"
 	" negative view id in G4OpenGLStoredWin32Viewer creation."
-	"\n Destroying view and returning null pointer." << endl;
+	"\n Destroying view and returning null pointer." << G4endl;
     }
   }
   else {
     G4cerr << "G4OpenGLStoredWin32::CreateViewer: null pointer on"
-      " new G4OpenGLStoredWin32Viewer." << endl;
+      " new G4OpenGLStoredWin32Viewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
index 249f1a36da..753871bd7d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.1.8.1 1999/12/07 20:53:25 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.2 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
index c4542e345c..a5d41b9085 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredX.cc,v 1.4.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredX.cc,v 1.5 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -37,7 +37,7 @@ G4OpenGLStoredX::~G4OpenGLStoredX () {}
 G4VSceneHandler* G4OpenGLStoredX::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
   G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -51,12 +51,12 @@ G4VViewer* G4OpenGLStoredX::CreateViewer (G4VSceneHandler& scene,
       pView = 0;
       G4cerr << "G4OpenGLStoredX::CreateViewer: error flagged by"
 	" negative view id in G4OpenGLStoredXViewer creation."
-	"\n Destroying view and returning null pointer." << endl;
+	"\n Destroying view and returning null pointer." << G4endl;
     }
   }
   else {
     G4cerr << "G4OpenGLStoredX::CreateViewer: null pointer on"
-      " new G4OpenGLStoredXViewer." << endl;
+      " new G4OpenGLStoredXViewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
index 11b820c2c8..0bfcbb7f1f 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXViewer.cc,v 1.2.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXViewer.cc,v 1.3 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -40,7 +40,7 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
   if (!vi_stored) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLStoredXViewer::G4OpenGLStoredXViewer -"
-      " G4OpenGLXViewer couldn't get a visual." << endl;
+      " G4OpenGLXViewer couldn't get a visual." << G4endl;
     return;
   }
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
index 2223924878..a9acdb599e 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXm.cc,v 1.3.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXm.cc,v 1.4 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -34,7 +34,7 @@ G4OpenGLStoredXm::G4OpenGLStoredXm ():
 G4VSceneHandler* G4OpenGLStoredXm::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
   G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    pScene;
 }
 
@@ -47,12 +47,12 @@ G4VViewer* G4OpenGLStoredXm::CreateViewer (G4VSceneHandler& scene, const G4Strin
       pView = 0;
       G4cerr << "G4OpenGLStoredXm::CreateViewer: error flagged by"
 	" negative view id in G4OpenGLStoredXmViewer creation."
-	"\n Destroying view and returning null pointer." << endl;
+	"\n Destroying view and returning null pointer." << G4endl;
     }
   }
   else {
     G4cerr << "G4OpenGLStoredXm::CreateViewer: null pointer on"
-      " new G4OpenGLStoredXmViewer." << endl;
+      " new G4OpenGLStoredXmViewer." << G4endl;
   }
   return pView;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
index e1d7e1a671..411f16c826 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLStoredXmViewer.cc,v 1.1.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLStoredXmViewer.cc,v 1.2 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -37,7 +37,7 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
   if (!vi_stored) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLStoredXmViewer::G4OpenGLStoredXmViewer -"
-      " G4OpenGLXmViewer couldn't get a visual." << endl;
+      " G4OpenGLXmViewer couldn't get a visual." << G4endl;
     return;
   }
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
index 2f2ff751f7..8e7069a2d0 100644
--- a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLTransform3D.cc,v 1.2.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLTransform3D.cc,v 1.3 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/src/G4OpenGLViewer.cc b/source/visualization/OpenGL/src/G4OpenGLViewer.cc
index f01898ac3c..a4498ed438 100644
--- a/source/visualization/OpenGL/src/G4OpenGLViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLViewer.cc,v 1.3.8.1 1999/12/07 20:53:26 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLViewer.cc,v 1.4 1999/12/15 14:54:08 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -198,7 +198,7 @@ void G4OpenGLViewer::HaloingSecondPass () {
 
 void G4OpenGLViewer::HLRFirstPass () {
 
-  G4cout << "First pass HLR" << endl;
+  G4cout << "First pass HLR" << G4endl;
 
   //Hidden line drawing requires three renderings to different buffers, so it
   //cannot be treated in G4OpenGLSceneHandler alone (as can wireframe or hidden 
@@ -243,7 +243,7 @@ void G4OpenGLViewer::HLRFirstPass () {
 
 void G4OpenGLViewer::HLRSecondPass () {
 
-  G4cout << "Second pass HLR" << endl;
+  G4cout << "Second pass HLR" << G4endl;
 
   //2) Use the stencil buffer to mask out pixels where stencil value = 1, and
   //   render to the stencil buffer as depth tested filled polygons.
@@ -266,7 +266,7 @@ void G4OpenGLViewer::HLRThirdPass () {
   //3) Turn off the stencil buffer, turn on the colour buffer
   //   and render polygons in wireframe mode.
 
-  G4cout << "Third pass HLR" << endl;
+  G4cout << "Third pass HLR" << G4endl;
 
   glDisable (GL_STENCIL_TEST);
   glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
diff --git a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
index e297ee7de9..80e2bebb47 100644
--- a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLWin32Viewer.cc,v 1.1.8.1 1999/12/07 20:53:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLWin32Viewer.cc,v 1.2 1999/12/15 14:54:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
diff --git a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
index 7f6df42b7e..fd806254f4 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXViewer.cc,v 1.4.8.1 1999/12/07 20:53:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXViewer.cc,v 1.6 1999/12/15 18:08:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -44,8 +44,11 @@
 #define USE_DEFAULT_COLORMAP 1
 #define USE_STANDARD_COLORMAP 0
 
-static Bool WaitForNotify (Display*, XEvent* e, char* arg) {
-  return (e->type == MapNotify) && (e->xmap.window == (Window) arg);
+extern "C"
+{
+  static Bool WaitForNotify (Display*, XEvent* e, char* arg) {
+    return (e->type == MapNotify) && (e->xmap.window == (Window) arg);
+  }
 }
 
 void G4OpenGLXViewer::SetView () {
@@ -73,7 +76,7 @@ void G4OpenGLXViewer::GetXConnection () {
   dpy = XOpenDisplay (0);
   if (!dpy) {
     fViewId = -1;  // This flags an error.
-    G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't open display." << endl;
+    G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't open display." << G4endl;
     return;
   }
 
@@ -81,7 +84,7 @@ void G4OpenGLXViewer::GetXConnection () {
   if (!glXQueryExtension (dpy, &errorBase, &eventBase)) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLViewer::G4OpenGLViewer X Server has no GLX extension." 
-	 << endl;
+	 << G4endl;
     return;
   }
 }
@@ -93,7 +96,7 @@ void G4OpenGLXViewer::CreateGLXContext (XVisualInfo* v) {
   if (!XGetWindowAttributes(dpy, XRootWindow (dpy, vi -> screen), &xwa)) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't return window attributes"
-	 << endl;
+	 << G4endl;
     return;
   }
   
@@ -102,7 +105,7 @@ void G4OpenGLXViewer::CreateGLXContext (XVisualInfo* v) {
   if (!cx) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't create context."
-	 << endl;
+	 << G4endl;
     return;
   }
 
@@ -132,19 +135,19 @@ void G4OpenGLXViewer::CreateGLXContext (XVisualInfo* v) {
 	  cmap = standardCmaps[i].colormap;
 	  XFree (standardCmaps);
 	}
-    G4cout << "Got standard cmap" << endl;
+    G4cout << "Got standard cmap" << G4endl;
   } else {
     cmap = XCreateColormap (dpy, 
 			    XRootWindow(dpy, vi -> screen), 
 			    vi -> visual, 
 			    AllocNone);
-    G4cout << "Created own cmap" << endl;
+    G4cout << "Created own cmap" << G4endl;
   }
 
   if (!cmap) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
-	 << endl;
+	 << G4endl;
     return;
   }
 
@@ -174,7 +177,7 @@ void G4OpenGLXViewer::CreateMainWindow () {
     WinSize_y = fVP.GetWindowSizeHintY ();
   x_origin = xwa.x;
   y_origin = xwa.y;
-  G4cout << "Window name: " << fName << endl;
+  G4cout << "Window name: " << fName << G4endl;
   strncpy (charViewName, fName, 100);
   char *window_name = charViewName;
   char *icon_name = charViewName;
@@ -273,7 +276,7 @@ G4OpenGLXViewer::~G4OpenGLXViewer () {
 
 void G4OpenGLXViewer::print() {
   
-  //cout << "print_col_callback requested with file name: " << print_string << endl;
+  //cout << "print_col_callback requested with file name: " << print_string << G4endl;
   
   if (vectored_ps) {
     G4int size = 5000000;
@@ -651,19 +654,22 @@ typedef struct _DepthIndex {
   GLfloat depth;
 } DepthIndex;
 
-static int
-compare(const void *a, const void *b)
+extern "C"
 {
-  DepthIndex *p1 = (DepthIndex *) a;
-  DepthIndex *p2 = (DepthIndex *) b;
-  GLfloat diff = p2->depth - p1->depth;
+  static int
+  compare(const void *a, const void *b)
+  {
+    DepthIndex *p1 = (DepthIndex *) a;
+    DepthIndex *p2 = (DepthIndex *) b;
+    GLfloat diff = p2->depth - p1->depth;
 
-  if (diff > 0.0) {
-    return 1;
-  } else if (diff < 0.0) {
-    return -1;
-  } else {
-    return 0;
+    if (diff > 0.0) {
+      return 1;
+    } else if (diff < 0.0) {
+      return -1;
+    } else {
+      return 0;
+    }
   }
 }
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
index 9f60939392..79b31e7250 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmBox.cc,v 1.2.8.1 1999/12/07 20:53:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmBox.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Box container class
 
@@ -36,7 +36,7 @@ void G4OpenGLXmBox::AddChild (G4OpenGLXmVWidgetComponent* component)
   XtVaGetValues (box_row_col,
 		 XmNnumChildren, &num_children,
 		 NULL);
-//  G4cout << name << " now parents " << num_children << " children." << endl;
+//  G4cout << name << " now parents " << num_children << " children." << G4endl;
 }
 
 void G4OpenGLXmBox::AddYourselfTo (G4OpenGLXmVWidgetShell* window)
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
index d5bb5beed4..7cabe78eb3 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.2.8.1 1999/12/07 20:53:27 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
index 8fbc351f77..23ddf0ed75 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.2.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
index 9c432da29a..f37d9c7dbb 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmFramedBox.cc,v 1.2.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmFramedBox.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Framed box container class
 
@@ -34,7 +34,7 @@ void G4OpenGLXmFramedBox::AddChild (G4OpenGLXmVWidgetComponent* component)
   XtVaGetValues (box_row_col,
 		 XmNnumChildren, &num_children,
 		 NULL);
-//  G4cout << name << " now parents " << num_children << " children." << endl;
+//  G4cout << name << " now parents " << num_children << " children." << G4endl;
 }
 
 void G4OpenGLXmFramedBox::AddYourselfTo (G4OpenGLXmVWidgetShell* window)
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
index e04362d0f6..de231f82b4 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.3.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.4 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -34,11 +34,7 @@
 #include "G4OpenGLXmTopLevelShell.hh"
 #include "G4OpenGLXmSeparator.hh"
 
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 void G4OpenGLXmViewer::actions_callback (Widget w, 
 				       XtPointer clientData,
@@ -62,9 +58,9 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
       if (!pView->fprotation_top) {
 	const int rot_len = 50;
 	char* frot_Name = new char [rot_len];
-	ostrstream rot_ost (frot_Name, rot_len);
-	rot_ost.seekp (ios::beg);
-	rot_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << ends;
+	G4std::ostrstream rot_ost (frot_Name, rot_len);
+	rot_ost.seekp (G4std::ios::beg);
+	rot_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << G4std::ends;
 	
 	pView->fprotation_top = new G4OpenGLXmTopLevelShell (pView, 
 							     frot_Name);
@@ -147,9 +143,9 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
       if (!pView->fppanning_top) {
 	const int pan_len = 50;
 	char* fpan_Name = new char [pan_len];
-	ostrstream pan_ost (fpan_Name, pan_len);
-	pan_ost.seekp (ios::beg);
-	pan_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << ends;
+	G4std::ostrstream pan_ost (fpan_Name, pan_len);
+	pan_ost.seekp (G4std::ios::beg);
+	pan_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << G4std::ends;
 	
 	pView->fppanning_top = new G4OpenGLXmTopLevelShell (pView, 
 							    fpan_Name);
@@ -247,9 +243,9 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
       if (!pView->fpsetting_top) {
 	const int set_len = 50;
 	char* fset_Name = new char [set_len];
-	ostrstream set_ost (fset_Name, set_len);
-	set_ost.seekp (ios::beg);
-	set_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << ends;
+	G4std::ostrstream set_ost (fset_Name, set_len);
+	set_ost.seekp (G4std::ios::beg);
+	set_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << G4std::ends;
 	
 	pView->fpsetting_top = new G4OpenGLXmTopLevelShell(pView,
 							   fset_Name);
@@ -328,9 +324,9 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	
 	const int misc_len = 50;
 	char* fmisc_Name = new char [misc_len];
-	ostrstream misc_ost (fmisc_Name, misc_len);
-	misc_ost.seekp (ios::beg);
-	misc_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << ends;
+	G4std::ostrstream misc_ost (fmisc_Name, misc_len);
+	misc_ost.seekp (G4std::ios::beg);
+	misc_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << G4std::ends;
 	
 	pView->fpmiscellany_top = new G4OpenGLXmTopLevelShell (pView, 
 							       fmisc_Name);
@@ -423,9 +419,9 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	
 	const int print_len = 50;
 	char* fprint_Name = new char [print_len];
-	ostrstream print_ost (fprint_Name, print_len);
-	print_ost.seekp (ios::beg);
-	print_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << ends;
+	G4std::ostrstream print_ost (fprint_Name, print_len);
+	print_ost.seekp (G4std::ios::beg);
+	print_ost << pView->GetScene()->GetSceneId() << '-' << pView->fViewId << G4std::ends;
 	
 	pView->fpprint_top = new G4OpenGLXmTopLevelShell (pView, 
 							  fprint_Name);
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
index a7f95b461c..5dc3cfcc3c 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.2.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -41,7 +41,7 @@ void G4OpenGLXmViewer::zoom_callback (Widget w,
       ten_to_the_dp *= 10.;
     }
   } else {
-    G4cout << "dp is " << dp << endl;
+    G4cout << "dp is " << dp << G4endl;
     return;
   }
 
@@ -77,7 +77,7 @@ void G4OpenGLXmViewer::dolly_callback (Widget w,
       ten_to_the_dp *= 10.;
     }
   } else {
-    G4cout << "dp is " << dp << endl;
+    G4cout << "dp is " << dp << G4endl;
     return;
   }
 
@@ -209,7 +209,7 @@ void G4OpenGLXmViewer::set_pan_sens_callback (Widget w,
       ten_to_the_dp *= 10.;
     }
   } else {
-    G4cout << "dp is " << dp << endl;
+    G4cout << "dp is " << dp << G4endl;
     return;
   }
   
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
index dbdb3674c3..79458b24e2 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmPushButton.cc,v 1.2.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmPushButton.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
index 8b938c4341..dc3b6cea8c 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmRadioButton.cc,v 1.2.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmRadioButton.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
index 61b7b12a99..aa23bec3d9 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.4.8.1 1999/12/07 20:53:28 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.5 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
index 1a5f193d55..155d171e32 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmSeparator.cc,v 1.2.8.1 1999/12/07 20:53:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmSeparator.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
index 1fa3fbbedd..69deb62e46 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmSliderBar.cc,v 1.2.8.1 1999/12/07 20:53:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmSliderBar.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
index da0d204e9a..6e5fd46c85 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.2.8.1 1999/12/07 20:53:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -250,7 +250,7 @@ void G4OpenGLXmViewer::projection_callback (Widget w,
     {
       if (pView->fov > 89.5 || pView->fov <= 0.0) {
 	G4cout << "Field half angle should be 0 < angle <= 89.5 degrees.";
-	G4cout << endl;
+	G4cout << G4endl;
       }
       else {
 	pView->fVP.SetFieldHalfAngle (pView->fov * deg);
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
index d4457276d7..6fc6d4306f 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmTextField.cc,v 1.2.8.1 1999/12/07 20:53:29 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmTextField.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
index 3e083979c1..973ab97687 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmTopLevelShell.cc,v 1.2.8.1 1999/12/07 20:53:30 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmTopLevelShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Top level shell class
 
@@ -85,7 +85,7 @@ void G4OpenGLXmTopLevelShell::Realize ()
   XtVaGetValues (toplevel,
 		 XmNnumChildren, &num_children,
 		 NULL);
-//  G4cout << name << " now parents " << num_children << " children." << endl;
+//  G4cout << name << " now parents " << num_children << " children." << G4endl;
   XtManageChild (toplevel);
   XtRealizeWidget (toplevel);
   XtPopup (toplevel, XtGrabNonexclusive);
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
index 1b26847f89..47d758da3f 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.2.8.1 1999/12/07 20:53:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Base class for all Motif component widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
index 3f17d20400..45226a7c4b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.2.8.1 1999/12/07 20:53:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Base class for all Motif container widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
index b879bb07b9..e9d9ea2fb4 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetObject.cc,v 1.2.8.1 1999/12/07 20:53:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetObject.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Virtual base class for all Motif widgets.
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
index aa5b54bf74..918a88ca50 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmVWidgetShell.cc,v 1.2.8.1 1999/12/07 20:53:31 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmVWidgetShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //Base class for all Motif shell widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
index 17af224492..b141f1e6c8 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmViewer.cc,v 1.2.8.1 1999/12/07 20:53:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmViewer.cc,v 1.3 1999/12/15 14:54:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -68,7 +68,7 @@ void G4OpenGLXmViewer::GetXmConnection () {
   if (!toplevel) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLXmViewer::GetXmConnection unable to Initialize"
-      " application context." << endl;
+      " application context." << G4endl;
     return;
   }
 
@@ -103,14 +103,14 @@ void G4OpenGLXmViewer::GetXmConnection () {
   if (!dpy) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLXmViewer::GetXmConnection unable to connect to display."
-	 << endl;
+	 << G4endl;
     return;
   }
 
   if (!glXQueryExtension (dpy, &errorBase, &eventBase)) {
     fViewId = -1;  // This flags an error.
     G4cerr << "G4OpenGLXmViewer::GetXmConnection. X Server has no GLX extension."
-	 << endl;;
+	 << G4endl;;
     return;
   }
 }
@@ -163,7 +163,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (misc_str);
   XmStringFree (spec_str);
 
-  G4cout << "Created menubar" << endl;
+  G4cout << "Created menubar" << G4endl;
 
 
   //*********Create style pulldown menu on menubar*********
@@ -190,7 +190,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (draw_str);
   XmStringFree (bgnd_str);
 
-  //  G4cout << "Created Style pulldown menu" << endl;
+  //  G4cout << "Created Style pulldown menu" << G4endl;
 
   //Add Representation pullright menu to style cascade...
   polyhedron_str = XmStringCreateLocalized ("Polyhedron");
@@ -232,7 +232,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (polyhedron_str);
   XmStringFree (nurbs_str);
   
-  //  G4cout << "Created Representation pulldown menu" << endl;
+  //  G4cout << "Created Representation pulldown menu" << G4endl;
 
   //Add Drawing pullright menu to style cascade...
   wireframe_str = XmStringCreateLocalized ("Wireframe");
@@ -287,7 +287,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (hsr_str);
   XmStringFree (hlhsr_str);
 
-  //  G4cout << "Created Drawing pullright menu" << endl;
+  //  G4cout << "Created Drawing pullright menu" << G4endl;
 
   //Add Drawing pullright menu to style cascade...
   white_str = XmStringCreateLocalized ("White");
@@ -327,7 +327,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (white_str);
   XmStringFree (black_str);
 
-  //  G4cout << "Created Background color pullright menu" << endl;
+  //  G4cout << "Created Background color pullright menu" << G4endl;
 
   //*********Create actions pulldown menu on menubar*********
   rot_str = XmStringCreateLocalized ("Rotation control panel");
@@ -353,7 +353,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (rot_str);
   XmStringFree (pan_str);
   XmStringFree (set_str);
-  G4cout << "Created Actions pulldown menu" << endl;
+  G4cout << "Created Actions pulldown menu" << G4endl;
 
   misc_str = XmStringCreateLocalized ("Miscellany control panel");
   exit_str = XmStringCreateLocalized ("Exit to G4Vis>");
@@ -379,7 +379,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (misc_str);
   XmStringFree (exit_str);
   XmStringFree (print_str);
-  G4cout << "Created Miscellany pulldown menu" << endl;
+  G4cout << "Created Miscellany pulldown menu" << G4endl;
 
   trans_str = XmStringCreateLocalized ("Transparency");
   anti_str = XmStringCreateLocalized ("Antialiasing");
@@ -405,7 +405,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (anti_str);
   XmStringFree (halo_str);
 
-  //  G4cout << "Created Special pulldown menu" << endl;
+  //  G4cout << "Created Special pulldown menu" << G4endl;
 
   //Add Transparency pullright menu to special cascade...
   off_str = XmStringCreateLocalized ("Off");
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
index 759cb30843..87f6a3392d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.2.8.1 1999/12/07 20:53:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.3 1999/12/15 14:54:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  16th June 1997
diff --git a/source/visualization/OpenInventor/include/G4OpenInventor.hh b/source/visualization/OpenInventor/include/G4OpenInventor.hh
index d0e7ec354c..5adb48b3a3 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventor.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventor.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventor.hh,v 1.4.8.1 1999/12/07 20:53:33 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventor.hh,v 1.5 1999/12/15 14:54:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Guy Barrand 26 Mar 1998.
 // OpenInventor graphics system factory.
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
index 63eeb4a121..e0f87cac23 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorSceneHandler.hh,v 1.6.4.1 1999/12/07 20:53:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorSceneHandler.hh,v 1.8 1999/12/16 17:25:08 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // J Kallenbach  27th Aug 1996
@@ -55,6 +55,8 @@ public:
   void AddThis (const G4Sphere&);
   void AddThis (const G4Para&);
   void AddThis (const G4Torus&);
+  void AddThis (const G4Polycone&);
+  void AddThis (const G4Polyhedra&);
   void AddThis (const G4VSolid&);
 
   void BeginPrimitives (const G4Transform3D& objectTransformation);
@@ -77,7 +79,7 @@ private:
   // A proper implementation would use geometry hierarchy.
   //
   G4std::map <const G4VPhysicalVolume*, SoSeparator*,
-    less <const G4VPhysicalVolume*> > SeparatorMap;
+    G4std::less <const G4VPhysicalVolume*> > SeparatorMap;
   SoSeparator *root;
   SoSeparator *staticRoot;
   SoSeparator *transientRoot;
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
index 7cd2a8dc63..e96d16d4c3 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorSceneHandler.icc,v 1.1.8.1 1999/12/07 20:53:34 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorSceneHandler.icc,v 1.3 1999/12/16 17:25:10 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // J Kallenbach  27th Aug 1996
@@ -29,6 +29,14 @@ inline void G4OpenInventorSceneHandler::AddThis (const G4Torus& torus) {
   G4VSceneHandler::AddThis (torus);
 }
 
+inline void G4OpenInventorSceneHandler::AddThis (const G4Polycone& polycone) {
+  G4VSceneHandler::AddThis (polycone);
+}
+
+inline void G4OpenInventorSceneHandler::AddThis (const G4Polyhedra& polyhedra) {
+  G4VSceneHandler::AddThis (polyhedra);
+}
+
 inline void G4OpenInventorSceneHandler::AddThis (const G4VSolid& vsolid) {
   G4VSceneHandler::AddThis (vsolid);
 }
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
index 80b2f7e989..37662c6d88 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorTransform3D.hh,v 1.2.8.1 1999/12/07 20:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorTransform3D.hh,v 1.3 1999/12/15 14:54:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // jck  17 Dec 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh b/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
index 7ec6a168c1..c725823b4a 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorViewer.hh,v 1.5.2.1 1999/12/07 20:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorViewer.hh,v 1.6 1999/12/15 14:54:11 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
index e5f9181046..937cf5559b 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorWin32.hh,v 1.3.8.1 1999/12/07 20:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorWin32.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorX.hh b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
index cb84d8dfcc..eca77545e0 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorX.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorX.hh,v 1.3.8.1 1999/12/07 20:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorX.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventor.cc b/source/visualization/OpenInventor/src/G4OpenInventor.cc
index 8ab700db31..e7965702a2 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventor.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventor.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventor.cc,v 1.5.8.1 1999/12/07 20:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventor.cc,v 1.6 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4VIS_BUILD_OI_DRIVER
 
@@ -44,7 +44,7 @@ G4VInteractorManager* G4OpenInventor::GetInteractorManager () {
 G4VSceneHandler* G4OpenInventor::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* p = new G4OpenInventorSceneHandler (*this, name);
   G4cout << G4OpenInventorSceneHandler::GetSceneCount ()
-       << ' ' << fName << " scenes extanct." << endl;
+       << ' ' << fName << " scenes extanct." << G4endl;
   return    p;
 }
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
index 089c43fbb7..71a27090c1 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorSceneHandler.cc,v 1.5.4.1 1999/12/07 20:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorSceneHandler.cc,v 1.6 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
@@ -636,10 +636,10 @@ void G4OpenInventorSceneHandler::PreAddThis
       }
       else {
         G4cerr << "OIScene non-leaf protocol error.  Mother volume " << 
-	          MotherVolume->GetName() << " missing." << endl;
+	          MotherVolume->GetName() << " missing." << G4endl;
         G4cerr << "                         Daughter volume was: "
 	     << fpCurrentPV->GetName()
-	     << endl;
+	     << G4endl;
       }
       MotherVolume=MotherVolume->GetMother();
     }
@@ -662,10 +662,10 @@ void G4OpenInventorSceneHandler::PreAddThis
       }
       else {
 	G4cerr << "OIScene leaf protocol error.  Mother volume " << 
-	          MotherVolume->GetName() <<  " missing." << endl;
+	          MotherVolume->GetName() <<  " missing." << G4endl;
 	G4cerr << "                         Daughter volume was: "
 	     << fpCurrentPV->GetName()
-	     << endl;
+	     << G4endl;
       }
       MotherVolume = MotherVolume->GetMother();
     }
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
index fd1e42b21a..5a1cf12668 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorTransform3D.cc,v 1.2.8.1 1999/12/07 20:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorTransform3D.cc,v 1.3 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // jck 17 Dec 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
index 121c737df4..21c5877b40 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorViewer.cc,v 1.2.8.1 1999/12/07 20:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorViewer.cc,v 1.3 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
  * jck 05 Feb 1997 - Initial Implementation
@@ -127,7 +127,7 @@ G4OpenInventorViewer::G4OpenInventorViewer (G4OpenInventorSceneHandler& scene,
 //fInteractorManager->
 //AddSecondaryLoopPostAction ((G4SecondaryLoopAction)SecondaryLoopPostAction);
 
-  G4cout << "Window name: " << fName << endl;
+  G4cout << "Window name: " << fName << G4endl;
   // 
   // Selection
   //
@@ -201,7 +201,7 @@ void G4OpenInventorViewer::SetView () {
 }
 
 void G4OpenInventorViewer::DrawView () {
-  G4cout << "debug Iv::DrawViewer " <<endl;
+  G4cout << "debug Iv::DrawViewer " <<G4endl;
   KernelVisitDecision ();
   ProcessView         ();
   FinishView          ();
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
index 846290b70b..345df34ad4 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorWin32.cc,v 1.3.8.1 1999/12/07 20:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorWin32.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorX.cc b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
index b346fe4d2c..fa789660dd 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorX.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpenInventorX.cc,v 1.3.8.1 1999/12/07 20:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4OpenInventorX.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
diff --git a/source/visualization/VRML/History b/source/visualization/VRML/History
index b9d669dc05..68074fe5ad 100644
--- a/source/visualization/VRML/History
+++ b/source/visualization/VRML/History
@@ -1,3 +1,6 @@
+VRML-V01-00-00 27th December 1999  Satoshi Tanaka
+- G4endl ==> "\n" for fDest objects
+
 VRML-V00-01-01 4th November 1999  Satoshi Tanaka
 - Introduction of VRMLBeginModeling() for new vis commands
 
diff --git a/source/visualization/VRML/g4vrmlview/g4mini.java b/source/visualization/VRML/g4vrmlview/g4mini.java
index fa716ed970..50b04f22b8 100644
--- a/source/visualization/VRML/g4vrmlview/g4mini.java
+++ b/source/visualization/VRML/g4vrmlview/g4mini.java
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: g4mini.java,v 1.1.10.1 1999/12/07 20:53:39 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: g4mini.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/g4vrmlview/g4vrmlview.java b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
index 96957df8c7..ded0555048 100644
--- a/source/visualization/VRML/g4vrmlview/g4vrmlview.java
+++ b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: g4vrmlview.java,v 1.1.10.1 1999/12/07 20:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: g4vrmlview.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/include/FRClient.h b/source/visualization/VRML/include/FRClient.h
index ae17c43069..07455e1c09 100644
--- a/source/visualization/VRML/include/FRClient.h
+++ b/source/visualization/VRML/include/FRClient.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: FRClient.h,v 1.1.10.1 1999/12/07 20:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: FRClient.h,v 1.2 1999/12/15 14:54:13 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // FRClient.h
 // FukuiRenderer Client
diff --git a/source/visualization/VRML/include/G4FRClient.hh b/source/visualization/VRML/include/G4FRClient.hh
index a6efd876b8..221ca26571 100644
--- a/source/visualization/VRML/include/G4FRClient.hh
+++ b/source/visualization/VRML/include/G4FRClient.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRClient.hh,v 1.2.8.1 1999/12/07 20:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRClient.hh,v 1.4 1999/12/27 07:49:11 stanaka Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4FRClient.hh
 // Yasuhide Sawada and Satoshi Tanaka
@@ -45,7 +45,7 @@ private:
 };
 
 //manipulator
-G4FRClient& endl(G4FRClient&);
+//G4FRClient& endl(G4FRClient&);
 
 #endif //G4_FR_CLIENT_HH
 #endif //G4VIS_BUILD_VRML_DRIVER
diff --git a/source/visualization/VRML/include/G4VRML1.hh b/source/visualization/VRML/include/G4VRML1.hh
index 694eaade9d..08b1527902 100644
--- a/source/visualization/VRML/include/G4VRML1.hh
+++ b/source/visualization/VRML/include/G4VRML1.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1.hh,v 1.5.8.1 1999/12/07 20:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1.hh
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1File.hh b/source/visualization/VRML/include/G4VRML1File.hh
index f1bdb7cfcc..269f380785 100644
--- a/source/visualization/VRML/include/G4VRML1File.hh
+++ b/source/visualization/VRML/include/G4VRML1File.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1File.hh,v 1.5.8.1 1999/12/07 20:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1File.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
index 02b94af0f2..f94e5b2edc 100644
--- a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1FileSceneHandler.hh,v 1.4.4.1 1999/12/07 20:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1FileSceneHandler.hh,v 1.6 1999/12/16 17:25:11 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
@@ -16,7 +16,7 @@
 #ifndef G4VRML1FILE_SCENE_HANDLER_HH
 #define G4VRML1FILE_SCENE_HANDLER_HH
 
-#include <fstream.h>
+#include "g4std/fstream"
 
 #include "globals.hh"
 #include "G4LogicalVolume.hh"
@@ -41,6 +41,12 @@ public:
 	void AddThis(const G4Sphere&);
         void AddThis(const G4Para&);
 	void AddThis(const G4Torus&);
+        void AddThis ( const G4Polycone& polycone ) {
+          G4VSceneHandler::AddThis (polycone);
+        }
+        void AddThis ( const G4Polyhedra& polyhedra) {
+          G4VSceneHandler::AddThis (polyhedra);
+        }
         void AddThis(const G4VSolid&);
 
 	void BeginPrimitives(const G4Transform3D& objectTransformation);
@@ -92,7 +98,7 @@ private:
 	G4String fCurrentDEF;
 
 	G4VRML1File& fSystem;	// Graphics system for this scene.
-	ofstream     fDest ;
+	G4std::ofstream     fDest ;
 	G4bool       fFlagDestOpen ;
 
 	G4int        fMaxFileNum   ;	
diff --git a/source/visualization/VRML/include/G4VRML1FileViewer.hh b/source/visualization/VRML/include/G4VRML1FileViewer.hh
index 68f13f7930..3810d99da7 100644
--- a/source/visualization/VRML/include/G4VRML1FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML1FileViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1FileViewer.hh,v 1.3.8.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1FileViewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1FileViewer.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1SceneHandler.hh b/source/visualization/VRML/include/G4VRML1SceneHandler.hh
index ba1a24a5cf..984abfc4ef 100644
--- a/source/visualization/VRML/include/G4VRML1SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1SceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1SceneHandler.hh,v 1.4.4.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1SceneHandler.hh,v 1.6 1999/12/16 17:25:12 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1SceneHandler.hh
 // Yasuhide Sawada & Satoshi Tanaka
@@ -42,6 +42,12 @@ public:
 	void AddThis(const G4Sphere&);
 	void AddThis(const G4Para&);
 	void AddThis(const G4Torus&);
+        void AddThis ( const G4Polycone& polycone ) {
+          G4VSceneHandler::AddThis (polycone);
+        }
+        void AddThis ( const G4Polyhedra& polyhedra) {
+          G4VSceneHandler::AddThis (polyhedra);
+        }
 	void AddThis(const G4VSolid&);
 
 	void BeginPrimitives(const G4Transform3D& objectTransformation);
diff --git a/source/visualization/VRML/include/G4VRML1Viewer.hh b/source/visualization/VRML/include/G4VRML1Viewer.hh
index b644995305..01d3c82d9c 100644
--- a/source/visualization/VRML/include/G4VRML1Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML1Viewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1Viewer.hh,v 1.3.8.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1Viewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2.hh b/source/visualization/VRML/include/G4VRML2.hh
index e1f6f4301c..8a45e3489d 100644
--- a/source/visualization/VRML/include/G4VRML2.hh
+++ b/source/visualization/VRML/include/G4VRML2.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2.hh,v 1.5.8.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2File.hh b/source/visualization/VRML/include/G4VRML2File.hh
index 2460398deb..9cff92651a 100644
--- a/source/visualization/VRML/include/G4VRML2File.hh
+++ b/source/visualization/VRML/include/G4VRML2File.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2File.hh,v 1.5.8.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2File.hh,v 1.6 1999/12/15 14:54:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
index 6f5f4d193f..f3bf073cf4 100644
--- a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2FileSceneHandler.hh,v 1.3.4.1 1999/12/07 20:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2FileSceneHandler.hh,v 1.5 1999/12/16 17:25:14 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
@@ -16,7 +16,7 @@
 #ifndef G4VRML2FILE_SCENE_HANDLER_HH
 #define G4VRML2FILE_SCENE_HANDLER_HH
 
-#include <fstream.h>
+#include "g4std/fstream"
 
 #include "globals.hh"
 #include "G4LogicalVolume.hh"
@@ -41,6 +41,12 @@ public:
 	void AddThis(const G4Sphere&);
         void AddThis(const G4Para&);
 	void AddThis(const G4Torus&);
+        void AddThis ( const G4Polycone& polycone ) {
+          G4VSceneHandler::AddThis (polycone);
+        }
+        void AddThis ( const G4Polyhedra& polyhedra) {
+          G4VSceneHandler::AddThis (polyhedra);
+        }
         void AddThis(const G4VSolid&);
 
 	void BeginPrimitives(const G4Transform3D& objectTransformation);
@@ -108,7 +114,7 @@ private:
 	static G4int fSceneCount;    // No. of existing scenes.
 
 public: 
-	ofstream     fDest ;
+	G4std::ofstream     fDest ;
 
 };
 
diff --git a/source/visualization/VRML/include/G4VRML2FileViewer.hh b/source/visualization/VRML/include/G4VRML2FileViewer.hh
index 649e073db9..06b29131fc 100644
--- a/source/visualization/VRML/include/G4VRML2FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML2FileViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2FileViewer.hh,v 1.3.8.1 1999/12/07 20:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2FileViewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2FileViewer.hh
 // Satoshi Tanaka and Yasuhide Sawada
@@ -16,7 +16,7 @@
 #ifndef G4VRML2FILE_VIEWER_HH
 #define G4VRML2FILE_VIEWER_HH
 
-#include <fstream.h>
+#include "g4std/fstream"
 #include "G4VViewer.hh"
 #include "globals.hh"
 
@@ -36,7 +36,7 @@ private:
 
 private:
 	G4VRML2FileSceneHandler& fSceneHandler; // Reference to Graphics Scene for this view.
-	ofstream&         fDest ;
+	G4std::ofstream&         fDest ;
 
 	G4double      fViewHalfAngle ;	
 	G4double      fsin_VHA       ;	
diff --git a/source/visualization/VRML/include/G4VRML2SceneHandler.hh b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
index 85ae5b62fc..0f6b9fbb24 100644
--- a/source/visualization/VRML/include/G4VRML2SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2SceneHandler.hh,v 1.3.4.1 1999/12/07 20:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2SceneHandler.hh,v 1.5 1999/12/16 17:25:16 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2SceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
@@ -41,6 +41,12 @@ public:
 	void AddThis(const G4Sphere&);
 	void AddThis(const G4Para&);
 	void AddThis(const G4Torus&);
+        void AddThis ( const G4Polycone& polycone ) {
+          G4VSceneHandler::AddThis (polycone);
+        }
+        void AddThis ( const G4Polyhedra& polyhedra) {
+          G4VSceneHandler::AddThis (polyhedra);
+        }
 	void AddThis(const G4VSolid&);
 
 	void BeginPrimitives(const G4Transform3D& objectTransformation);
diff --git a/source/visualization/VRML/include/G4VRML2Viewer.hh b/source/visualization/VRML/include/G4VRML2Viewer.hh
index 26db0c0a4a..7a55e5058f 100644
--- a/source/visualization/VRML/include/G4VRML2Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML2Viewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2Viewer.hh,v 1.3.8.1 1999/12/07 20:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2Viewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRMLNetConfig.hh b/source/visualization/VRML/include/G4VRMLNetConfig.hh
index 600f08d1a6..a4e1036ee6 100644
--- a/source/visualization/VRML/include/G4VRMLNetConfig.hh
+++ b/source/visualization/VRML/include/G4VRMLNetConfig.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRMLNetConfig.hh,v 1.2.8.1 1999/12/07 20:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRMLNetConfig.hh,v 1.3 1999/12/15 14:54:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRMLNetConfig.hh
 // Satoshi Tanaka
diff --git a/source/visualization/VRML/src/FRClient.cc b/source/visualization/VRML/src/FRClient.cc
index beefb86fe1..818cddfde9 100644
--- a/source/visualization/VRML/src/FRClient.cc
+++ b/source/visualization/VRML/src/FRClient.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: FRClient.cc,v 1.2.8.1 1999/12/07 20:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: FRClient.cc,v 1.3 1999/12/15 14:54:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // FRClient.cc
 // FukuiRenderer Client
@@ -73,7 +73,7 @@ int FRClient::connect(const char *hostname, int port_)
 	}
 	hp = gethostbyname(hostname) ;
 	if ( !hp ) {
-		G4cerr << "ERROR: gethostbyname() failed" << endl;
+		G4cerr << "ERROR: gethostbyname() failed" << G4endl;
 		return -1; 
 	}
 
diff --git a/source/visualization/VRML/src/G4FRClient.cc b/source/visualization/VRML/src/G4FRClient.cc
index 65c2a8fdaa..2a16cc98ef 100644
--- a/source/visualization/VRML/src/G4FRClient.cc
+++ b/source/visualization/VRML/src/G4FRClient.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FRClient.cc,v 1.2.8.1 1999/12/07 20:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FRClient.cc,v 1.4 1999/12/27 07:49:22 stanaka Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4FRClient.cc
 // Yasuhide Sawada & Satoshi Tanaka
@@ -86,10 +86,11 @@ G4FRClient& G4FRClient::operator << (G4FRClient& (*func)(G4FRClient&))
 	return func(*this);
 }
 
-//manipulator
-G4FRClient& endl(G4FRClient& c)
-{
-	return c << "\n";
-}
-
+////////////////////////////////////////
+////manipulator
+//G4FRClient& endl(G4FRClient& c)
+//{
+//	return c << "\n";
+//}
+///////////////////////////////////////
 #endif
diff --git a/source/visualization/VRML/src/G4VRML1.cc b/source/visualization/VRML/src/G4VRML1.cc
index e620478019..b8988f0eb2 100644
--- a/source/visualization/VRML/src/G4VRML1.cc
+++ b/source/visualization/VRML/src/G4VRML1.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1.cc,v 1.3.8.1 1999/12/07 20:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1.cc
 // Yasuhide Sawada & Satoshi Tanaka
@@ -58,7 +58,7 @@ G4VSceneHandler* G4VRML1::CreateSceneHandler(const G4String& name)
 	p = new G4VRML1SceneHandler(*this, name);
 
 	G4cout << G4VRML1SceneHandler::GetSceneCount()
-		<< " " << fName << " scenes extanct." << endl;
+		<< " " << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
diff --git a/source/visualization/VRML/src/G4VRML1File.cc b/source/visualization/VRML/src/G4VRML1File.cc
index 7c53e880c4..c6bb947409 100644
--- a/source/visualization/VRML/src/G4VRML1File.cc
+++ b/source/visualization/VRML/src/G4VRML1File.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1File.cc,v 1.3.8.1 1999/12/07 20:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1File.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1File.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -45,7 +45,7 @@ G4VSceneHandler* G4VRML1File::CreateSceneHandler(const G4String& name)
 	p = new G4VRML1FileSceneHandler(*this, name);
 
 	G4cout << G4VRML1FileSceneHandler::GetSceneCount()
-		<< " " << fName << " scenes extanct." << endl;
+		<< " " << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
diff --git a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
index 2bd2bf037a..edb045e280 100644
--- a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1FileSceneHandler.cc,v 1.1.8.1 1999/12/07 20:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1FileSceneHandler.cc,v 1.2 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -18,7 +18,7 @@
 
 //#define DEBUG_FR_SCENE
 
-#include <fstream.h>
+#include "g4std/fstream"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -86,7 +86,7 @@ G4VRML1FileSceneHandler::G4VRML1FileSceneHandler(G4VRML1File& system, const G4St
 G4VRML1FileSceneHandler::~G4VRML1FileSceneHandler()
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4VRML1FileSceneHandler" << endl;
+	G4cerr << "***** ~G4VRML1FileSceneHandler" << G4endl;
 #endif 
 	fSceneCount--;
 }
@@ -115,13 +115,13 @@ void G4VRML1FileSceneHandler::connectPort()
 
 		// Message
 		if( fMaxFileNum > 1 && i == MAX_FILE_INDEX ) {
-		  G4cerr << "==========================================="   << endl; 
-		  G4cerr << "WARNING MESSAGE from VRML1FILE driver:      "  << endl;
-		  G4cerr << "  This file name is the final one in the   "   << endl;
-		  G4cerr << "  automatic updation of the output file name." << endl; 
-		  G4cerr << "  You may overwrite an existing file of   "    << endl; 
-                  G4cerr << "  the same name.                          "    << endl;
-		  G4cerr << "==========================================="   << endl; 
+		  G4cerr << "==========================================="   << G4endl; 
+		  G4cerr << "WARNING MESSAGE from VRML1FILE driver:      "  << G4endl;
+		  G4cerr << "  This file name is the final one in the   "   << G4endl;
+		  G4cerr << "  automatic updation of the output file name." << G4endl; 
+		  G4cerr << "  You may overwrite an existing file of   "    << G4endl; 
+                  G4cerr << "  the same name.                          "    << G4endl;
+		  G4cerr << "==========================================="   << G4endl; 
 		}
 
 		// re-determine file to G4VRMLFILE_DEST_DIR/g4_i.wrl for i>0
@@ -130,7 +130,7 @@ void G4VRML1FileSceneHandler::connectPort()
 		}
 
 		// check validity of the file name
-		ifstream  fin ; 
+		G4std::ifstream  fin ; 
 		fin.open(fVRMLFileName) ;
 		if(!fin) { 
 			// new file	
@@ -144,11 +144,11 @@ void G4VRML1FileSceneHandler::connectPort()
 	} // for 
 
 	// open a VRML 1.0 file with determined file name
-	G4cerr << "==========================================="  << endl; 
-	G4cerr << "Output VRML 1.0 file: " << fVRMLFileName << endl; 
-	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << endl; 
-	G4cerr << "  (Customizable as: setenv G4VRMLFILE_MAX_FILE_NUM number) " << endl;
-	G4cerr << "===========================================" << endl; 
+	G4cerr << "==========================================="  << G4endl; 
+	G4cerr << "Output VRML 1.0 file: " << fVRMLFileName << G4endl; 
+	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << G4endl; 
+	G4cerr << "  (Customizable as: setenv G4VRMLFILE_MAX_FILE_NUM number) " << G4endl;
+	G4cerr << "===========================================" << G4endl; 
 
 	fDest.open(fVRMLFileName) ;  fFlagDestOpen =  true ;
 }
@@ -165,18 +165,18 @@ void G4VRML1FileSceneHandler::closePort()
 
 	// close VRML file	
 	fDest.close();  fFlagDestOpen = false ;
-	G4cerr << "*** VRML 1.0 File  " << fVRMLFileName << "  is generated." << endl;
+	G4cerr << "*** VRML 1.0 File  " << fVRMLFileName << "  is generated." << G4endl;
 
 	
 	// Invoke viewer 
 
 	if ( !strcmp(viewer, NO_VRML_VIEWER )) {
-		G4cerr << "MESSAGE from VRML1FILE driver:"     << endl;
+		G4cerr << "MESSAGE from VRML1FILE driver:"     << G4endl;
 		G4cerr << "    Set an environmental variable  " ;
-		G4cerr <<      ENV_VRML_VIEWER << endl;
-		G4cerr << "    if you want to visualize the generated VRML file" << endl; 
-		G4cerr << "    automatically.  For example, " << endl;
-		G4cerr << "    setenv  " << ENV_VRML_VIEWER << "  vrweb " << endl;
+		G4cerr <<      ENV_VRML_VIEWER << G4endl;
+		G4cerr << "    if you want to visualize the generated VRML file" << G4endl; 
+		G4cerr << "    automatically.  For example, " << G4endl;
+		G4cerr << "    setenv  " << ENV_VRML_VIEWER << "  vrweb " << G4endl;
 	} else {
 		sprintf( command, "%s %s", viewer, fVRMLFileName  );   
 		system( command );
diff --git a/source/visualization/VRML/src/G4VRML1FileViewer.cc b/source/visualization/VRML/src/G4VRML1FileViewer.cc
index 9e9f0e75b3..eb2aebee0a 100644
--- a/source/visualization/VRML/src/G4VRML1FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML1FileViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1FileViewer.cc,v 1.3.4.1 1999/12/07 20:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1FileViewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRMLView.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -35,14 +35,14 @@ G4VRML1FileViewer::~G4VRML1FileViewer()
 void G4VRML1FileViewer::SetView()
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1FileViewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4VRML1FileViewer::SetView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML1FileViewer::DrawView()
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4VRML1FileViewer::DrawView()" << endl;
+	G4cerr << "***** G4VRML1FileViewer::DrawView()" << G4endl;
 #endif
 
 	fSceneHandler.VRMLBeginModeling();
@@ -56,14 +56,14 @@ void G4VRML1FileViewer::DrawView()
 void G4VRML1FileViewer::ClearView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1File1View::ClearView(): No effects" << endl;
+  G4cerr << "***** G4VRML1File1View::ClearView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML1FileViewer::ShowView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1FileViewer::ShowView()" << endl;
+  G4cerr << "***** G4VRML1FileViewer::ShowView()" << G4endl;
 #endif
 	fSceneHandler.VRMLEndModeling();
 }
@@ -71,7 +71,7 @@ void G4VRML1FileViewer::ShowView(void)
 void G4VRML1FileViewer::FinishView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1FileViewer::FinishView(): No effects" << endl;
+  G4cerr << "***** G4VRML1FileViewer::FinishView(): No effects" << G4endl;
 #endif
 }
 
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandler.cc b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
index 8e5c6ce41d..e99374eb37 100644
--- a/source/visualization/VRML/src/G4VRML1SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1SceneHandler.cc,v 1.1.8.1 1999/12/07 20:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1SceneHandler.cc,v 1.2 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1SceneHandler.cc
 // Yasuhide Sawada and Satoshi Tanaka
@@ -19,7 +19,7 @@
 //#define DEBUG_FR_SCENE
 
 #include <unistd.h>
-#include <fstream.h>
+#include "g4std/fstream"
 
 #include "globals.hh"
 #include "G4VPhysicalVolume.hh"
@@ -56,7 +56,7 @@ G4VRML1SceneHandler::G4VRML1SceneHandler(G4VRML1& system, const G4String& name)
 G4VRML1SceneHandler::~G4VRML1SceneHandler()
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4VRML1SceneHandler" << endl;
+	G4cerr << "***** ~G4VRML1SceneHandler" << G4endl;
 #endif 
 	fSceneCount--;
 }
@@ -79,12 +79,12 @@ void G4VRML1SceneHandler::connectPort(G4int max_trial)
 		    // INET domain connection is established
 			G4cerr << "*** GEANT4 is connected to port  ";
 			G4cerr << fDest.getPort(); 
-			G4cerr << " of server  " << fSystem.getHostName() << endl;
+			G4cerr << " of server  " << fSystem.getHostName() << G4endl;
 			break; 
 		} else { 
 			// Connection failed. Try the next port.
 			G4cerr << "*** GEANT4 incremented targeting port to ";
-			G4cerr << port << endl;
+			G4cerr << port << G4endl;
 		}
 
 		sleep (1);
@@ -92,17 +92,17 @@ void G4VRML1SceneHandler::connectPort(G4int max_trial)
 	} // for
 
 	if (!fDest.isConnected()) {
-		G4cerr << "*** INET Connection failed. " << endl;
-		G4cerr << "    Maybe, you have not invoked viewer  g4vrmlview  yet, " << endl;
-		G4cerr << "    or too many viewers are already running in the " << endl;
-		G4cerr << "    server host(" << fSystem.getHostName() << "). " << endl;
+		G4cerr << "*** INET Connection failed. " << G4endl;
+		G4cerr << "    Maybe, you have not invoked viewer  g4vrmlview  yet, " << G4endl;
+		G4cerr << "    or too many viewers are already running in the " << G4endl;
+		G4cerr << "    server host(" << fSystem.getHostName() << "). " << G4endl;
 	}
 }
 
 void G4VRML1SceneHandler::closePort()
 {
 	fDest.close();
-	G4cerr << "*** INET Connection closed. " << endl;
+	G4cerr << "*** INET Connection closed. " << G4endl;
 }
 
 
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
index aab3cc8d3a..429502296e 100644
--- a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
+++ b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1SceneHandlerFunc.icc,v 1.3.4.1 1999/12/07 20:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1SceneHandlerFunc.icc,v 1.5 1999/12/27 07:49:22 stanaka Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML1SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -24,7 +24,7 @@
 void G4VRML1SCENE::AddThis(const G4Trd& trd)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis trd" << endl ;
+	G4cerr << "***** AddThis trd" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	ADDTHIS_WITH_NAME(trd)
@@ -33,7 +33,7 @@ void G4VRML1SCENE::AddThis(const G4Trd& trd)
 void G4VRML1SCENE::AddThis(const G4Trap& trap)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis trap" << endl ;
+	G4cerr << "***** AddThis trap" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	ADDTHIS_WITH_NAME(trap)
@@ -42,7 +42,7 @@ void G4VRML1SCENE::AddThis(const G4Trap& trap)
 void G4VRML1SCENE::AddThis(const G4Para& para)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis para" << endl ;
+	G4cerr << "***** AddThis para" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	ADDTHIS_WITH_NAME(para)
@@ -51,7 +51,7 @@ void G4VRML1SCENE::AddThis(const G4Para& para)
 void G4VRML1SCENE::AddThis(const G4Torus& torus )
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis torus" << endl ;
+	G4cerr << "***** AddThis torus" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	ADDTHIS_WITH_NAME(torus)
@@ -61,7 +61,7 @@ void G4VRML1SCENE::AddThis(const G4Torus& torus )
 void G4VRML1SCENE::AddThis(const G4VSolid& vsolid)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis vsolid" << endl ;
+	G4cerr << "***** AddThis vsolid" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	ADDTHIS_WITH_NAME(vsolid)
@@ -70,7 +70,7 @@ void G4VRML1SCENE::AddThis(const G4VSolid& vsolid)
 void G4VRML1SCENE::AddThis(const G4Tubs& tubs)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis tubs" << endl ;
+	G4cerr << "***** AddThis tubs" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 
@@ -86,14 +86,14 @@ void G4VRML1SCENE::AddThis(const G4Tubs& tubs)
 	// Send data
 	if ( r == 0.0 && dp >= 360. * deg ) {
 		// Send a built-in VRML node (Cylinder)
-		fDest << "Separator {" << endl;
+		fDest << "Separator {" << "\n";
 		SendMatrixTransformNode( fpObjectTransformation );
 
-		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << endl;
+		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << "\n";
 		SendMaterialNode();
 		SendCylinderNode(R, dz * 2);
-		fDest << "\t" << "}" << endl; // DEF Separator
-		fDest << "}" << endl; // Separator
+		fDest << "\t" << "}" << "\n"; // DEF Separator
+		fDest << "}" << "\n"; // Separator
 	} else {
 		// call AddPrimitive(Polyhedron)
 		RequestPrimitives(tubs); 
@@ -107,7 +107,7 @@ void G4VRML1SCENE::AddThis(const G4Tubs& tubs)
 void G4VRML1SCENE::AddThis(const G4Cons& cons)
 {
 #if defined DEBUG_SCENE_FUNC
-    G4cerr << "***** AddThis cons" << endl ;
+    G4cerr << "***** AddThis cons" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 
@@ -126,14 +126,14 @@ void G4VRML1SCENE::AddThis(const G4Cons& cons)
 	// Send data
 	if ( r1 == 0.0 && r2 == 0.0 && R1 == R2 && dp >= 360. * deg) {
 		// Send a built-in VRML node (Cylinder)
-		fDest << "Separator {" << endl;
+		fDest << "Separator {" << "\n";
 		SendMatrixTransformNode( fpObjectTransformation );
 
-		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << endl;
+		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << "\n";
 		SendMaterialNode();
 		SendCylinderNode(R1, dz * 2);
-		fDest << "\t" << "}" << endl; // DEF Separator
-		fDest << "}" << endl; // Separator
+		fDest << "\t" << "}" << "\n"; // DEF Separator
+		fDest << "}" << "\n"; // Separator
 	} else {
 		// call AddPrimitive(Polyhedron)
 		RequestPrimitives(cons); 
@@ -146,7 +146,7 @@ void G4VRML1SCENE::AddThis(const G4Cons& cons)
 void G4VRML1SCENE::AddThis(const G4Box& box)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis box" << endl ;
+	G4cerr << "***** AddThis box" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 
@@ -154,17 +154,17 @@ void G4VRML1SCENE::AddThis(const G4Box& box)
 	fCurrentDEF = "box_" + box.GetName();
 
 	// Send a built-in VRML node (Cube)
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
-	//fDest << "\t" << "renderCulling ON" << endl;
+	//fDest << "\t" << "renderCulling ON" << "\n";
 	SendMatrixTransformNode( fpObjectTransformation );
 
-	fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << endl;
+	fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << "\n";
 	SendMaterialNode();
 	SendCubeNode(box.GetXHalfLength() * 2, box.GetYHalfLength() * 2, box.GetZHalfLength() * 2);
-	fDest << "\t" << "}" << endl; // DEF Separator
+	fDest << "\t" << "}" << "\n"; // DEF Separator
 
-	fDest << "}" << endl; // Separator
+	fDest << "}" << "\n"; // Separator
 
 	// reset current name to null
 	fCurrentDEF = "";
@@ -174,7 +174,7 @@ void G4VRML1SCENE::AddThis(const G4Box& box)
 void G4VRML1SCENE::AddThis(const G4Sphere& sphere)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis sphere" << endl ;
+	G4cerr << "***** AddThis sphere" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 
@@ -190,14 +190,14 @@ void G4VRML1SCENE::AddThis(const G4Sphere& sphere)
 	// Send data
 	if ( (dphi >= 360. * deg) && (dtheta >= 180. * deg) && (rmin == 0.0)  ) {
 		// Send a built-in VRML node (Sphere)
-		fDest << "Separator {" << endl;
+		fDest << "Separator {" << "\n";
 		SendMatrixTransformNode( fpObjectTransformation );
 
-		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << endl;
+		fDest << "\t" << "DEF " << fCurrentDEF << " Separator {" << "\n";
 		SendMaterialNode();
 		SendSphereNode( rmax );
-		fDest << "\t" << "}" << endl; // DEF Separator
-		fDest << "}" << endl; // Separator
+		fDest << "\t" << "}" << "\n"; // DEF Separator
+		fDest << "}" << "\n"; // Separator
 	} else {
 			// call AddPrimitive(Polyhedron)
 			RequestPrimitives( sphere ); 
@@ -210,50 +210,50 @@ void G4VRML1SCENE::AddThis(const G4Sphere& sphere)
 void G4VRML1SCENE::AddPrimitive(const G4Polyline& polyline)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive polyline" << endl ;
+	G4cerr << "***** AddPrimitive polyline" << "\n" ;
 #endif 
 	VRMLBeginModeling () ;	
 
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
 	SendMatrixTransformNode (fpObjectTransformation );
 
 	SendMaterialNode( polyline.GetVisAttributes() );
 
-	fDest << "\t" << "Coordinate3 {" << endl;
-	fDest << "\t\t" << "point [" << endl;
+	fDest << "\t" << "Coordinate3 {" << "\n";
+	fDest << "\t\t" << "point [" << "\n";
 	G4int e, i;
 	for (i = 0, e = polyline.entries(); e; i++, e--) {
 		fDest << "\t\t\t";
 		fDest << polyline(i).x() << " ";
 		fDest << polyline(i).y() << " ";
-		fDest << polyline(i).z() << "," << endl;
+		fDest << polyline(i).z() << "," << "\n";
 	}
-	fDest << "\t\t" << "]" << endl;
-	fDest << "\t" << "}" << endl; // Coordinate3
+	fDest << "\t\t" << "]" << "\n";
+	fDest << "\t" << "}" << "\n"; // Coordinate3
 
-	fDest << "\t" << "IndexedLineSet {" << endl;
+	fDest << "\t" << "IndexedLineSet {" << "\n";
 	fDest << "\t\t" << "coordIndex [";
 	for (i = 0, e = polyline.entries(); e; i++, e--) {
 		if (i % 10 == 0)
-			fDest << endl << "\t\t\t";
+			fDest << "\n" << "\t\t\t";
 		fDest << i << ", ";
 	}
-	fDest << "-1" << endl;
-	fDest << "\t\t" << "]" << endl;
-	fDest << "\t" << "}" << endl; // IndexedLineSet
+	fDest << "-1" << "\n";
+	fDest << "\t\t" << "]" << "\n";
+	fDest << "\t" << "}" << "\n"; // IndexedLineSet
 
-	fDest << "}" << endl; // Separator
+	fDest << "}" << "\n"; // Separator
 }
 
 void G4VRML1SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive(G4Polyhedron)" << endl;
+	G4cerr << "***** AddPrimitive(G4Polyhedron)" << "\n";
 #endif
 	VRMLBeginModeling () ;
 
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
 	SendMatrixTransformNode( fpObjectTransformation );
 
@@ -261,33 +261,33 @@ void G4VRML1SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 	if (fCurrentDEF != "")
 		fDest << "DEF " << fCurrentDEF << " ";
 
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
-	//fDest << "\t\t" << "renderCulling ON" << endl;
+	//fDest << "\t\t" << "renderCulling ON" << "\n";
 
-	fDest << "\t\t" << "ShapeHints {" << endl;
-	fDest << "\t\t\t" << "vertexOrdering COUNTERCLOCKWISE" << endl;
-	fDest << "\t\t\t" << "shapeType SOLID" << endl;
-	fDest << "\t\t\t" << "faceType CONVEX" << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\t\t" << "ShapeHints {" << "\n";
+	fDest << "\t\t\t" << "vertexOrdering COUNTERCLOCKWISE" << "\n";
+	fDest << "\t\t\t" << "shapeType SOLID" << "\n";
+	fDest << "\t\t\t" << "faceType CONVEX" << "\n";
+	fDest << "\t\t" << "}" << "\n";
 
 	SendMaterialNode();
 
-	fDest << "\t\t" << "Coordinate3 {" << endl;
-	fDest << "\t\t\t" << "point [" << endl;
+	fDest << "\t\t" << "Coordinate3 {" << "\n";
+	fDest << "\t\t\t" << "point [" << "\n";
 	G4int i, j;
 	for (i = 1, j = polyhedron.GetNoVertices(); j; j--, i++) {
 		G4Point3D point = polyhedron.GetVertex(i);
 		fDest << "\t\t\t\t";
 		fDest << point.x() << " ";
 		fDest << point.y() << " ";
-		fDest << point.z() << "," << endl;
+		fDest << point.z() << "," << "\n";
 	}
-	fDest << "\t\t\t" << "]" << endl;
-	fDest << "\t\t" << "}" << endl; // Coordinate3
+	fDest << "\t\t\t" << "]" << "\n";
+	fDest << "\t\t" << "}" << "\n"; // Coordinate3
 
-	fDest << "\t\t" << "IndexedFaceSet {" << endl;
-	fDest << "\t\t\t" << "coordIndex [" << endl;
+	fDest << "\t\t" << "IndexedFaceSet {" << "\n";
+	fDest << "\t\t\t" << "coordIndex [" << "\n";
 
 	// facet loop
 	G4int f;
@@ -301,13 +301,13 @@ void G4VRML1SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 			notLastEdge = polyhedron.GetNextVertexIndex(index, edgeFlag);
 			fDest << index - 1 << ", ";
 		} while (notLastEdge);
-		fDest << "-1," << endl;
+		fDest << "-1," << "\n";
 	}
-	fDest << "\t\t\t" << "]" << endl;
-	fDest << "\t\t" << "}" << endl; // IndexFaceSet
+	fDest << "\t\t\t" << "]" << "\n";
+	fDest << "\t\t" << "}" << "\n"; // IndexFaceSet
 
-	fDest << "\t" << "}" << endl; // (DEF) Separator
-	fDest << "}" << endl; // Separator
+	fDest << "\t" << "}" << "\n"; // (DEF) Separator
+	fDest << "}" << "\n"; // Separator
 
 }
 
@@ -315,9 +315,9 @@ void G4VRML1SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 void G4VRML1SCENE::AddPrimitive(const G4NURBS& nurb)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive nurbs" << endl ;
+	G4cerr << "***** AddPrimitive nurbs" << "\n" ;
 #endif 
-	G4cerr << "G4VRML1File::AddPrimitive(G4NURBS&): not implemented. " << endl ;
+	G4cerr << "G4VRML1File::AddPrimitive(G4NURBS&): not implemented. " << "\n" ;
 	VRMLBeginModeling () ;
 
 }
@@ -325,12 +325,12 @@ void G4VRML1SCENE::AddPrimitive(const G4NURBS& nurb)
 void G4VRML1SCENE::AddPrimitive( const G4Text& text ) 
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive text" << endl ;
+	G4cerr << "***** AddPrimitive text" << "\n" ;
 #endif
 	G4cerr <<
           "***** void G4VRML1SCENE::AddPrimitive( const G4Text& text )"
           " not implemented yet."
-             << endl;
+             << "\n";
 
 	VRMLBeginModeling () ;
 }
@@ -338,13 +338,13 @@ void G4VRML1SCENE::AddPrimitive( const G4Text& text )
 void G4VRML1SCENE::AddPrimitive( const G4Circle& circle ) 
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive circle" << endl ;
+	G4cerr << "***** AddPrimitive circle" << "\n" ;
 #endif
 
 	VRMLBeginModeling () ;
 
 	// begin sending a mark
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
 	// send color 
 	SendMarkerColor    ( circle ) ;
@@ -356,25 +356,25 @@ void G4VRML1SCENE::AddPrimitive( const G4Circle& circle )
 	G4double size = GetMarkerHalfSize ( circle );
 
 	// send shape with size 
-	fDest << "\t" << "Sphere {" << endl;
-	fDest << "\t\t" << "radius " << size << endl;
-	fDest << "\t" << "}" << endl;
+	fDest << "\t" << "Sphere {" << "\n";
+	fDest << "\t\t" << "radius " << size << "\n";
+	fDest << "\t" << "}" << "\n";
 
 	// end sending a mark
-	fDest << "}" << endl; // Separator
+	fDest << "}" << "\n"; // Separator
 }
 
 
 void G4VRML1SCENE::AddPrimitive(const G4Square& square)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive square" << endl ;
+	G4cerr << "***** AddPrimitive square" << "\n" ;
 #endif
 
 	VRMLBeginModeling () ;
 
 	// begin sending a mark
-	fDest << "Separator {" << endl;
+	fDest << "Separator {" << "\n";
 
 	// send color 
 	SendMarkerColor    ( square );
@@ -387,27 +387,27 @@ void G4VRML1SCENE::AddPrimitive(const G4Square& square)
 	size *= 2.;
 
 	// send shape with size 
-	fDest << "\t" << "Cube {" << endl;
-	fDest << "\t\t" << "width "  << size << endl;
-	fDest << "\t\t" << "height " << size << endl;
-	fDest << "\t\t" << "depth "  << size << endl;
-	fDest << "\t" << "}" << endl;
+	fDest << "\t" << "Cube {" << "\n";
+	fDest << "\t\t" << "width "  << size << "\n";
+	fDest << "\t\t" << "height " << size << "\n";
+	fDest << "\t\t" << "depth "  << size << "\n";
+	fDest << "\t" << "}" << "\n";
 
 	// end sending a mark
-	fDest << "}" << endl; // Separator
+	fDest << "}" << "\n"; // Separator
 }
 
 void G4VRML1SCENE::ClearStore()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** ClearStore(): No effects" << endl ;
+	G4cerr << "***** ClearStore(): No effects" << "\n" ;
 #endif 
 }
 
 void G4VRML1SCENE::BeginModeling()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** BeginModeling " << endl ;
+	G4cerr << "***** BeginModeling " << "\n" ;
 #endif
 	G4VSceneHandler::BeginModeling();
 }
@@ -415,7 +415,7 @@ void G4VRML1SCENE::BeginModeling()
 void G4VRML1SCENE::EndModeling()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** EndModeling " << endl ;
+	G4cerr << "***** EndModeling " << "\n" ;
 #endif
 	G4VSceneHandler::EndModeling();
 }
@@ -425,7 +425,7 @@ void G4VRML1SCENE::BeginPrimitives(const G4Transform3D& objectTransformation)
   G4VSceneHandler::BeginPrimitives (objectTransformation);
   fpObjectTransformation = &objectTransformation;
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** BeginPrimitives " << endl ;
+	G4cerr << "***** BeginPrimitives " << "\n" ;
 #endif
 	VRMLBeginModeling();
 }
@@ -433,7 +433,7 @@ void G4VRML1SCENE::BeginPrimitives(const G4Transform3D& objectTransformation)
 void G4VRML1SCENE::EndPrimitives()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** EndPrimitives " << endl ;
+	G4cerr << "***** EndPrimitives " << "\n" ;
 #endif
   G4VSceneHandler::EndPrimitives();
 }
@@ -448,19 +448,19 @@ void G4VRML1SCENE::SendMaterialNode( const G4VisAttributes*  pVA )
 
 	const G4Color& color = pVA->GetColor();
 
-	fDest << "\t\t" << "Material {" << endl;
+	fDest << "\t\t" << "Material {" << "\n";
 
 	if (pVA->IsForceDrawingStyle() &&
 	   (pVA->GetForcedDrawingStyle() == G4VisAttributes::wireframe)) {
-		fDest << "\t\t\t" << "transparency " << TRANSPARENCY << endl;
+		fDest << "\t\t\t" << "transparency " << TRANSPARENCY << "\n";
 	}
 
 	fDest << "\t\t\t" << "diffuseColor";
 	fDest << " " << color.GetRed();
 	fDest << " " << color.GetGreen();
 	fDest << " " << color.GetBlue();
-	fDest << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\n";
+	fDest << "\t\t" << "}" << "\n";
 }
 
 
@@ -498,52 +498,52 @@ void G4VRML1SCENE::SendMatrixTransformNode(const G4Transform3D *trans)
 	e2 = e2.unit(); //
 	e3 = e3.unit(); //
 
-	fDest << "\t" << "MatrixTransform {" << endl;
+	fDest << "\t" << "MatrixTransform {" << "\n";
 	fDest << "\t\t" << "matrix ";
 	fDest << e1.x() << " " << e1.y() << " " << e1.z() << " 0 ";
 	fDest << e2.x() << " " << e2.y() << " " << e2.z() << " 0 ";
 	fDest << e3.x() << " " << e3.y() << " " << e3.z() << " 0 ";
-	fDest << B.x()  << " " << B.y()  << " " << B.z()  << " 1" << endl;
-	fDest << "\t" << "}" << endl;
+	fDest << B.x()  << " " << B.y()  << " " << B.z()  << " 1" << "\n";
+	fDest << "\t" << "}" << "\n";
 }
 
 void G4VRML1SCENE::SendCubeNode(G4double w, G4double h, G4double d)
 {
-	fDest << "\t\t" << "Cube {" << endl;
-	fDest << "\t\t\t" << "width "  << w << endl;
-	fDest << "\t\t\t" << "height " << h << endl;
-	fDest << "\t\t\t" << "depth "  << d << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\t\t" << "Cube {" << "\n";
+	fDest << "\t\t\t" << "width "  << w << "\n";
+	fDest << "\t\t\t" << "height " << h << "\n";
+	fDest << "\t\t\t" << "depth "  << d << "\n";
+	fDest << "\t\t" << "}" << "\n";
 }
 
 void G4VRML1SCENE::SendCylinderNode(G4double R, G4double h)
 {
-	fDest << "\t\t" << "Transform {" << endl;
-	fDest << "\t\t\t" << "rotation 1 0 0 " << (90. * deg) << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\t\t" << "Transform {" << "\n";
+	fDest << "\t\t\t" << "rotation 1 0 0 " << (90. * deg) << "\n";
+	fDest << "\t\t" << "}" << "\n";
 
-	fDest << "\t\t" << "Cylinder {" << endl;
-	fDest << "\t\t\t" << "radius " << R << endl;
-	fDest << "\t\t\t" << "height " << h << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\t\t" << "Cylinder {" << "\n";
+	fDest << "\t\t\t" << "radius " << R << "\n";
+	fDest << "\t\t\t" << "height " << h << "\n";
+	fDest << "\t\t" << "}" << "\n";
 }
 
 void G4VRML1SCENE::SendSphereNode(G4double R)
 {
-	fDest << "\t\t" << "Sphere {" << endl;
-	fDest << "\t\t\t" << "radius " << R << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << "\t\t" << "Sphere {" << "\n";
+	fDest << "\t\t\t" << "radius " << R << "\n";
+	fDest << "\t\t" << "}" << "\n";
 }
 
 void G4VRML1SCENE::VRMLBeginModeling()
 {
 	if (!IS_CONNECTED ) {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** VRMLBeginModeling() (started)" << endl ;
+	G4cerr << "***** VRMLBeginModeling() (started)" << "\n" ;
 #endif
 		this->connectPort();
-		fDest << "#VRML V1.0 ascii" << endl;
-		fDest << "# Generated by VRML 1.0 driver of GEANT4\n" << endl;
+		fDest << "#VRML V1.0 ascii" << "\n";
+		fDest << "# Generated by VRML 1.0 driver of GEANT4\n" << "\n";
 	}
 }
 
@@ -551,10 +551,10 @@ void G4VRML1SCENE::VRMLEndModeling()
 {
 	if ( IS_CONNECTED ) {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** VRMLEndModeling() (started)" << endl ;
+	G4cerr << "***** VRMLEndModeling() (started)" << "\n" ;
 #endif
 
-		fDest << "#End of file." << endl;
+		fDest << "#End of file." << "\n";
 		this->closePort();
 	}
 }
@@ -563,7 +563,7 @@ void      G4VRML1SCENE::SendMarkerColor ( const G4VMarker& mark )
 {
 	const G4Color& color = GetColor( mark );
 
-	fDest << "\t" << "Material {" << endl;
+	fDest << "\t" << "Material {" << "\n";
 	fDest << "\t\t";
 	fDest << "ambientColor [] ";
 	fDest << "specularColor [] ";
@@ -571,13 +571,13 @@ void      G4VRML1SCENE::SendMarkerColor ( const G4VMarker& mark )
 	fDest << " " << color.GetRed();
 	fDest << " " << color.GetGreen();
 	fDest << " " << color.GetBlue();
-	fDest << endl;
+	fDest << "\n";
 	fDest << "\t\t" << "emissiveColor";
 	fDest << " " << color.GetRed();
 	fDest << " " << color.GetGreen();
 	fDest << " " << color.GetBlue();
-	fDest << endl;
-	fDest << "\t" << "}" << endl;
+	fDest << "\n";
+	fDest << "\t" << "}" << "\n";
 }
 
 void      
@@ -587,10 +587,10 @@ G4VRML1SCENE::SendMarkerWorldPosition ( const G4VMarker& mark )
 
 	SendMatrixTransformNode( fpObjectTransformation );
 
-	fDest << "\t\t" << "Transform {" << endl;
+	fDest << "\t\t" << "Transform {" << "\n";
 	fDest << "\t\t\t" << "translation ";
-	fDest << point.x() << " " << point.y() << " " << point.z() << endl;
-	fDest << "\t\t" << "}" << endl;
+	fDest << point.x() << " " << point.y() << " " << point.z() << "\n";
+	fDest << "\t\t" << "}" << "\n" ;
 }
 
 
diff --git a/source/visualization/VRML/src/G4VRML1Viewer.cc b/source/visualization/VRML/src/G4VRML1Viewer.cc
index b2d9b5f2a3..dca482dd97 100644
--- a/source/visualization/VRML/src/G4VRML1Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML1Viewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML1Viewer.cc,v 1.3.4.1 1999/12/07 20:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML1Viewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRMLView.cc
 // Yasuhide Sawada & Satoshi Tanaka
@@ -34,14 +34,14 @@ G4VRML1Viewer::~G4VRML1Viewer()
 void G4VRML1Viewer::SetView()
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1Viewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4VRML1Viewer::SetView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML1Viewer::DrawView()
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4VRML1Viewer::DrawView()" << endl;
+	G4cerr << "***** G4VRML1Viewer::DrawView()" << G4endl;
 #endif
 
 	fSceneHandler.VRMLBeginModeling();
@@ -55,14 +55,14 @@ void G4VRML1Viewer::DrawView()
 void G4VRML1Viewer::ClearView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1Viewer::ClearView(): No effects" << endl;
+  G4cerr << "***** G4VRML1Viewer::ClearView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML1Viewer::ShowView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1Viewer::ShowView()" << endl;
+  G4cerr << "***** G4VRML1Viewer::ShowView()" << G4endl;
 #endif
 	fSceneHandler.VRMLEndModeling();
 }
@@ -70,7 +70,7 @@ void G4VRML1Viewer::ShowView(void)
 void G4VRML1Viewer::FinishView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML1Viewer::FinishView(): No effects" << endl;
+  G4cerr << "***** G4VRML1Viewer::FinishView(): No effects" << G4endl;
 #endif
 }
 
diff --git a/source/visualization/VRML/src/G4VRML2.cc b/source/visualization/VRML/src/G4VRML2.cc
index 2070183080..b740761d97 100644
--- a/source/visualization/VRML/src/G4VRML2.cc
+++ b/source/visualization/VRML/src/G4VRML2.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2.cc,v 1.3.8.1 1999/12/07 20:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -58,7 +58,7 @@ G4VSceneHandler* G4VRML2::CreateSceneHandler(const G4String& name)
 	p = new G4VRML2SceneHandler(*this, name);
 
 	G4cout << G4VRML2SceneHandler::GetSceneCount()
-		<< " " << fName << " scenes extanct." << endl;
+		<< " " << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
diff --git a/source/visualization/VRML/src/G4VRML2File.cc b/source/visualization/VRML/src/G4VRML2File.cc
index cf95819f1b..517aa8139f 100644
--- a/source/visualization/VRML/src/G4VRML2File.cc
+++ b/source/visualization/VRML/src/G4VRML2File.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2File.cc,v 1.3.8.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2File.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2File.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -45,7 +45,7 @@ G4VSceneHandler* G4VRML2File::CreateSceneHandler(const G4String& name)
 	p = new G4VRML2FileSceneHandler(*this, name);
 
 	G4cout << G4VRML2FileSceneHandler::GetSceneCount()
-		<< " " << fName << " scenes extanct." << endl;
+		<< " " << fName << " scenes extanct." << G4endl;
 
 	return p;
 }
diff --git a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
index 7488c2de72..31a77d712a 100644
--- a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2FileSceneHandler.cc,v 1.1.8.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2FileSceneHandler.cc,v 1.2 1999/12/15 14:54:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -18,7 +18,7 @@
 
 //#define DEBUG_FR_SCENE
 
-#include <fstream.h>
+#include "g4std/fstream"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -103,7 +103,7 @@ G4VRML2FileSceneHandler::G4VRML2FileSceneHandler(G4VRML2File& system, const G4St
 G4VRML2FileSceneHandler::~G4VRML2FileSceneHandler()
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4VRML2FileSceneHandler" << endl;
+	G4cerr << "***** ~G4VRML2FileSceneHandler" << G4endl;
 #endif 
 	fSceneCount--;
 }
@@ -132,13 +132,13 @@ void G4VRML2FileSceneHandler::connectPort()
 
 		// Message
 		if( fMaxFileNum > 1 && i == MAX_FILE_INDEX ) {
-		  G4cerr << "==========================================="   << endl; 
-		  G4cerr << "WARNING MESSAGE from VRML2FILE driver:      "  << endl;
-		  G4cerr << "  This file name is the final one in the   "   << endl;
-		  G4cerr << "  automatic updation of the output file name." << endl; 
-		  G4cerr << "  You may overwrite an existing file of   "    << endl; 
-                  G4cerr << "  the same name.                          "    << endl;
-		  G4cerr << "==========================================="   << endl; 
+		  G4cerr << "==========================================="   << G4endl; 
+		  G4cerr << "WARNING MESSAGE from VRML2FILE driver:      "  << G4endl;
+		  G4cerr << "  This file name is the final one in the   "   << G4endl;
+		  G4cerr << "  automatic updation of the output file name." << G4endl; 
+		  G4cerr << "  You may overwrite an existing file of   "    << G4endl; 
+                  G4cerr << "  the same name.                          "    << G4endl;
+		  G4cerr << "==========================================="   << G4endl; 
 		}
 
 		// re-determine file to G4VRMLFILE_DEST_DIR/g4_i.wrl for i>0
@@ -147,7 +147,7 @@ void G4VRML2FileSceneHandler::connectPort()
 		}
 
 		// check validity of the file name
-		ifstream  fin ; 
+		G4std::ifstream  fin ; 
 		fin.open(fVRMLFileName) ;
 		if(!fin) { 
 			// new file	
@@ -161,11 +161,11 @@ void G4VRML2FileSceneHandler::connectPort()
 	} // for 
 
 	// open a VRML 2.0 file with determined file name
-	G4cerr << "==========================================="  << endl; 
-	G4cerr << "Output VRML 2.0 file: " <<    fVRMLFileName << endl; 
-	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << endl; 
-	G4cerr << "  (Customizable as: setenv G4VRMLFILE_MAX_FILE_NUM number) " << endl;
-	G4cerr << "===========================================" << endl; 
+	G4cerr << "==========================================="  << G4endl; 
+	G4cerr << "Output VRML 2.0 file: " <<    fVRMLFileName << G4endl; 
+	G4cerr << "Muximal number of file in the destination directory: " << fMaxFileNum << G4endl; 
+	G4cerr << "  (Customizable as: setenv G4VRMLFILE_MAX_FILE_NUM number) " << G4endl;
+	G4cerr << "===========================================" << G4endl; 
 
 	fDest.open(fVRMLFileName) ;  fFlagDestOpen =  true ;
 }
@@ -182,18 +182,18 @@ void G4VRML2FileSceneHandler::closePort()
 
 	// close VRML file	
 	fDest.close();  fFlagDestOpen = false ;
-	G4cerr << "*** VRML 2.0 File  " << fVRMLFileName << "  is generated." << endl;
+	G4cerr << "*** VRML 2.0 File  " << fVRMLFileName << "  is generated." << G4endl;
 
 	
 	// Invoke viewer 
 
 	if ( !strcmp(viewer, NO_VRML_VIEWER )) {
-		G4cerr << "MESSAGE from VRML2FILE driver:"     << endl;
+		G4cerr << "MESSAGE from VRML2FILE driver:"     << G4endl;
 		G4cerr << "    Set an environmental variable  " ;
-		G4cerr <<      ENV_VRML_VIEWER << endl;
-		G4cerr << "    if you want to visualize the generated VRML file" << endl; 
-		G4cerr << "    automatically.  For example, " << endl;
-		G4cerr << "    setenv  " << ENV_VRML_VIEWER << "  vrwave " << endl;
+		G4cerr <<      ENV_VRML_VIEWER << G4endl;
+		G4cerr << "    if you want to visualize the generated VRML file" << G4endl; 
+		G4cerr << "    automatically.  For example, " << G4endl;
+		G4cerr << "    setenv  " << ENV_VRML_VIEWER << "  vrwave " << G4endl;
 	} else {
 		sprintf( command, "%s %s", viewer, fVRMLFileName  );   
 		system( command );
diff --git a/source/visualization/VRML/src/G4VRML2FileViewer.cc b/source/visualization/VRML/src/G4VRML2FileViewer.cc
index 71773916a9..a0d3b62e89 100644
--- a/source/visualization/VRML/src/G4VRML2FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML2FileViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2FileViewer.cc,v 1.3.4.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2FileViewer.cc,v 1.4 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2FileViewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -42,7 +42,7 @@ G4VRML2FileViewer::~G4VRML2FileViewer()
 void G4VRML2FileViewer::SetView()
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2FileViewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4VRML2FileViewer::SetView(): No effects" << G4endl;
 #endif
 
 // Do nothing, since VRML a browser is running as a different process.
@@ -53,7 +53,7 @@ void G4VRML2FileViewer::SetView()
 void G4VRML2FileViewer::DrawView()
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4VRML2FileViewer::DrawView()" << endl;
+	G4cerr << "***** G4VRML2FileViewer::DrawView()" << G4endl;
 #endif
 
 	fSceneHandler.VRMLBeginModeling() ; 
@@ -70,14 +70,14 @@ void G4VRML2FileViewer::DrawView()
 void G4VRML2FileViewer::ClearView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2File1View::ClearView(): No effects" << endl;
+  G4cerr << "***** G4VRML2File1View::ClearView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML2FileViewer::ShowView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2FileViewer::ShowView()" << endl;
+  G4cerr << "***** G4VRML2FileViewer::ShowView()" << G4endl;
 #endif
 	fSceneHandler.VRMLEndModeling();
 }
@@ -85,7 +85,7 @@ void G4VRML2FileViewer::ShowView(void)
 void G4VRML2FileViewer::FinishView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2FileViewer::FinishView(): No effects" << endl;
+  G4cerr << "***** G4VRML2FileViewer::FinishView(): No effects" << G4endl;
 #endif
 }
 
@@ -112,15 +112,15 @@ void G4VRML2FileViewer::SendViewParameters ()
 	G4Point3D		E(0.0, 0.0, E_z );
 
 	// VRML codes are generated below	
-	fDest << endl;
-	fDest << "#---------- CAMERA" << endl;
-	fDest << "Viewpoint {"         << endl;
+	fDest << G4endl;
+	fDest << "#---------- CAMERA" << G4endl;
+	fDest << "Viewpoint {"         << G4endl;
 	fDest << "\t" << "position "           ;
 	fDest                 << E.x() << " "  ;
 	fDest                 << E.y() << " "  ;
-	fDest                 << E.z() << endl ;
-	fDest << "}" << endl;
-	fDest << endl;
+	fDest                 << E.z() << G4endl ;
+	fDest << "}" << G4endl;
+	fDest << G4endl;
 
 } 
 
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandler.cc b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
index 8b976e40d1..1522669d62 100644
--- a/source/visualization/VRML/src/G4VRML2SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2SceneHandler.cc,v 1.1.8.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2SceneHandler.cc,v 1.2 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2SceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -19,7 +19,7 @@
 //#define DEBUG_FR_SCENE
 
 #include <unistd.h>
-#include <fstream.h>
+#include "g4std/fstream"
 #include <math.h>
 
 #include "globals.hh"
@@ -71,7 +71,7 @@ G4VRML2SceneHandler::G4VRML2SceneHandler(G4VRML2& system, const G4String& name)
 G4VRML2SceneHandler::~G4VRML2SceneHandler()
 {
 #if defined DEBUG_FR_SCENE
-	G4cerr << "***** ~G4VRML2SceneHandler" << endl;
+	G4cerr << "***** ~G4VRML2SceneHandler" << G4endl;
 #endif 
 	fSceneCount--;
 }
@@ -94,12 +94,12 @@ void G4VRML2SceneHandler::connectPort(G4int max_trial)
 		    // INET domain connection is established
 			G4cerr << "*** GEANT4 is connected to port  ";
 			G4cerr << fDest.getPort(); 
-			G4cerr << " of server  " << fSystem.getHostName() << endl;
+			G4cerr << " of server  " << fSystem.getHostName() << G4endl;
 			break; 
 		} else { 
 			// Connection failed. Try the next port.
 			G4cerr << "*** GEANT4 incremented targeting port to ";
-			G4cerr << port << endl;
+			G4cerr << port << G4endl;
 		}
 
 		sleep (1);
@@ -107,17 +107,17 @@ void G4VRML2SceneHandler::connectPort(G4int max_trial)
 	} // for
 
 	if (!fDest.isConnected()) {
-		G4cerr << "*** INET Connection failed. " << endl;
-		G4cerr << "    Maybe, you have not invoked viewer  g4vrmlview  yet, " << endl;
-		G4cerr << "    or too many viewers are already running in the " << endl;
-		G4cerr << "    server host(" << fSystem.getHostName() << "). " << endl;
+		G4cerr << "*** INET Connection failed. " << G4endl;
+		G4cerr << "    Maybe, you have not invoked viewer  g4vrmlview  yet, " << G4endl;
+		G4cerr << "    or too many viewers are already running in the " << G4endl;
+		G4cerr << "    server host(" << fSystem.getHostName() << "). " << G4endl;
 	}
 }
 
 void G4VRML2SceneHandler::closePort()
 {
 	fDest.close();
-	G4cerr << "*** INET Connection closed. " << endl;
+	G4cerr << "*** INET Connection closed. " << G4endl;
 }
 
 
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
index fd65fb11b4..23d55cc6f4 100644
--- a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
+++ b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2SceneHandlerFunc.icc,v 1.3.4.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2SceneHandlerFunc.icc,v 1.5 1999/12/27 07:49:22 stanaka Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -16,7 +16,7 @@
 void G4VRML2SCENE::AddThis(const G4Trd& trd)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis trd" << endl ;
+	G4cerr << "***** AddThis trd" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(trd);
@@ -25,7 +25,7 @@ void G4VRML2SCENE::AddThis(const G4Trd& trd)
 void G4VRML2SCENE::AddThis(const G4Trap& trap)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis trap" << endl ;
+	G4cerr << "***** AddThis trap" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(trap);
@@ -34,7 +34,7 @@ void G4VRML2SCENE::AddThis(const G4Trap& trap)
 void G4VRML2SCENE::AddThis(const G4Para& para)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis para" << endl ;
+	G4cerr << "***** AddThis para" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(para);
@@ -43,7 +43,7 @@ void G4VRML2SCENE::AddThis(const G4Para& para)
 void G4VRML2SCENE::AddThis(const G4Torus& torus )
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis torus" << endl ;
+	G4cerr << "***** AddThis torus" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(torus);
@@ -53,7 +53,7 @@ void G4VRML2SCENE::AddThis(const G4Torus& torus )
 void G4VRML2SCENE::AddThis(const G4VSolid& vsolid)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis vsolid" << endl ;
+	G4cerr << "***** AddThis vsolid" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(vsolid);
@@ -62,7 +62,7 @@ void G4VRML2SCENE::AddThis(const G4VSolid& vsolid)
 void G4VRML2SCENE::AddThis(const G4Tubs& tubs)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis tubs" << endl ;
+	G4cerr << "***** AddThis tubs" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(tubs) ;
@@ -73,7 +73,7 @@ void G4VRML2SCENE::AddThis(const G4Tubs& tubs)
 void G4VRML2SCENE::AddThis(const G4Cons& cons)
 {
 #if defined DEBUG_SCENE_FUNC
-    G4cerr << "***** AddThis cons" << endl ;
+    G4cerr << "***** AddThis cons" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(cons) ;
@@ -82,7 +82,7 @@ void G4VRML2SCENE::AddThis(const G4Cons& cons)
 void G4VRML2SCENE::AddThis(const G4Box& box)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis box" << endl ;
+	G4cerr << "***** AddThis box" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(box) ;
@@ -92,7 +92,7 @@ void G4VRML2SCENE::AddThis(const G4Box& box)
 void G4VRML2SCENE::AddThis(const G4Sphere& sphere)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddThis sphere" << endl ;
+	G4cerr << "***** AddThis sphere" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 	G4VSceneHandler::AddThis(sphere) ;
@@ -101,22 +101,22 @@ void G4VRML2SCENE::AddThis(const G4Sphere& sphere)
 void G4VRML2SCENE::AddPrimitive(const G4Polyline& polyline)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive polyline" << endl ;
+	G4cerr << "***** AddPrimitive polyline" << "\n" ;
 #endif 
 
 	VRMLBeginModeling () ;
 
 	// VRML codes are generated below
 
-	fDest << "#---------- POLYLINE" << endl;
-	fDest << "Shape {" << endl;
+	fDest << "#---------- POLYLINE" << "\n";
+	fDest << "Shape {" << "\n";
 
 	SendLineColor   ( polyline.GetVisAttributes() );
 
-	fDest << "\t" << "geometry IndexedLineSet {" << endl;
+	fDest << "\t" << "geometry IndexedLineSet {" << "\n";
 
-	fDest << "\t\t"   << "coord Coordinate {" << endl;
-	fDest << "\t\t\t" <<      "point [" << endl;
+	fDest << "\t\t"   << "coord Coordinate {" << "\n";
+	fDest << "\t\t\t" <<      "point [" << "\n";
 	G4int e, i;
 	for (i = 0, e = polyline.entries(); e; i++, e--) {
 
@@ -126,31 +126,31 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyline& polyline)
 		fDest << "\t\t\t\t";
 		fDest <<                  point.x() << " ";
 		fDest <<                  point.y() << " ";
-		fDest <<                  point.z() << "," << endl;
+		fDest <<                  point.z() << "," << "\n";
 
 	} // for
 
-	fDest << "\t\t\t" <<      "]" << endl; // point
-	fDest << "\t\t"   << "}"      << endl; // coord
+	fDest << "\t\t\t" <<      "]" << "\n"; // point
+	fDest << "\t\t"   << "}"      << "\n"; // coord
 
 	fDest << "\t\t" << "coordIndex [";
 	for (i = 0, e = polyline.entries(); e; i++, e--) {
 		if (i % 10 == 0)
-			fDest << endl << "\t\t\t";
+			fDest << "\n" << "\t\t\t";
 		fDest << i << ", ";
 	}
-	fDest << "-1" << endl;
-	fDest << "\t\t" << "]"        << endl; // coordIndex
-	fDest << "\t" << "}" << endl; // geometry IndexedLineSet
+	fDest << "-1" << "\n";
+	fDest << "\t\t" << "]"        << "\n"; // coordIndex
+	fDest << "\t" << "}" << "\n"; // geometry IndexedLineSet
 
-	fDest << "}" << endl; // Shape
+	fDest << "}" << "\n"; // Shape
 }
 
 
 void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 {
 #if defined DEBUG_SCENE_FUNC
-	cerr << "***** AddPrimitive(G4Polyhedron)" << endl;
+	G4cerr << "***** AddPrimitive(G4Polyhedron)" << "\n";
 #endif
 
 	VRMLBeginModeling () ;
@@ -164,24 +164,24 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 
 	// VRML codes are generated below
 
-	fDest << "#---------- SOLID: " << pv_name << endl;
+	fDest << "#---------- SOLID: " << pv_name << "\n";
 
 	if ( IsPVPickable() ) {
 
-	 fDest << "Anchor {" << endl;
-	 fDest << " description " << "\"" << pv_name << "\"" << endl;
-	 fDest << " url \"\" " << endl;
-	 fDest << " children [" << endl;
+	 fDest << "Anchor {" << "\n";
+	 fDest << " description " << "\"" << pv_name << "\"" << "\n";
+	 fDest << " url \"\" " << "\n";
+	 fDest << " children [" << "\n";
 	}
 
-	fDest << "\t"; fDest << "Shape {" << endl;
+	fDest << "\t"; fDest << "Shape {" << "\n";
 
 	SendMaterialNode();
 
-	fDest << "\t\t" << "geometry IndexedFaceSet {" << endl;
+	fDest << "\t\t" << "geometry IndexedFaceSet {" << "\n";
 
-	fDest << "\t\t\t"   << "coord Coordinate {" << endl;
-	fDest << "\t\t\t\t" <<      "point [" << endl;
+	fDest << "\t\t\t"   << "coord Coordinate {" << "\n";
+	fDest << "\t\t\t\t" <<      "point [" << "\n";
 	G4int i, j;
 	for (i = 1, j = polyhedron.GetNoVertices(); j; j--, i++) {
 		G4Point3D point = polyhedron.GetVertex(i);
@@ -191,12 +191,12 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 		fDest << "\t\t\t\t\t";
 		fDest <<                   point.x() << " ";
 		fDest <<                   point.y() << " ";
-		fDest <<                   point.z() << "," << endl;
+		fDest <<                   point.z() << "," << "\n";
 	}
-	fDest << "\t\t\t\t" <<      "]" << endl; // point
-	fDest << "\t\t\t"   << "}"      << endl; // coord
+	fDest << "\t\t\t\t" <<      "]" << "\n"; // point
+	fDest << "\t\t\t"   << "}"      << "\n"; // coord
 
-	fDest << "\t\t\t"   << "coordIndex [" << endl;
+	fDest << "\t\t\t"   << "coordIndex [" << "\n";
 
 	// facet loop
 	G4int f;
@@ -210,18 +210,18 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 			notLastEdge = polyhedron.GetNextVertexIndex(index, edgeFlag);
 			fDest << index - 1 << ", ";
 		} while (notLastEdge);
-		fDest << "-1," << endl;
+		fDest << "-1," << "\n";
 	}
-	fDest << "\t\t\t"   << "]" << endl; // coordIndex
+	fDest << "\t\t\t"   << "]" << "\n"; // coordIndex
 
-	fDest << "\t\t\t"   << "solid FALSE" << endl; // draw backfaces
+	fDest << "\t\t\t"   << "solid FALSE" << "\n"; // draw backfaces
 
-	fDest << "\t\t" << "}"     << endl; // IndexFaceSet
-	fDest << "\t" << "}"       << endl; // Shape
+	fDest << "\t\t" << "}"     << "\n"; // IndexFaceSet
+	fDest << "\t" << "}"       << "\n"; // Shape
 
 	if ( IsPVPickable() ) {
-	 fDest << " ]"              << endl; // children
-	 fDest << "}"               << endl; // Anchor
+	 fDest << " ]"              << "\n"; // children
+	 fDest << "}"               << "\n"; // Anchor
 	}
 
 } 
@@ -230,9 +230,9 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 void G4VRML2SCENE::AddPrimitive(const G4NURBS& nurb)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive nurbs" << endl ;
+	G4cerr << "***** AddPrimitive nurbs" << "\n" ;
 #endif 
-	G4cerr << "G4VRML2File::AddPrimitive(G4NURBS&): not implemented. " << endl ;
+	G4cerr << "G4VRML2File::AddPrimitive(G4NURBS&): not implemented. " << "\n" ;
 
 	VRMLBeginModeling () ;
 }
@@ -240,12 +240,12 @@ void G4VRML2SCENE::AddPrimitive(const G4NURBS& nurb)
 void G4VRML2SCENE::AddPrimitive( const G4Text& text ) 
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive text" << endl ;
+	G4cerr << "***** AddPrimitive text" << "\n" ;
 #endif
 	G4cerr <<
           "***** void G4VRML2SCENE::AddPrimitive( const G4Text& text )"
           " not implemented yet."
-             << endl;
+             << "\n";
 
 	VRMLBeginModeling () ;
 
@@ -254,7 +254,7 @@ void G4VRML2SCENE::AddPrimitive( const G4Text& text )
 void G4VRML2SCENE::AddPrimitive( const G4Circle& circle ) 
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive circle" << endl ;
+	G4cerr << "***** AddPrimitive circle" << "\n" ;
 #endif
 	VRMLBeginModeling () ;
 
@@ -267,52 +267,52 @@ void G4VRML2SCENE::AddPrimitive( const G4Circle& circle )
 	G4double radius = GetMarkerHalfSize ( circle );
 
 	// VRML codes are generated below
-	fDest << "#---------- 3D MARKER (Circle)" << endl;
-	fDest << "Anchor {" << endl;
+	fDest << "#---------- 3D MARKER (Circle)" << "\n";
+	fDest << "Anchor {" << "\n";
 
 	if( circle.GetInfo().isNull() ) {
 		fDest << " description " << "\"(" <<  X <<  "  " ;
 		fDest <<                              Y <<  "  " ;
-		fDest <<                              Z <<  ")\"" << endl;
+		fDest <<                              Z <<  ")\"" << "\n";
 	} else {
-		fDest << " description " << "\"" <<  info << "\"" << endl;
+		fDest << " description " << "\"" <<  info << "\"" << "\n";
 	}
 
 
-	fDest << " url \"\" " << endl;
+	fDest << " url \"\" " << "\n";
 
-	fDest << " children [" << endl;
+	fDest << " children [" << "\n";
 
-	fDest << "  Transform {" << endl;
+	fDest << "  Transform {" << "\n";
 
 	fDest << "   translation ";
-	fDest <<      X << " " << Y << " " << Z << endl;
+	fDest <<      X << " " << Y << " " << Z << "\n";
 
-	fDest << "   children ["   << endl;
+	fDest << "   children ["   << "\n";
 
-	fDest << "\t" << "Shape {" << endl;
+	fDest << "\t" << "Shape {" << "\n";
 
 	SendMarkerColor( circle );
 
 	// send shape with size 
-	fDest << "\t\t"   << "geometry Sphere {" << endl;
-	fDest << "\t\t\t" <<      "radius " << radius << endl;
-	fDest << "\t\t"   << "}" << endl;
+	fDest << "\t\t"   << "geometry Sphere {" << "\n";
+	fDest << "\t\t\t" <<      "radius " << radius << "\n";
+	fDest << "\t\t"   << "}" << "\n";
 
-	fDest << "\t" << "}"       << endl; // Shape
+	fDest << "\t" << "}"       << "\n"; // Shape
 
-	fDest << "   ]"            << endl; //  children 
-	fDest << "  }"             << endl; //  Transform
+	fDest << "   ]"            << "\n"; //  children 
+	fDest << "  }"             << "\n"; //  Transform
 	
-	fDest << " ]"              << endl; //  children
-	fDest << "}"               << endl; //  Anchor
+	fDest << " ]"              << "\n"; //  children
+	fDest << "}"               << "\n"; //  Anchor
 
 }
 
 void G4VRML2SCENE::AddPrimitive(const G4Square& square)
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** AddPrimitive square" << endl ;
+	G4cerr << "***** AddPrimitive square" << "\n" ;
 #endif
 
 	VRMLBeginModeling () ;
@@ -327,60 +327,60 @@ void G4VRML2SCENE::AddPrimitive(const G4Square& square)
 	G4double diameter = 2.0 * radius ;
 
 	// VRML codes are generated below
-	fDest << "#---------- 3D MARKER (Square)" << endl;
-	fDest << "Anchor {" << endl;
+	fDest << "#---------- 3D MARKER (Square)" << "\n";
+	fDest << "Anchor {" << "\n";
 
 	if( square.GetInfo().isNull() ) {
 		fDest << " description " << "\"(" <<  X <<  "  " ;
 		fDest <<                              Y <<  "  " ;
-		fDest <<                              Z <<  ")\"" << endl;
+		fDest <<                              Z <<  ")\"" << "\n";
 	} else {
-		fDest << " description " << "\"" <<  info << "\"" << endl;
+		fDest << " description " << "\"" <<  info << "\"" << "\n";
 	}
 
-	fDest << " url \"\" " << endl;
+	fDest << " url \"\" " << "\n";
 
-	fDest << " children [" << endl;
+	fDest << " children [" << "\n";
 
-	fDest << "  Transform {" << endl;
+	fDest << "  Transform {" << "\n";
 
 	fDest << "   translation ";
-	fDest <<      X << " " << Y << " " << Z << endl;
+	fDest <<      X << " " << Y << " " << Z << "\n";
 
-	fDest << "   children ["   << endl;
+	fDest << "   children ["   << "\n";
 
-	fDest << "\t" << "Shape {" << endl;
+	fDest << "\t" << "Shape {" << "\n";
 
 	SendMarkerColor( square );
 
 	// send shape with size 
-	fDest << "\t\t"   << "geometry Box {" << endl;
+	fDest << "\t\t"   << "geometry Box {" << "\n";
 	fDest << "\t\t\t" <<      "size "   << diameter << " "  ;
 	fDest                               << diameter << " "  ;
-	fDest                               << diameter << endl ;
-	fDest << "\t\t"   << "}"                        << endl;
+	fDest                               << diameter << "\n" ;
+	fDest << "\t\t"   << "}"                        << "\n";
 
-	fDest << "\t" << "}"       << endl; //  Shape
+	fDest << "\t" << "}"       << "\n"; //  Shape
 
-	fDest << "   ]"            << endl; //  children 
-	fDest << "  }"             << endl; //  Transform
+	fDest << "   ]"            << "\n"; //  children 
+	fDest << "  }"             << "\n"; //  Transform
 	
-	fDest << " ]"              << endl; //  children
-	fDest << "}"               << endl; //  Anchor
+	fDest << " ]"              << "\n"; //  children
+	fDest << "}"               << "\n"; //  Anchor
 
 }
 
 void G4VRML2SCENE::ClearStore()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** ClearStore(): No effetcs" << endl ;
+	G4cerr << "***** ClearStore(): No effetcs" << "\n" ;
 #endif 
 }
 
 void G4VRML2SCENE::BeginModeling()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** BeginModeling" << endl ;
+	G4cerr << "***** BeginModeling" << "\n" ;
 #endif
 	G4VSceneHandler::BeginModeling();
 
@@ -389,7 +389,7 @@ void G4VRML2SCENE::BeginModeling()
 void G4VRML2SCENE::EndModeling()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** EndModeling " << endl ;
+	G4cerr << "***** EndModeling " << "\n" ;
 #endif
 	G4VSceneHandler::EndModeling();
 }
@@ -399,7 +399,7 @@ void G4VRML2SCENE::BeginPrimitives(const G4Transform3D& objectTransformation)
   G4VSceneHandler::BeginPrimitives (objectTransformation);
   fpObjectTransformation = &objectTransformation;
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** BeginPrimitives " << endl ;
+	G4cerr << "***** BeginPrimitives " << "\n" ;
 #endif
 	VRMLBeginModeling(); 
 }
@@ -407,7 +407,7 @@ void G4VRML2SCENE::BeginPrimitives(const G4Transform3D& objectTransformation)
 void G4VRML2SCENE::EndPrimitives()
 {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** EndPrimitives " << endl ;
+	G4cerr << "***** EndPrimitives " << "\n" ;
 #endif
   G4VSceneHandler::EndPrimitives();
 }
@@ -438,36 +438,36 @@ void G4VRML2SCENE::SendMaterialNode( const G4VisAttributes*  pVA )
 		// Error recovery: Use default values of VRML browser
 		fDest << "\t\t" ;
 		fDest << "appearance Appearance { material Material {} }";
-		fDest << endl;
+		fDest << "\n";
 		
 	} else {
 
 		const G4Color& color = pVA->GetColor();
 
-		fDest << "\t\t"   << "appearance Appearance {" << endl;
-		fDest << "\t\t\t" <<      "material Material {" << endl;
+		fDest << "\t\t"   << "appearance Appearance {" << "\n";
+		fDest << "\t\t\t" <<      "material Material {" << "\n";
 
 		// diffuse color 	
 		fDest << "\t\t\t\t" << "diffuseColor ";
 		fDest <<                   color.GetRed()   << " " ;
 		fDest <<                   color.GetGreen() << " " ;
-		fDest <<                   color.GetBlue()  << endl; 
+		fDest <<                   color.GetBlue()  << "\n"; 
 
 		// emmisive color 	
 		// fDest << "\t\t\t\t" << "emissiveColor ";
 		// fDest <<                   color.GetRed()   << " " ;
 		// fDest <<                   color.GetGreen() << " " ;
-		//fDest <<                   color.GetBlue()  << endl; 
+		//fDest <<                   color.GetBlue()  << "\n"; 
 		//
 
 		// wireframe is expressed as transparency
 		if ( flagWF ) 
 		{
-			fDest << "\t\t\t\t" << "transparency " << TRANSPARENCY << endl;
+			fDest << "\t\t\t\t" << "transparency " << TRANSPARENCY << "\n";
 		}
 
-		fDest << "\t\t\t" <<      "}" << endl; // material
-		fDest << "\t\t"   << "}"      << endl; // appearance
+		fDest << "\t\t\t" <<      "}" << "\n"; // material
+		fDest << "\t\t"   << "}"      << "\n"; // appearance
 	}
 
 }
@@ -484,11 +484,11 @@ void G4VRML2SCENE::VRMLBeginModeling()
 {
 	if (!IS_CONNECTED ) {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** VRMLBeginModeling (started)" << endl ;
+	G4cerr << "***** VRMLBeginModeling (started)" << "\n" ;
 #endif
 		this->connectPort();
-		fDest << "#VRML V2.0 utf8" << endl;
-		fDest << "# Generated by VRML 2.0 driver of GEANT4\n" << endl;
+		fDest << "#VRML V2.0 utf8" << "\n";
+		fDest << "# Generated by VRML 2.0 driver of GEANT4\n" << "\n";
 	}
 }
 
@@ -496,9 +496,9 @@ void G4VRML2SCENE::VRMLEndModeling()
 {
 	if ( IS_CONNECTED ) {
 #if defined DEBUG_SCENE_FUNC
-	G4cerr << "***** VRMLEndModeling (started)" << endl ;
+	G4cerr << "***** VRMLEndModeling (started)" << "\n" ;
 #endif
-		fDest << "#End of file." << endl;
+		fDest << "#End of file." << "\n";
 		this->closePort();
 	}
 }
@@ -507,18 +507,18 @@ void      G4VRML2SCENE::SendMarkerColor ( const G4VMarker& mark )
 {
 	const G4Color& color = GetColor( mark );
 
-	fDest << "\t\t"     << "appearance Appearance {" << endl;
-	fDest << "\t\t\t"   <<      "material Material {" << endl;
+	fDest << "\t\t"     << "appearance Appearance {" << "\n";
+	fDest << "\t\t\t"   <<      "material Material {" << "\n";
 	fDest << "\t\t\t\t" <<      "diffuseColor ";
 	fDest <<                   color.GetRed()    << " " ;
 	fDest <<                   color.GetGreen()  << " " ;
-	fDest <<                   color.GetBlue()   << endl;
+	fDest <<                   color.GetBlue()   << "\n";
 	fDest << "\t\t\t\t" <<    "emissiveColor ";
 	fDest <<                   color.GetRed()    << " " ;
 	fDest <<                   color.GetGreen()  << " " ;
-	fDest <<                   color.GetBlue()   << endl;
-	fDest << "\t\t\t"   <<      "}"              << endl; // material
-	fDest << "\t\t"     << "}"                   << endl; // appearance
+	fDest <<                   color.GetBlue()   << "\n";
+	fDest << "\t\t\t"   <<      "}"              << "\n"; // material
+	fDest << "\t\t"     << "}"                   << "\n"; // appearance
 
 }
 
@@ -530,7 +530,7 @@ G4VRML2SCENE::SendMarkerWorldPosition ( const G4VMarker& mark )
 	point.transform( *fpObjectTransformation );
 
 	fDest << "   translation ";
-	fDest <<      point.x() << " " << point.y() << " " << point.z() << endl;
+	fDest <<      point.x() << " " << point.y() << " " << point.z() << "\n";
 
 }
 
@@ -600,18 +600,18 @@ void G4VRML2SCENE::SendLineColor ( const G4VisAttributes*  pVA )
 	const G4Color& color = pVA->GetColor();
 
 
-	fDest << "\t"   << "appearance Appearance {" << endl;
-	fDest << "\t\t" <<      "material Material {" << endl;
+	fDest << "\t"   << "appearance Appearance {" << "\n";
+	fDest << "\t\t" <<      "material Material {" << "\n";
 	fDest << "\t\t\t" <<      "diffuseColor ";
 	fDest <<                   color.GetRed()    << " " ;
 	fDest <<                   color.GetGreen()  << " " ;
-	fDest <<                   color.GetBlue()   << endl;
+	fDest <<                   color.GetBlue()   << "\n";
 	fDest << "\t\t\t" <<    "emissiveColor ";
 	fDest <<                   color.GetRed()    << " " ;
 	fDest <<                   color.GetGreen()  << " " ;
-	fDest <<                   color.GetBlue()   << endl;
-	fDest << "\t\t" <<      "}"                  << endl; // material
-	fDest << "\t"   << "}"                       << endl; // appearance
+	fDest <<                   color.GetBlue()   << "\n";
+	fDest << "\t\t" <<      "}"                  << "\n"; // material
+	fDest << "\t"   << "}"                       << "\n"; // appearance
 }
 
 G4double      G4VRML2SCENE::SetPVTransparency ()
diff --git a/source/visualization/VRML/src/G4VRML2Viewer.cc b/source/visualization/VRML/src/G4VRML2Viewer.cc
index c0df44f233..ac44fdc5b6 100644
--- a/source/visualization/VRML/src/G4VRML2Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML2Viewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VRML2Viewer.cc,v 1.3.4.1 1999/12/07 20:53:47 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VRML2Viewer.cc,v 1.5 1999/12/27 07:49:22 stanaka Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4VRML2Viewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -41,7 +41,7 @@ G4VRML2Viewer::~G4VRML2Viewer()
 void G4VRML2Viewer::SetView()
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2Viewer::SetView(): No effects" << endl;
+  G4cerr << "***** G4VRML2Viewer::SetView(): No effects" << G4endl;
 #endif
 
 // Do nothing, since VRML a browser is running as a different process.
@@ -53,7 +53,7 @@ void G4VRML2Viewer::SetView()
 void G4VRML2Viewer::DrawView()
 {
 #if defined DEBUG_FR_VIEW
-	G4cerr << "***** G4VRML2Viewer::DrawView()" << endl;
+	G4cerr << "***** G4VRML2Viewer::DrawView()" << G4endl;
 #endif
 	fSceneHandler.VRMLBeginModeling() ;
 
@@ -69,14 +69,14 @@ void G4VRML2Viewer::DrawView()
 void G4VRML2Viewer::ClearView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2Viewer::ClearView(): No effects" << endl;
+  G4cerr << "***** G4VRML2Viewer::ClearView(): No effects" << G4endl;
 #endif
 }
 
 void G4VRML2Viewer::ShowView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2Viewer::ShowView()" << endl;
+  G4cerr << "***** G4VRML2Viewer::ShowView()" << G4endl;
 #endif
 	fSceneHandler.VRMLEndModeling();
 }
@@ -84,7 +84,7 @@ void G4VRML2Viewer::ShowView(void)
 void G4VRML2Viewer::FinishView(void)
 {
 #if defined DEBUG_FR_VIEW
-  G4cerr << "***** G4VRML2Viewer::FinishView(): No effects" << endl;
+  G4cerr << "***** G4VRML2Viewer::FinishView(): No effects" << G4endl;
 #endif
 }
 
@@ -110,15 +110,15 @@ void G4VRML2Viewer::SendViewParameters ()
 	G4Point3D		E(0.0, 0.0, E_z );
 
 	// VRML codes are generated below	
-	fDest << endl;
-	fDest << "#---------- CAMERA" << endl;
-	fDest << "Viewpoint {"         << endl;
+	fDest << "\n";
+	fDest << "#---------- CAMERA" << "\n";
+	fDest << "Viewpoint {"         << "\n";
 	fDest << "\t" << "position "           ;
 	fDest                 << E.x() << " "  ;
 	fDest                 << E.y() << " "  ;
-	fDest                 << E.z() << endl ;
-	fDest << "}" << endl;
-	fDest << endl;
+	fDest                 << E.z() << "\n" ;
+	fDest << "}" << "\n";
+	fDest << "\n";
 
 } 
 
diff --git a/source/visualization/management/include/G4GraphicsSystemList.hh b/source/visualization/management/include/G4GraphicsSystemList.hh
index 0a0f9e4330..8556828b27 100644
--- a/source/visualization/management/include/G4GraphicsSystemList.hh
+++ b/source/visualization/management/include/G4GraphicsSystemList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GraphicsSystemList.hh,v 1.3.2.1 1999/12/07 20:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4GraphicsSystemList.hh,v 1.4 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  2nd April 1996
diff --git a/source/visualization/management/include/G4Scene.hh b/source/visualization/management/include/G4Scene.hh
index 68b1055c91..4350f15714 100644
--- a/source/visualization/management/include/G4Scene.hh
+++ b/source/visualization/management/include/G4Scene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Scene.hh,v 1.6.2.1 1999/12/07 20:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Scene.hh,v 1.7 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Scene  John Allison  19th July 1996.
@@ -32,7 +32,7 @@ class G4Scene {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4Scene& d);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d);
 
   enum {UNLIMITED = -1};
 
diff --git a/source/visualization/management/include/G4Scene.icc b/source/visualization/management/include/G4Scene.icc
index 2290174369..8313053def 100644
--- a/source/visualization/management/include/G4Scene.icc
+++ b/source/visualization/management/include/G4Scene.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Scene.icc,v 1.4.2.1 1999/12/07 20:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Scene.icc,v 1.5 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Scene data  John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4SceneHandlerList.hh b/source/visualization/management/include/G4SceneHandlerList.hh
index 07a2e22887..8087980ced 100644
--- a/source/visualization/management/include/G4SceneHandlerList.hh
+++ b/source/visualization/management/include/G4SceneHandlerList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SceneHandlerList.hh,v 1.2.2.1 1999/12/07 20:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SceneHandlerList.hh,v 1.3 1999/12/15 14:54:17 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  May 1996
diff --git a/source/visualization/management/include/G4SceneList.hh b/source/visualization/management/include/G4SceneList.hh
index d2592dd15d..b08000b401 100644
--- a/source/visualization/management/include/G4SceneList.hh
+++ b/source/visualization/management/include/G4SceneList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SceneList.hh,v 1.4.2.1 1999/12/07 20:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4SceneList.hh,v 1.5 1999/12/15 14:54:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  9th August 1998
diff --git a/source/visualization/management/include/G4VGraphicsSystem.hh b/source/visualization/management/include/G4VGraphicsSystem.hh
index f848b5ae78..c35edf75ef 100644
--- a/source/visualization/management/include/G4VGraphicsSystem.hh
+++ b/source/visualization/management/include/G4VGraphicsSystem.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGraphicsSystem.hh,v 1.5.2.1 1999/12/07 20:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGraphicsSystem.hh,v 1.6 1999/12/15 14:54:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -70,7 +70,7 @@ protected:
   Functionality  fFunctionality;
 };
 
-ostream& operator << (ostream& os, const G4VGraphicsSystem& gs);
+G4std::ostream& operator << (G4std::ostream& os, const G4VGraphicsSystem& gs);
 
 #include "G4VGraphicsSystem.icc"
 
diff --git a/source/visualization/management/include/G4VGraphicsSystem.icc b/source/visualization/management/include/G4VGraphicsSystem.icc
index f7be48f046..9a084f54aa 100644
--- a/source/visualization/management/include/G4VGraphicsSystem.icc
+++ b/source/visualization/management/include/G4VGraphicsSystem.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGraphicsSystem.icc,v 1.3.8.1 1999/12/07 20:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGraphicsSystem.icc,v 1.4 1999/12/15 14:54:18 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  27th March 1996
diff --git a/source/visualization/management/include/G4VSceneHandler.hh b/source/visualization/management/include/G4VSceneHandler.hh
index abecb7f3b9..a954a5c90b 100644
--- a/source/visualization/management/include/G4VSceneHandler.hh
+++ b/source/visualization/management/include/G4VSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSceneHandler.hh,v 1.8.2.1 1999/12/07 20:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSceneHandler.hh,v 1.9 1999/12/15 14:54:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  19th July 1996.
@@ -53,7 +53,7 @@ class G4VSceneHandler: public G4VGraphicsScene {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4VSceneHandler& s);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VSceneHandler& s);
 
   enum MarkerSizeType {world, screen};
 
diff --git a/source/visualization/management/include/G4VSceneHandler.icc b/source/visualization/management/include/G4VSceneHandler.icc
index a1f58e85f9..4452b7ad5e 100644
--- a/source/visualization/management/include/G4VSceneHandler.icc
+++ b/source/visualization/management/include/G4VSceneHandler.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSceneHandler.icc,v 1.6.6.1 1999/12/07 20:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSceneHandler.icc,v 1.7 1999/12/15 14:54:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4VViewer.hh b/source/visualization/management/include/G4VViewer.hh
index 5a3d6ed9fd..29856e1855 100644
--- a/source/visualization/management/include/G4VViewer.hh
+++ b/source/visualization/management/include/G4VViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VViewer.hh,v 1.4.2.1 1999/12/07 20:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VViewer.hh,v 1.5 1999/12/15 14:54:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -28,7 +28,7 @@ class G4VViewer {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4VViewer& v);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VViewer& v);
 
   G4VViewer (G4VSceneHandler& scene, G4int id, const G4String& name = "");
   virtual ~G4VViewer ();
diff --git a/source/visualization/management/include/G4VViewer.icc b/source/visualization/management/include/G4VViewer.icc
index b6295e34a6..989fe213bf 100644
--- a/source/visualization/management/include/G4VViewer.icc
+++ b/source/visualization/management/include/G4VViewer.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VViewer.icc,v 1.2.8.1 1999/12/07 20:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VViewer.icc,v 1.3 1999/12/15 14:54:19 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  30th December 1996
diff --git a/source/visualization/management/include/G4VVisCommand.hh b/source/visualization/management/include/G4VVisCommand.hh
index 1dab5bf758..e26bdb31df 100644
--- a/source/visualization/management/include/G4VVisCommand.hh
+++ b/source/visualization/management/include/G4VVisCommand.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisCommand.hh,v 1.4.4.1 1999/12/07 20:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisCommand.hh,v 1.6 1999/12/16 17:19:15 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
@@ -15,6 +15,7 @@
 #define G4VVISCOMMAND_HH
 
 #include "G4UImessenger.hh"
+#include "g4std/vector"
 
 class G4VisManager;
 class G4UIcommand;
@@ -28,18 +29,13 @@ public:
   static void SetVisManager (G4VisManager*);
 protected:
   static G4VisManager* fpVisManager;
-  // Commands which need to be accessed by other messengers...
-  static G4UIcmdWithAString* fpCommandSceneEdit;
-  static G4UIcmdWithAString* fpCommandSceneNotifyHandlers;
-  static G4UIcmdWithAString* fpCommandSceneRemove;
-  static G4UIcmdWithAString* fpCommandSceneSelect;
-  static G4UIcmdWithAString* fpCommandSceneHandlerAttach;
-  static G4UIcmdWithAString* fpCommandSceneHandlerRemove;
-  static G4UIcmdWithAString* fpCommandSceneHandlerSelect;
-  static G4UIcommand*        fpCommandViewerCreate;
-  static G4UIcmdWithAString* fpCommandViewerRemove;
-  static G4UIcmdWithAString* fpCommandViewerSelect;
-  static G4UIcmdWithAString* fpCommandViewerUpdate;
+  static  G4std::vector<G4UIcommand*> sceneNameCommands;
+  typedef G4std::vector<G4UIcommand*>::iterator sceneNameCommandsIterator; 
+  static  G4std::vector<G4UIcommand*> sceneHandlerNameCommands;
+  typedef G4std::vector<G4UIcommand*>::iterator
+    sceneHandlerNameCommandsIterator;
+  static  G4std::vector<G4UIcommand*> viewerNameCommands;
+  typedef G4std::vector<G4UIcommand*>::iterator viewerNameCommandsIterator; 
 };
 
 #include "G4VVisCommand.icc"
diff --git a/source/visualization/management/include/G4VVisCommand.icc b/source/visualization/management/include/G4VVisCommand.icc
index 279c6966aa..dc268995c9 100644
--- a/source/visualization/management/include/G4VVisCommand.icc
+++ b/source/visualization/management/include/G4VVisCommand.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisCommand.icc,v 1.2.8.1 1999/12/07 20:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisCommand.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
diff --git a/source/visualization/management/include/G4ViewParameters.hh b/source/visualization/management/include/G4ViewParameters.hh
index ee09c62808..260aeba649 100644
--- a/source/visualization/management/include/G4ViewParameters.hh
+++ b/source/visualization/management/include/G4ViewParameters.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ViewParameters.hh,v 1.5.2.1 1999/12/07 20:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ViewParameters.hh,v 1.6 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -74,7 +74,7 @@ class G4ViewParameters {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4ViewParameters& v);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v);
 
   enum DrawingStyle {
     wireframe,  // Draw edges    - no hidden line removal.
diff --git a/source/visualization/management/include/G4ViewParameters.icc b/source/visualization/management/include/G4ViewParameters.icc
index 7496b484f6..b390f5d6ae 100644
--- a/source/visualization/management/include/G4ViewParameters.icc
+++ b/source/visualization/management/include/G4ViewParameters.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ViewParameters.icc,v 1.2.8.1 1999/12/07 20:53:53 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ViewParameters.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  20th October 1996
diff --git a/source/visualization/management/include/G4ViewerList.hh b/source/visualization/management/include/G4ViewerList.hh
index 1c408d2259..2cd99a1540 100644
--- a/source/visualization/management/include/G4ViewerList.hh
+++ b/source/visualization/management/include/G4ViewerList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ViewerList.hh,v 1.2.2.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ViewerList.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  May 1996
diff --git a/source/visualization/management/include/G4VisCommandTemplates.hh b/source/visualization/management/include/G4VisCommandTemplates.hh
index a84266dca3..36a6d779c3 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.hh
+++ b/source/visualization/management/include/G4VisCommandTemplates.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandTemplates.hh,v 1.2.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandTemplates.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Visualization Command Messenger Templates.
diff --git a/source/visualization/management/include/G4VisCommandTemplates.icc b/source/visualization/management/include/G4VisCommandTemplates.icc
index 59fa76b142..83a5d96630 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.icc
+++ b/source/visualization/management/include/G4VisCommandTemplates.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandTemplates.icc,v 1.2.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandTemplates.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Command Messenger Templates.
@@ -45,7 +45,7 @@ void G4VisCommandMessenger <T> ::SetNewValue
   default: break;
   }
   G4cout << "Current value of " << fCommand.GetValueName ()
-       << " is " << fCommand.GetValue () << endl;
+       << " is " << fCommand.GetValue () << G4endl;
 }
 ************************************/
 
@@ -114,5 +114,5 @@ void G4VisButtonCommandMessenger <tButtonCommand> ::SetNewValue
   default: break;
   }
   G4cout << "Current value of " << fButtonCommand.GetValueName ()
-       << " is " << fButtonCommand.GetValue () << endl;
+       << " is " << fButtonCommand.GetValue () << G4endl;
 }
diff --git a/source/visualization/management/include/G4VisCommandsCamera.hh b/source/visualization/management/include/G4VisCommandsCamera.hh
index bd42cdbf43..d72e0ef2a5 100644
--- a/source/visualization/management/include/G4VisCommandsCamera.hh
+++ b/source/visualization/management/include/G4VisCommandsCamera.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCamera.hh,v 1.2.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCamera.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/camera/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCameraMessengers.hh b/source/visualization/management/include/G4VisCommandsCameraMessengers.hh
index aaa2a6c603..aff56ed8d9 100644
--- a/source/visualization/management/include/G4VisCommandsCameraMessengers.hh
+++ b/source/visualization/management/include/G4VisCommandsCameraMessengers.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCameraMessengers.hh,v 1.2.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCameraMessengers.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Messengers for /vis~/camera commands - John Allison  6th April 1998.
diff --git a/source/visualization/management/include/G4VisCommandsClear.hh b/source/visualization/management/include/G4VisCommandsClear.hh
index c918773e18..efd0cb9859 100644
--- a/source/visualization/management/include/G4VisCommandsClear.hh
+++ b/source/visualization/management/include/G4VisCommandsClear.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsClear.hh,v 1.3.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsClear.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/clear/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCopy.hh b/source/visualization/management/include/G4VisCommandsCopy.hh
index 2b995a2778..b6f7f87854 100644
--- a/source/visualization/management/include/G4VisCommandsCopy.hh
+++ b/source/visualization/management/include/G4VisCommandsCopy.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCopy.hh,v 1.3.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCopy.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/copy/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCreateScene.hh b/source/visualization/management/include/G4VisCommandsCreateScene.hh
index 89bd3f4016..0285ff9f79 100644
--- a/source/visualization/management/include/G4VisCommandsCreateScene.hh
+++ b/source/visualization/management/include/G4VisCommandsCreateScene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCreateScene.hh,v 1.2.8.1 1999/12/07 20:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCreateScene.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/create_scene/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCreateView.hh b/source/visualization/management/include/G4VisCommandsCreateView.hh
index fc30cbc6ce..98e6ab9574 100644
--- a/source/visualization/management/include/G4VisCommandsCreateView.hh
+++ b/source/visualization/management/include/G4VisCommandsCreateView.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCreateView.hh,v 1.3.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCreateView.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/create_view/ commands
diff --git a/source/visualization/management/include/G4VisCommandsDelete.hh b/source/visualization/management/include/G4VisCommandsDelete.hh
index 7bf71be777..ca1f5b07a5 100644
--- a/source/visualization/management/include/G4VisCommandsDelete.hh
+++ b/source/visualization/management/include/G4VisCommandsDelete.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsDelete.hh,v 1.3.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsDelete.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/delete/ commands
diff --git a/source/visualization/management/include/G4VisCommandsDraw.hh b/source/visualization/management/include/G4VisCommandsDraw.hh
index 3b90c14353..09c2ae3bc0 100644
--- a/source/visualization/management/include/G4VisCommandsDraw.hh
+++ b/source/visualization/management/include/G4VisCommandsDraw.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsDraw.hh,v 1.2.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsDraw.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/draw/ commands
diff --git a/source/visualization/management/include/G4VisCommandsLights.hh b/source/visualization/management/include/G4VisCommandsLights.hh
index e2b2f97905..5467bc330b 100644
--- a/source/visualization/management/include/G4VisCommandsLights.hh
+++ b/source/visualization/management/include/G4VisCommandsLights.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsLights.hh,v 1.3.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsLights.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/lights/ commands
@@ -56,7 +56,7 @@ public:
       // Recalculate projection matrices, etc.
       pView -> SetView ();
     }
-    G4cout << "Issue Draw or refresh to see effect." << endl;
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 };
 
diff --git a/source/visualization/management/include/G4VisCommandsPrint.hh b/source/visualization/management/include/G4VisCommandsPrint.hh
index f1eb6af75c..dbf4b8dbde 100644
--- a/source/visualization/management/include/G4VisCommandsPrint.hh
+++ b/source/visualization/management/include/G4VisCommandsPrint.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsPrint.hh,v 1.2.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsPrint.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/print/ commands
diff --git a/source/visualization/management/include/G4VisCommandsRefresh.hh b/source/visualization/management/include/G4VisCommandsRefresh.hh
index 1fceea5376..57f20c8f81 100644
--- a/source/visualization/management/include/G4VisCommandsRefresh.hh
+++ b/source/visualization/management/include/G4VisCommandsRefresh.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsRefresh.hh,v 1.2.8.1 1999/12/07 20:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsRefresh.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/refresh/ commands
diff --git a/source/visualization/management/include/G4VisCommandsScene.hh b/source/visualization/management/include/G4VisCommandsScene.hh
index 8f111c4594..87dae00329 100644
--- a/source/visualization/management/include/G4VisCommandsScene.hh
+++ b/source/visualization/management/include/G4VisCommandsScene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsScene.hh,v 1.7.4.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsScene.hh,v 1.8 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneAdd.hh b/source/visualization/management/include/G4VisCommandsSceneAdd.hh
index e5c056d5f3..827b8f521e 100644
--- a/source/visualization/management/include/G4VisCommandsSceneAdd.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneAdd.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneAdd.hh,v 1.3.6.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneAdd.hh,v 1.4 1999/12/15 14:54:21 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneHandler.hh b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
index 87f1197ad9..4c793b9c61 100644
--- a/source/visualization/management/include/G4VisCommandsSceneHandler.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneHandler.hh,v 1.3.8.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneHandler.hh,v 1.5 1999/12/16 17:19:16 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
@@ -25,8 +25,6 @@ public:
   ~G4VVisCommandSceneHandler ();
 protected:
   void UpdateCandidateLists ();
-  static G4String fSceneHandlerNameList;
-  // member so that it has long life - static because shared between objects.
 };
 
 class G4VisCommandSceneHandlerAttach: public G4VVisCommandSceneHandler {
diff --git a/source/visualization/management/include/G4VisCommandsSceneInclude.hh b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
index a42f2257de..7f96d8e913 100644
--- a/source/visualization/management/include/G4VisCommandsSceneInclude.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneInclude.hh,v 1.2.8.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneInclude.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSet.hh b/source/visualization/management/include/G4VisCommandsSet.hh
index 13e69ab9b4..df283f8c7d 100644
--- a/source/visualization/management/include/G4VisCommandsSet.hh
+++ b/source/visualization/management/include/G4VisCommandsSet.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSet.hh,v 1.3.8.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSet.hh,v 1.4 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/set/ commands
@@ -56,7 +56,7 @@ public:
       // Recalculate projection matrices, etc.
       pView -> SetView ();
     }
-    G4cout << "Issue Draw or refresh to see effect." << endl;
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 };
 
@@ -79,7 +79,7 @@ public:
     G4cout << "\nNote: this is only effective in surface drawing style,"
       "\nand then only if the volumes are visible and opaque, and then"
       "\nonly if no sections or cutways are in operation."
-	 << endl;
+	 << G4endl;
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     pVMan -> SetCurrentViewParameters ().SetCullingCovered (value);
     G4VViewer* pView = pVMan -> GetCurrentViewer ();
@@ -89,7 +89,7 @@ public:
       // Recalculate projection matrices, etc.
       pView -> SetView ();
     }
-    G4cout << "Issue Draw or refresh to see effect." << endl;
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 };
 
@@ -118,7 +118,7 @@ public:
       // Recalculate projection matrices, etc.
       pView -> SetView ();
     }
-    G4cout << "Issue Draw or refresh to see effect." << endl;
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 };
 
diff --git a/source/visualization/management/include/G4VisCommandsShow.hh b/source/visualization/management/include/G4VisCommandsShow.hh
index 67ebe1556b..39ca41177b 100644
--- a/source/visualization/management/include/G4VisCommandsShow.hh
+++ b/source/visualization/management/include/G4VisCommandsShow.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsShow.hh,v 1.2.8.1 1999/12/07 20:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsShow.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // /vis~/show/ commands
diff --git a/source/visualization/management/include/G4VisCommandsViewer.hh b/source/visualization/management/include/G4VisCommandsViewer.hh
index f928f0e1b1..789a27ddc9 100644
--- a/source/visualization/management/include/G4VisCommandsViewer.hh
+++ b/source/visualization/management/include/G4VisCommandsViewer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsViewer.hh,v 1.4.4.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsViewer.hh,v 1.7 2000/01/11 17:22:29 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
@@ -26,8 +26,6 @@ public:
 protected:
   G4String ShortName (const G4String &);
   void UpdateCandidateLists ();
-  static G4String fViewerNameList;
-  // member so that it has long life - static because shared between objects.
 };
 
 class G4VisCommandViewerCreate: public G4VVisCommandViewer {
@@ -54,6 +52,17 @@ private:
   G4UIcommand* fpCommand;
 };
 
+class G4VisCommandViewerRefresh: public G4VVisCommandViewer {
+public:
+  // Uses compiler defaults for copy constructor and assignment.
+  G4VisCommandViewerRefresh ();
+  ~G4VisCommandViewerRefresh ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4UIcmdWithAString* fpCommand;
+};
+
 class G4VisCommandViewerRemove: public G4VVisCommandViewer {
 public:
   // Uses compiler defaults for copy constructor and assignment.
@@ -76,15 +85,16 @@ private:
   G4UIcmdWithAString* fpCommand;
 };
 
-class G4VisCommandViewerUpdate: public G4VVisCommandViewer {
+class G4VisCommandViewerShow: public G4VVisCommandViewer {
 public:
   // Uses compiler defaults for copy constructor and assignment.
-  G4VisCommandViewerUpdate ();
-  ~G4VisCommandViewerUpdate ();
+  G4VisCommandViewerShow ();
+  ~G4VisCommandViewerShow ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
   G4UIcmdWithAString* fpCommand;
+  G4UIcmdWithAString* fpCommand1;
 };
 
 #endif
diff --git a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
index 8116bad96d..307affee3d 100644
--- a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.2.8.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VISFEATURESOFDAWNFILE_HH
 #define G4VISFEATURESOFDAWNFILE_HH
diff --git a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
index 0246c58004..1f2a41ddc0 100644
--- a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.2.8.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
index 28812e6f25..fabb438f34 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfOpenGL.hh,v 1.2.8.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfOpenGL.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
index ded3f0451b..e547706cad 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfOpenInventor.hh,v 1.2.8.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfOpenInventor.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisManMessenger.hh b/source/visualization/management/include/G4VisManMessenger.hh
index b7be872858..929056c2af 100644
--- a/source/visualization/management/include/G4VisManMessenger.hh
+++ b/source/visualization/management/include/G4VisManMessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessenger.hh,v 1.3.2.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessenger.hh,v 1.4 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
diff --git a/source/visualization/management/include/G4VisManager.hh b/source/visualization/management/include/G4VisManager.hh
index 2ea04304bf..356afb0bf8 100644
--- a/source/visualization/management/include/G4VisManager.hh
+++ b/source/visualization/management/include/G4VisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManager.hh,v 1.9.2.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManager.hh,v 1.11 1999/12/15 18:27:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -72,6 +72,7 @@
 #include "G4UImessenger.hh"
 
 #include "g4rw/tpordvec.h"
+#include "g4std/iostream"
 
 class G4VisManMessenger;
 class G4VPhysicalVolume;
@@ -102,11 +103,11 @@ class G4VisManager: public G4VVisManager {
   friend class G4VSceneHandler;
   friend class G4VViewer;
 
-  friend class ostream & operator <<
-  (class ostream &, const class G4VGraphicsSystem &);
+  friend G4std::ostream & operator <<
+  (G4std::ostream &, const G4VGraphicsSystem &);
 
-  friend class ostream & operator <<
-  (class ostream &, const class G4VSceneHandler &);
+  friend G4std::ostream & operator <<
+  (G4std::ostream &, const G4VSceneHandler &);
 
   friend class G4VisStateDependent;
 
diff --git a/source/visualization/management/include/G4VisManager.icc b/source/visualization/management/include/G4VisManager.icc
index 3d16e9ccc2..dfeeba0867 100644
--- a/source/visualization/management/include/G4VisManager.icc
+++ b/source/visualization/management/include/G4VisManager.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManager.icc,v 1.4.8.1 1999/12/07 20:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManager.icc,v 1.5 1999/12/15 14:54:22 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager - John Allison 02/Jan/1996.
diff --git a/source/visualization/management/include/G4VisStateDependent.hh b/source/visualization/management/include/G4VisStateDependent.hh
index 40630b97b7..9f023e8429 100644
--- a/source/visualization/management/include/G4VisStateDependent.hh
+++ b/source/visualization/management/include/G4VisStateDependent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisStateDependent.hh,v 1.2.2.1 1999/12/07 20:53:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisStateDependent.hh,v 1.3 1999/12/15 14:54:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // A "state dependent" service class for G4VisManager.
 // John Allison  29th November 1999
diff --git a/source/visualization/management/include/G4VisToOldVisCommands.hh b/source/visualization/management/include/G4VisToOldVisCommands.hh
index 80118fa5db..b254f47ac2 100644
--- a/source/visualization/management/include/G4VisToOldVisCommands.hh
+++ b/source/visualization/management/include/G4VisToOldVisCommands.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisToOldVisCommands.hh,v 1.3.2.1 1999/12/07 20:53:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisToOldVisCommands.hh,v 1.4 1999/12/15 14:54:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
diff --git a/source/visualization/management/include/MyVisManager.cc b/source/visualization/management/include/MyVisManager.cc
index 8cbebfe6ae..3521403620 100644
--- a/source/visualization/management/include/MyVisManager.cc
+++ b/source/visualization/management/include/MyVisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: MyVisManager.cc,v 1.3.8.1 1999/12/07 20:53:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: MyVisManager.cc,v 1.4 1999/12/15 14:54:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
@@ -114,7 +114,7 @@ void MyVisManager::RegisterGraphicsSystems () {
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
-	 << endl;
+	 << G4endl;
     PrintAvailableGraphicsSystems ();
   }
 }
diff --git a/source/visualization/management/include/MyVisManager.hh b/source/visualization/management/include/MyVisManager.hh
index 51c2acd897..c13af70cf6 100644
--- a/source/visualization/management/include/MyVisManager.hh
+++ b/source/visualization/management/include/MyVisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: MyVisManager.hh,v 1.3.2.1 1999/12/07 20:53:58 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: MyVisManager.hh,v 1.4 1999/12/15 14:54:23 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/source/visualization/management/src/G4Scene.cc b/source/visualization/management/src/G4Scene.cc
index 8241ec5a7e..cdb0bef395 100644
--- a/source/visualization/management/src/G4Scene.cc
+++ b/source/visualization/management/src/G4Scene.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Scene.cc,v 1.4.4.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Scene.cc,v 1.5 1999/12/15 14:54:24 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Scene data  John Allison  19th July 1996.
@@ -37,7 +37,7 @@ G4bool G4Scene::AddRunDurationModel (G4VModel* pModel) {
 	   << "\"\n  is already in the run-duration list of scene \""
 	   << fName
 	   << "\"."
-	   << endl;
+	   << G4endl;
     return false;
   }
   fRunDurationModelList.append (pModel);
@@ -72,7 +72,7 @@ G4bool G4Scene::AddWorldIfEmpty () {
 	  " invisible, e.g.,"
 	  "\n  myWorldLogicalVol ->"
 	  " SetVisAttributes (G4VisAttributes::Invisible);"
-	       << endl;
+	       << G4endl;
       }
       successful = AddRunDurationModel (new G4PhysicalVolumeModel (pWorld));
       // Note: default depth and no modeling parameters.
@@ -80,7 +80,7 @@ G4bool G4Scene::AddWorldIfEmpty () {
 	G4cout <<
 	  "G4Scene::AddWorldIfEmpty: The scene was empty,"
 	  "\n   \"world\" has been added.";
-	G4cout << endl;
+	G4cout << G4endl;
       }
     }
   }
@@ -99,7 +99,7 @@ G4bool G4Scene::AddEndOfEventModel (G4VModel* pModel) {
 	   << "\"\n  is already in the run-duration list of scene \""
 	   << fName
 	   << "\"."
-	   << endl;
+	   << G4endl;
     return false;
   }
   fEndOfEventModelList.append (pModel);
@@ -111,7 +111,7 @@ void G4Scene::Clear () {
   fEndOfEventModelList.clearAndDestroy ();
 }
 
-ostream& operator << (ostream& os, const G4Scene& d) {
+G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d) {
 
   os << "Scene data:";
 
diff --git a/source/visualization/management/src/G4VGraphicsSystem.cc b/source/visualization/management/src/G4VGraphicsSystem.cc
index 44882eb5f5..0d07edb3f1 100644
--- a/source/visualization/management/src/G4VGraphicsSystem.cc
+++ b/source/visualization/management/src/G4VGraphicsSystem.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGraphicsSystem.cc,v 1.4.8.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VGraphicsSystem.cc,v 1.5 1999/12/15 14:54:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -42,7 +42,7 @@ G4VGraphicsSystem::G4VGraphicsSystem (const G4String& name,
   fDescription (description),
   fFunctionality (f) {}
 
-ostream& operator << (ostream& os, const G4VGraphicsSystem& gs) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VGraphicsSystem& gs) {
   G4VisManager* pVMan = G4VisManager::GetInstance ();
   const G4SceneHandlerList& scenes = pVMan -> GetAvailableSceneHandlers ();
   os << "Graphics System: " << gs.GetName ();
diff --git a/source/visualization/management/src/G4VSceneHandler.cc b/source/visualization/management/src/G4VSceneHandler.cc
index 5cd69110b4..e83a69c982 100644
--- a/source/visualization/management/src/G4VSceneHandler.cc
+++ b/source/visualization/management/src/G4VSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSceneHandler.cc,v 1.7.2.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VSceneHandler.cc,v 1.8 1999/12/15 14:54:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -15,11 +15,7 @@
 #include "G4VSceneHandler.hh"
 
 #include "G4ios.hh"
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include "G4VisManager.hh"
 #include "G4VGraphicsSystem.hh"
@@ -59,8 +55,8 @@ G4VSceneHandler::G4VSceneHandler (G4VGraphicsSystem& system, G4int id, const G4S
   fpScene = pVMan -> GetCurrentScene ();
   if (name == "") {
     char charname [50];
-    ostrstream ost (charname, 50);
-    ost << fSystem.GetName () << '-' << fSceneId << ends;
+    G4std::ostrstream ost (charname, 50);
+    ost << fSystem.GetName () << '-' << fSceneId << G4std::ends;
     fName = charname;
   }
   else {
@@ -239,8 +235,8 @@ void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) {
       break;
     }
     else {
-      G4cerr << "NURBS not available for " << solid.GetName () << endl;
-      G4cerr << "Trying polyhedron." << endl;
+      G4cerr << "NURBS not available for " << solid.GetName () << G4endl;
+      G4cerr << "Trying polyhedron." << G4endl;
     }
     // Dropping through to polyhedron...
   case G4ModelingParameters::polyhedron:
@@ -258,7 +254,7 @@ void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) {
     else {
       G4cerr << "Polyhedron not available for " << solid.GetName ()
 	   <<".\nThis means it cannot be visualized on most systems."
-	"\nContact the Visualization Coordinator." << endl;
+	"\nContact the Visualization Coordinator." << G4endl;
     }
     break;
   case G4ModelingParameters::hierarchy:
@@ -266,7 +262,7 @@ void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) {
 	 << GetModel () -> GetCurrentTag ()
 	 << ", depth "
 	 << fCurrentDepth
-	 << endl;
+	 << G4endl;
     break;
   }
   EndPrimitives ();
@@ -285,7 +281,7 @@ void G4VSceneHandler::ProcessScene (G4VViewer& view) {
     fpScene -> GetRunDurationModelList ();
 
   if (runDurationModelList.entries ()) {
-    G4cout << "Traversing scene data..." << endl;
+    G4cout << "Traversing scene data..." << G4endl;
     G4ModelingParameters* pMP = CreateModelingParameters ();
     for (int i = 0; i < runDurationModelList.entries (); i++) {
       G4VModel* pModel = runDurationModelList[i];
@@ -312,7 +308,7 @@ void G4VSceneHandler::ProcessScene (G4VViewer& view) {
     SetModel (0);  // Flags invalid model.
   }
   else {
-    G4cerr << "No run-duration models in scene data." << endl;
+    G4cerr << "No run-duration models in scene data." << G4endl;
   }
 
   fReadyForTransients = true;
@@ -461,7 +457,7 @@ G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker,
   return size;
 }
 
-ostream& operator << (ostream& os, const G4VSceneHandler& s) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VSceneHandler& s) {
 
   G4VisManager* pVMan = G4VisManager::GetInstance ();
 
diff --git a/source/visualization/management/src/G4VViewer.cc b/source/visualization/management/src/G4VViewer.cc
index 993bb25a7f..90ec855b6f 100644
--- a/source/visualization/management/src/G4VViewer.cc
+++ b/source/visualization/management/src/G4VViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VViewer.cc,v 1.4.4.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VViewer.cc,v 1.5 1999/12/15 14:54:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -15,11 +15,7 @@
 #include "G4VViewer.hh"
 
 #include "G4ios.hh"
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include "G4VisManager.hh"
 #include "G4VGraphicsSystem.hh"
@@ -38,8 +34,8 @@ fNeedKernelVisit (true)
   fVP = pVMan -> GetCurrentViewParameters ();
   if (name == "") {
     char charname [50];
-    ostrstream ost (charname, 50);
-    ost << fSceneHandler.GetName () << '-' << fViewId << ends;
+    G4std::ostrstream ost (charname, 50);
+    ost << fSceneHandler.GetName () << '-' << fViewId << G4std::ends;
     fName = charname;
   }
   else {
@@ -91,7 +87,7 @@ void G4VViewer::SetViewParameters (const G4ViewParameters& vp) {
   fModified = true;
 }
 
-ostream& operator << (ostream& os, const G4VViewer& v) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VViewer& v) {
   os << "View " << v.fName << ":\n";
   os << v.fVP;
   return os;
diff --git a/source/visualization/management/src/G4VVisCommand.cc b/source/visualization/management/src/G4VVisCommand.cc
index c82951a938..4bb2595cd3 100644
--- a/source/visualization/management/src/G4VVisCommand.cc
+++ b/source/visualization/management/src/G4VVisCommand.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisCommand.cc,v 1.4.4.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VVisCommand.cc,v 1.6 1999/12/16 17:19:31 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
@@ -17,24 +17,8 @@ G4VVisCommand::~G4VVisCommand () {}
 
 G4VisManager* G4VVisCommand::fpVisManager = 0;
 
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneEdit = 0;
+G4std::vector <G4UIcommand*> G4VVisCommand::sceneNameCommands;
 
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneNotifyHandlers = 0;
+G4std::vector <G4UIcommand*> G4VVisCommand::sceneHandlerNameCommands;
 
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneRemove = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneSelect = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneHandlerAttach = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneHandlerRemove = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandSceneHandlerSelect = 0;
-
-G4UIcommand*        G4VVisCommand::fpCommandViewerCreate = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandViewerRemove = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandViewerSelect = 0;
-
-G4UIcmdWithAString* G4VVisCommand::fpCommandViewerUpdate = 0;
+G4std::vector <G4UIcommand*> G4VVisCommand::viewerNameCommands;
diff --git a/source/visualization/management/src/G4ViewParameters.cc b/source/visualization/management/src/G4ViewParameters.cc
index 179514ff0a..f7873d6f50 100644
--- a/source/visualization/management/src/G4ViewParameters.cc
+++ b/source/visualization/management/src/G4ViewParameters.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ViewParameters.cc,v 1.4.8.1 1999/12/07 20:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ViewParameters.cc,v 1.5 1999/12/15 14:54:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -115,7 +115,7 @@ void G4ViewParameters::AddCutawayPlane (const G4Plane3D& cutawayPlane) {
     fCutawayPlanes.insert (cutawayPlane);
   }
   else {
-    G4cerr << "A maximum of 3 cutaway planes supported." << endl;
+    G4cerr << "A maximum of 3 cutaway planes supported." << G4endl;
   }
 }
 
@@ -128,14 +128,14 @@ void G4ViewParameters::SetVisibleDensity (G4double visibleDensity) {
   const G4double reasonableMaximum = 10.0 * g / cm3;
   if (visibleDensity < 0) {
     G4cout << "G4ViewParameters::SetVisibleDensity: attempt to set negative "
-      "density - ignored." << endl;
+      "density - ignored." << G4endl;
   }
   else {
     if (fVisibleDensity > reasonableMaximum) {
       G4cout << "G4ViewParameters::SetVisibleDensity: density > "
 	   << reasonableMaximum
 	   << " g / cm3 - did you mean this?"
-	   << endl;
+	   << G4endl;
     }
     fVisibleDensity = visibleDensity;
   }
@@ -147,7 +147,7 @@ void G4ViewParameters::SetNoOfSides (G4int nSides) {
     nSides = nSidesMin;
     G4cout << "G4ViewParameters::SetNoOfSides: attempt to set the"
       "\nnumber of sides per circle < " << nSidesMin
-	 << "; forced to" << nSides << endl;
+	 << "; forced to" << nSides << G4endl;
   }
   fNoOfSides = nSides;
 }
@@ -216,32 +216,32 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const {
       (fGlobalMarkerScale    != v.fGlobalMarkerScale)    ||
       (fMarkerNotHidden      != v.fMarkerNotHidden)      ||
       (fWindowSizeHintY      != v.fWindowSizeHintY))
-    G4cout << "Difference in 1st batch." << endl;
+    G4cout << "Difference in 1st batch." << G4endl;
 
   if (fSection) {
     if (!(fSectionPlane == v.fSectionPlane))
-      G4cout << "Difference in section planes batch." << endl;
+      G4cout << "Difference in section planes batch." << G4endl;
   }
 
   if (fCutaway) {
     if (fCutawayPlanes.entries () != v.fCutawayPlanes.entries ()) {
-      G4cout << "Difference in no of cutaway planes." << endl;
+      G4cout << "Difference in no of cutaway planes." << G4endl;
     }
     else {
       for (int i = 0; i < fCutawayPlanes.entries (); i++) {
 	if (!(fCutawayPlanes (i) == v.fCutawayPlanes (i)))
-	  G4cout << "Difference in cutaway plane no. " << i << endl;
+	  G4cout << "Difference in cutaway plane no. " << i << G4endl;
       }
     }
   }
 
   if (fExplode) {
     if (fExplodeFactor != v.fExplodeFactor)
-      G4cout << "Difference in explode factor." << endl;
+      G4cout << "Difference in explode factor." << G4endl;
   }
 }
 
-ostream& operator << (ostream& os, const G4ViewParameters& v) {
+G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
   os << "View parameters and options:";
 
   os << "\n  Drawing style: ";
diff --git a/source/visualization/management/src/G4VisCommandTemplates.cc b/source/visualization/management/src/G4VisCommandTemplates.cc
index b353f896aa..c2cc1cca6e 100644
--- a/source/visualization/management/src/G4VisCommandTemplates.cc
+++ b/source/visualization/management/src/G4VisCommandTemplates.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandTemplates.cc,v 1.3.2.1 1999/12/07 20:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandTemplates.cc,v 1.4 1999/12/15 14:54:25 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Visualization Command Messenger Template private functions.
@@ -46,7 +46,7 @@ G4int G4VisButtonCommandMessengerInterpret (G4String newValues) {
       choice.compareTo ("true", G4String::ignoreCase) == 0) iSelector = 1;
   if (iSelector < 0 || choice.isNull ()) {
     G4cout << "Choice not recognised."
-      "\n  Choice is 0 (or off or false) or 1 (or on or true)." << endl;;
+      "\n  Choice is 0 (or off or false) or 1 (or on or true)." << G4endl;;
   }
   return iSelector;
 }
diff --git a/source/visualization/management/src/G4VisCommandsCamera.cc b/source/visualization/management/src/G4VisCommandsCamera.cc
index e191434d16..0b5ef82e26 100644
--- a/source/visualization/management/src/G4VisCommandsCamera.cc
+++ b/source/visualization/management/src/G4VisCommandsCamera.cc
@@ -5,13 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCamera.cc,v 1.3.8.1 1999/12/07 20:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCamera.cc,v 1.5 2000/01/11 17:23:25 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
 #include "G4VisCommandsCamera.hh"
 
+#include "G4UnitsTable.hh"
+
 void G4VisCommandCameraReset::SetValue () {
   G4VisManager* pVMan = G4VisManager::GetInstance ();
   if (pVMan -> IsValidView ()) {
@@ -22,16 +24,20 @@ void G4VisCommandCameraReset::SetValue () {
     vp.SetDolly (0.);
     vp.SetViewpointDirection (G4Vector3D (0., 0., 1.));
     vp.SetUpVector (G4Vector3D (0., 1., 0.));
-    if (pVMan -> GetVerboseLevel () > 0) {
-      G4cout << "Target point reset";
-      G4cout << "\nZoom factor reset to 1.";
-      G4cout << "\nDolly distance reset to 0.";
-      G4cout << "\nViewpoint direction reset to +z.";
-      G4cout << "\nUp vector set to +y.";
-      G4cout << endl;
-      if (pVMan -> GetVerboseLevel () > 1) {
-	pVMan -> PrintCurrentView ();
-      }
+    G4cout << "Target point reset to centre of scene, ("
+	   << G4BestUnit (pScene -> GetStandardTargetPoint ().x(), "Length")
+	   << ", "
+	   << G4BestUnit (pScene -> GetStandardTargetPoint ().y(), "Length")
+	   << ", "
+	   << G4BestUnit (pScene -> GetStandardTargetPoint ().z(), "Length")
+	   << ")";
+    G4cout << "\nZoom factor reset to 1.";
+    G4cout << "\nDolly distance reset to 0.";
+    G4cout << "\nViewpoint direction reset to +z.";
+    G4cout << "\nUp vector reset to +y.";
+    G4cout << G4endl;
+    if (pVMan -> GetVerboseLevel () > 1) {
+      pVMan -> PrintCurrentView ();
     }
   }
 }
diff --git a/source/visualization/management/src/G4VisCommandsCameraMessengers.cc b/source/visualization/management/src/G4VisCommandsCameraMessengers.cc
index 686d2ccc65..b41f8d3cbf 100644
--- a/source/visualization/management/src/G4VisCommandsCameraMessengers.cc
+++ b/source/visualization/management/src/G4VisCommandsCameraMessengers.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCameraMessengers.cc,v 1.2.8.1 1999/12/07 20:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsCameraMessengers.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Messengers for /vis~/camera commands - John Allison  6th April 1998.
diff --git a/source/visualization/management/src/G4VisCommandsScene.cc b/source/visualization/management/src/G4VisCommandsScene.cc
index 5c254f045c..fde860ffcc 100644
--- a/source/visualization/management/src/G4VisCommandsScene.cc
+++ b/source/visualization/management/src/G4VisCommandsScene.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsScene.cc,v 1.9.4.1 1999/12/07 20:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsScene.cc,v 1.11 1999/12/16 17:19:32 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -20,11 +20,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4VVisCommandScene::G4VVisCommandScene () {}
 
@@ -46,30 +42,9 @@ void G4VVisCommandScene::UpdateCandidateLists () {
     nameList += sceneList [iScene] -> GetName () + " ";
   }
   nameList = nameList.strip ();
-
-  if (fpCommandSceneEdit) {
-    fpCommandSceneEdit -> GetParameter (0) ->
-      SetParameterCandidates (nameList);
-  }
-
-  if (fpCommandSceneNotifyHandlers) {
-    fpCommandSceneNotifyHandlers -> GetParameter (0) ->
-      SetParameterCandidates (nameList);
-  }
-
-  if (fpCommandSceneRemove) {
-    fpCommandSceneRemove -> GetParameter (0) ->
-      SetParameterCandidates (nameList);
-  }
-
-  if (fpCommandSceneSelect) {
-    fpCommandSceneSelect -> GetParameter (0) ->
-      SetParameterCandidates (nameList);
-  }
-
-  if (fpCommandSceneHandlerAttach) {
-    fpCommandSceneHandlerAttach -> GetParameter (0) ->
-      SetParameterCandidates (nameList);
+  sceneNameCommandsIterator i;
+  for (i = sceneNameCommands.begin (); i != sceneNameCommands.end (); ++i) {
+    (*i)->GetParameter (0) -> SetParameterCandidates (nameList);
   }
 }
 
@@ -97,7 +72,7 @@ G4VisCommandSceneCreate::G4VisCommandSceneCreate (): fId (0) {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandSceneEdit = fpCommand;
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneCreate::~G4VisCommandSceneCreate () {
@@ -106,8 +81,8 @@ G4VisCommandSceneCreate::~G4VisCommandSceneCreate () {
 
 G4String G4VisCommandSceneCreate::NextName () {
   char nextName [20];
-  ostrstream ost (nextName, 20);
-  ost << "scene-" << fId  << ends;
+  G4std::ostrstream ost (nextName, 20);
+  ost << "scene-" << fId  << G4std::ends;
   return nextName;
 }
 
@@ -131,7 +106,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand* command,
     if (sceneList [iScene] -> GetName () == newName) break;
   }
   if (iScene < nScenes) {
-    G4cout << "Scene \"" << newName << "\" already exists." << endl;
+    G4cout << "Scene \"" << newName << "\" already exists." << G4endl;
   }
   else {
 
@@ -139,7 +114,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand* command,
     // Adds empty scene data object to list.
 
     UpdateVisManagerScene (newName);
-    G4cout << "New empty scene \"" << newName << "\" created." << endl;
+    G4cout << "New empty scene \"" << newName << "\" created." << G4endl;
 
     UpdateCandidateLists ();
   }
@@ -156,6 +131,7 @@ G4VisCommandSceneEdit::G4VisCommandSceneEdit () {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = true,
 				 currentAsDefault = true);
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneEdit::~G4VisCommandSceneEdit () {
@@ -169,7 +145,7 @@ G4String G4VisCommandSceneEdit::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandSceneEdit::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String sceneName;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> sceneName;
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
@@ -183,18 +159,18 @@ void G4VisCommandSceneEdit::SetNewValue (G4UIcommand* command,
     G4cout << "G4VisCommandSceneEdit::SetNewValue: Scene \""
 	   << sceneName << "\" not found."
       "\n  /vis/scene/list to see scenes."
-	   << endl;
+	   << G4endl;
     return;
   }
   else {
-    G4cout << "Scene \"" << sceneName << "\" contains:" << endl;
+    G4cout << "Scene \"" << sceneName << "\" contains:" << G4endl;
     G4String uiCommand ("/vis/scene/list ");
     uiCommand += sceneName;
     uiCommand += " 1";
     G4UImanager::GetUIpointer () -> ApplyCommand (uiCommand);
     G4cout <<
       "(YOU CAN DO NOTHING YET - /vis/scene/edit FACILITY IN PREPARATION."
-	   << endl;
+	   << G4endl;
   }
 
   UpdateVisManagerScene (sceneName);
@@ -220,7 +196,7 @@ G4VisCommandSceneList::G4VisCommandSceneList () {
 				 omitable = true);
   parameter -> SetCurrentAsDefault (false);
   parameter -> SetDefaultValue (0);
-  fpCommand -> SetParameter (parameter);
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneList::~G4VisCommandSceneList () {
@@ -235,7 +211,7 @@ void G4VisCommandSceneList::SetNewValue (G4UIcommand* command,
 					 G4String newValue) {
   G4String name;
   G4int verbosity;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> name >> verbosity;
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
@@ -273,14 +249,14 @@ void G4VisCommandSceneList::SetNewValue (G4UIcommand* command,
     if (verbosity >= 2) {
       G4cout << "\n  " << *sceneList [iScene];
     }
-    G4cout << endl;
+    G4cout << G4endl;
   }
   if (!found) {
     G4cout << "No scenes found";
     if (name != "all") {
       G4cout << " of name \"" << name << "\"";
     }
-    G4cout << "." << endl;
+    G4cout << "." << G4endl;
   }
 }
 
@@ -298,7 +274,7 @@ G4VisCommandSceneNotifyHandlers::G4VisCommandSceneNotifyHandlers () {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandSceneNotifyHandlers = fpCommand;
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneNotifyHandlers::~G4VisCommandSceneNotifyHandlers () {
@@ -330,7 +306,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
   if (iScene >= nScenes ) {
     G4cout << "Scene \"" << sceneName << "\" not found."
       "\n  /vis/scene/list to see scenes."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -358,7 +334,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
 	G4cout << "Viewer \"" << aViewer -> GetName ()
 	       << "\" of scene handler \"" << aSceneHandler -> GetName ()
 	       << "\"\n  prepared at request of scene \"" << sceneName
-	       << "\"." << endl;
+	       << "\"." << G4endl;
       }
     }
   }
@@ -376,7 +352,7 @@ G4VisCommandSceneRemove::G4VisCommandSceneRemove () {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = false,
 				 currentAsDefault = true);
-  fpCommandSceneRemove = fpCommand;
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneRemove::~G4VisCommandSceneRemove () {
@@ -400,28 +376,28 @@ void G4VisCommandSceneRemove::SetNewValue (G4UIcommand* command,
   if (iScene < nScenes) {
     delete sceneList [iScene];
     sceneList.removeAt (iScene);
-    G4cout << "Scene \"" << removeName << "\" removed." << endl;
+    G4cout << "Scene \"" << removeName << "\" removed." << G4endl;
     UpdateCandidateLists ();
     if (sceneList.isEmpty ()) {
       UpdateVisManagerScene ();
-      G4cout << "No scenes left.  Please create a new one." << endl;
+      G4cout << "No scenes left.  Please create a new one." << G4endl;
     }
     else {
       if (currentSceneName == removeName) {
 	UpdateVisManagerScene (sceneList [0] -> GetName ());
 	G4cout << "Current scene is now \""
 	       << fpVisManager -> GetCurrentScene () -> GetName ()
-	       << "\"" << endl;
+	       << "\"" << G4endl;
       }
       else {
-	G4cout << "Current scene unchanged." << endl;
+	G4cout << "Current scene unchanged." << G4endl;
       }
     }
   }
   else {
     G4cout << "Scene \"" << removeName
 	   << "\" not found - \"/vis/scene/list\" to see possibilities."
-	   << endl;
+	   << G4endl;
   }
 }
 
@@ -437,7 +413,7 @@ G4VisCommandSceneSelect::G4VisCommandSceneSelect () {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandSceneSelect = fpCommand;
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneSelect::~G4VisCommandSceneSelect () {
@@ -459,10 +435,10 @@ void G4VisCommandSceneSelect::SetNewValue (G4UIcommand* command,
   G4cout << "Scene \"" << selectName;
   if (iScene < nScenes) {
     UpdateVisManagerScene (selectName);
-    G4cout << "\" selected." << endl;
+    G4cout << "\" selected." << G4endl;
   }
   else {
     G4cout << "\" not found - \"/vis/scene/list\" to see possibilities."
-	   << endl;
+	   << G4endl;
   }
 }
diff --git a/source/visualization/management/src/G4VisCommandsSceneAdd.cc b/source/visualization/management/src/G4VisCommandsSceneAdd.cc
index 31b987e409..21add0dad5 100644
--- a/source/visualization/management/src/G4VisCommandsSceneAdd.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneAdd.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.8.4.1 1999/12/07 20:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.9 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -27,11 +27,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 ////////////// /vis/scene/add/volume ///////////////////////////////////////
 
@@ -76,7 +72,7 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
   if (sceneList.isEmpty ()) {
     G4cout << "No scenes - please create one before adding anything."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -84,7 +80,7 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
   G4int copyNo;
   G4int requestedDepthOfDescent;
   const char* s = newValue;
-  istrstream is ((char*)s);
+  G4std::istrstream is ((char*)s);
   is >> name >> copyNo >> requestedDepthOfDescent;
   G4VPhysicalVolume* world =
     G4TransportationManager::GetTransportationManager ()
@@ -101,7 +97,7 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
     else {
       G4cerr << "G4VisCommandSceneAddVolume::SetNewValue: *** ERROR ***"
 	     << "\n  No world - shouldn't happen if G4ApplicationState is"
-	     << " being properly handled!!" << endl;
+	     << " being properly handled!!" << G4endl;
     }
   }
   else {
@@ -129,7 +125,7 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
     }
     else {
       G4cout << "Volume \"" << name << "\", copy no. " << copyNo
-	     << " not found." << endl;
+	     << " not found." << G4endl;
     }
   }
 
@@ -145,7 +141,7 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
 	     << ",\n  with further requested depth of descent "
 	     << requestedDepthOfDescent
 	     << ", has been added to scene \"" << currentSceneName << "\""
-	     << endl;
+	     << G4endl;
     }
   }
 }
@@ -186,14 +182,14 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
   if (sceneList.isEmpty ()) {
     G4cout << "No scenes - please create one before adding anything."
-	   << endl;
+	   << G4endl;
     return;
   }
 
   G4String name;
   G4int requestedDepthOfDescent;
   const char* s = newValue;
-  istrstream is ((char*)s);
+  G4std::istrstream is ((char*)s);
   is >> name >> requestedDepthOfDescent;
 
   G4LogicalVolumeStore *pLVStore = G4LogicalVolumeStore::GetInstance();
@@ -206,7 +202,7 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
   }
   if (iLV == nLV) {
     G4cout << "Logical volume " << name
-	   << " not found in logical volume Store." << endl;
+	   << " not found in logical volume Store." << G4endl;
     return;
   }
 
@@ -220,7 +216,7 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
 	   << " with requested depth of descent "
 	   << requestedDepthOfDescent
 	   << ",\n  has been added to scene \"" << currentSceneName << "\""
-	   << endl;
+	   << G4endl;
   }
 }
 
@@ -257,14 +253,14 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
   if (sceneList.isEmpty ()) {
     G4cout << "No scenes - please create one before adding anything."
-	   << endl;
+	   << G4endl;
     return;
   }
 
   G4VGlobalFastSimulationManager* theGlobalFastSimulationManager;
   if(!(theGlobalFastSimulationManager = 
        G4VGlobalFastSimulationManager::GetConcreteInstance ())){
-    G4cout<< "WARNING: no G4GlobalFastSimulationManager" << endl;
+    G4cout<< "WARNING: no G4GlobalFastSimulationManager" << G4endl;
     return;
   }
   
@@ -283,7 +279,7 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
     UpdateVisManagerScene ();
     if (successful) {
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
-	     << endl;
+	     << G4endl;
     }
     return;
   }
@@ -291,7 +287,7 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
   G4ParticleDefinition* currentParticle = 
     theParticleTable->FindParticle(newValue);
   if (currentParticle == NULL) {
-    G4cout << "\"" << newValue << "\": not found this particle name!" << endl;
+    G4cout << "\"" << newValue << "\": not found this particle name!" << G4endl;
     return;
   }
 
@@ -303,8 +299,8 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
     UpdateVisManagerScene (currentSceneName);
     if (successful) {
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
-	     << endl;
+	     << G4endl;
     }
   }
-  else G4cout << "There are no ghosts for \""<<newValue<<"\""<<endl;
+  else G4cout << "There are no ghosts for \""<<newValue<<"\""<<G4endl;
 }
diff --git a/source/visualization/management/src/G4VisCommandsSceneHandler.cc b/source/visualization/management/src/G4VisCommandsSceneHandler.cc
index c5cc9efdab..97b6ecd451 100644
--- a/source/visualization/management/src/G4VisCommandsSceneHandler.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneHandler.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneHandler.cc,v 1.8.2.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneHandler.cc,v 1.10 1999/12/16 17:19:33 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
@@ -19,11 +19,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4VVisCommandSceneHandler::G4VVisCommandSceneHandler () {}
 
@@ -34,31 +30,19 @@ void G4VVisCommandSceneHandler::UpdateCandidateLists () {
   const G4SceneHandlerList& list =
     fpVisManager -> GetAvailableSceneHandlers ();
 
-  fSceneHandlerNameList = G4String ();
+  G4String sceneHandlerNameList;
   for (int iScene = 0; iScene < list.entries (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
-    fSceneHandlerNameList += sceneHandler -> GetName () + " ";
+    sceneHandlerNameList += sceneHandler -> GetName () + " ";
   }
-  fSceneHandlerNameList = fSceneHandlerNameList.strip ();
-
-  if (fpCommandSceneHandlerRemove) {
-    fpCommandSceneHandlerRemove -> GetParameter (0) ->
-      SetParameterCandidates (fSceneHandlerNameList);
-  }
-
-  if (fpCommandSceneHandlerSelect) {
-    fpCommandSceneHandlerSelect -> GetParameter (0) ->
-      SetParameterCandidates (fSceneHandlerNameList);
-  }
-
-  if (fpCommandViewerCreate) {
-    fpCommandViewerCreate -> GetParameter (0) ->
-      SetParameterCandidates (fSceneHandlerNameList);
+  sceneHandlerNameList = sceneHandlerNameList.strip ();
+  sceneHandlerNameCommandsIterator i;
+  for (i = sceneHandlerNameCommands.begin ();
+       i != sceneHandlerNameCommands.end (); ++i) {
+    (*i)->GetParameter (0) -> SetParameterCandidates (sceneHandlerNameList);
   }
 }
 
-G4String G4VVisCommandSceneHandler::fSceneHandlerNameList;
-
 ////////////// /vis/sceneHandler/attach ///////////////////////////////////////
 
 G4VisCommandSceneHandlerAttach::G4VisCommandSceneHandlerAttach () {
@@ -75,7 +59,7 @@ G4VisCommandSceneHandlerAttach::G4VisCommandSceneHandlerAttach () {
   fpCommand -> SetParameterName ("scene-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandSceneHandlerAttach = fpCommand;
+  sceneNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneHandlerAttach::~G4VisCommandSceneHandlerAttach () {
@@ -94,7 +78,7 @@ void G4VisCommandSceneHandlerAttach::SetNewValue (G4UIcommand* command,
   if (sceneName.length () == 0) {
     G4cout <<
       "Null string specified.  Maybe there are no scenes available yet."
-      "\n  Please create one." << endl;
+      "\n  Please create one." << G4endl;
     return;
   }
 
@@ -102,7 +86,7 @@ void G4VisCommandSceneHandlerAttach::SetNewValue (G4UIcommand* command,
   if (!pSceneHandler) {
     G4cout <<
       "Current scene handler not defined.  Please select or create one."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -112,7 +96,7 @@ void G4VisCommandSceneHandlerAttach::SetNewValue (G4UIcommand* command,
   if (sceneList.isEmpty ()) {
     G4cout <<
       "No valid scenes available yet.  Please create one."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -126,12 +110,12 @@ void G4VisCommandSceneHandlerAttach::SetNewValue (G4UIcommand* command,
     fpVisManager -> SetCurrentScene (pScene);
     G4cout << "Scene \"" << sceneName
 	   << "\" attached to scene handler \"" << pSceneHandler -> GetName ()
-	   << "." << endl;
+	   << "." << G4endl;
   }
   else {
     G4cout << "Scene \"" << sceneName
 	   << "\" not found.  Use \"/vis/scene/list\" to see possibilities."
-	   << endl;
+	   << G4endl;
   }
 }
 
@@ -190,8 +174,8 @@ G4VisCommandSceneHandlerCreate::~G4VisCommandSceneHandlerCreate () {
 
 G4String G4VisCommandSceneHandlerCreate::NextName () {
   char nextName [20];
-  ostrstream ost (nextName, 20);
-  ost << "scene-handler-" << fId << ends;
+  G4std::ostrstream ost (nextName, 20);
+  ost << "scene-handler-" << fId << G4std::ends;
   return nextName;
 }
 
@@ -230,7 +214,7 @@ G4String G4VisCommandSceneHandlerCreate::GetCurrentValue
 void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String graphicsSystem, newName, sceneName;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> graphicsSystem >> newName >> sceneName;
 
   const G4GraphicsSystemList& gsl =
@@ -241,7 +225,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
       " no graphics systems available."
       "\n  Did you instantiate any in"
       " YourVisManager::RegisterGraphicsSystems()?"
-	   << endl;
+	   << G4endl;
     return;
   }
   int iGS;  // Selector index.
@@ -258,7 +242,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
     // This shouldn't happen!!!!!!
     G4cerr << "G4VisCommandSceneHandlerCreate::SetNewValue:"
       " invalid graphics system specified."
-	   << endl;
+	   << G4endl;
     return;
   }
   // Valid index.  Set current graphics system in preparation for
@@ -266,7 +250,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
   G4VGraphicsSystem* pSystem = gsl [iGS];
   fpVisManager -> SetCurrentGraphicsSystem (pSystem);
   if (fpVisManager -> GetVerboseLevel () > 0) {
-    G4cout << "Graphics system set to " << pSystem -> GetName () << endl;
+    G4cout << "Graphics system set to " << pSystem -> GetName () << G4endl;
   }
 
   // Now deal with name of scene handler.
@@ -281,14 +265,14 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
   for (iScene = 0; iScene < list.entries (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
     if (sceneHandler -> GetName () == newName) {
-      G4cout << "Scene handler \"" << newName << "\" already exists." << endl;
+      G4cout << "Scene handler \"" << newName << "\" already exists." << G4endl;
       return;
     }
   }
 
   //Create scene handler.
   fpVisManager -> CreateSceneHandler (newName);
-  G4cout << "New scene handler \"" << newName << "\" created." << endl;
+  G4cout << "New scene handler \"" << newName << "\" created." << G4endl;
 
   // Attach scene.
   G4String commandString = "/vis/sceneHandler/attach " + sceneName;
@@ -318,7 +302,7 @@ G4VisCommandSceneHandlerList::G4VisCommandSceneHandlerList () {
 				 omitable = true);
   parameter -> SetCurrentAsDefault (false);
   parameter -> SetDefaultValue (0);
-  fpCommand -> SetParameter (parameter);
+  sceneHandlerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneHandlerList::~G4VisCommandSceneHandlerList () {
@@ -333,7 +317,7 @@ void G4VisCommandSceneHandlerList::SetNewValue (G4UIcommand* command,
 					 G4String newValue) {
   G4String name;
   G4int verbosity;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> name >> verbosity;
 
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
@@ -348,14 +332,14 @@ void G4VisCommandSceneHandlerList::SetNewValue (G4UIcommand* command,
     if (verbosity > 0) {
       G4cout << "\n  " << *(list [iSH]);
     }
-    G4cout << endl;
+    G4cout << G4endl;
   }
   if (!found) {
     G4cout << "No scene handlers found";
     if (name != "all") {
       G4cout << " of name \"" << name << "\"";
     }
-    G4cout << "." << endl;
+    G4cout << "." << G4endl;
   }
 }
 
@@ -372,7 +356,7 @@ G4VisCommandSceneHandlerRemove::G4VisCommandSceneHandlerRemove () {
   fpCommand -> SetParameterName ("scene-handler-name",
 				 omitable = false,
 				 currentAsDefault = true);
-  fpCommandSceneHandlerRemove = fpCommand;
+  sceneHandlerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneHandlerRemove::~G4VisCommandSceneHandlerRemove () {
@@ -408,17 +392,17 @@ void G4VisCommandSceneHandlerRemove::SetNewValue (G4UIcommand* command,
   if (iSH >= list.entries ()) {
     G4cout << "Scene handler \"" << removeName
 	   << "\" not found - \"/vis/sceneHandler/list\" to see possibilities."
-	   << endl;
+	   << G4endl;
     return;
   }
 
-  G4cout << "Scene handler \"" << removeName << "\" removed." << endl;
+  G4cout << "Scene handler \"" << removeName << "\" removed." << G4endl;
   if (removeName == currentName) {
     fpVisManager -> DeleteCurrentSceneHandler ();
   }
   else {
     list.remove (list [iSH]);
-    G4cout << "Current scene handler unchanged." << endl;
+    G4cout << "Current scene handler unchanged." << G4endl;
   }
 
   UpdateCandidateLists ();
@@ -437,7 +421,7 @@ G4VisCommandSceneHandlerSelect::G4VisCommandSceneHandlerSelect () {
   fpCommand -> SetParameterName ("scene-handler-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandSceneHandlerSelect = fpCommand;
+  sceneHandlerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandSceneHandlerSelect::~G4VisCommandSceneHandlerSelect () {
@@ -466,16 +450,16 @@ void G4VisCommandSceneHandlerSelect::SetNewValue (G4UIcommand* command,
   }
   if (iSH < list.entries ()) {
     if (fpVisManager -> GetCurrentSceneHandler () -> GetName () == selectName) {
-      G4cout << " already selected." << endl;
+      G4cout << " already selected." << G4endl;
     }
     else {
-      G4cout << " being selected." << endl;
+      G4cout << " being selected." << G4endl;
       fpVisManager -> SetCurrentSceneHandler (list [iSH]);
     }
   }
   else {
     G4cout << " not found - \"/vis/sceneHandler/list\""
       "\n  to see possibilities."
-	   << endl;
+	   << G4endl;
   }
 }
diff --git a/source/visualization/management/src/G4VisCommandsSceneInclude.cc b/source/visualization/management/src/G4VisCommandsSceneInclude.cc
index 841c50ba15..9983f4bc43 100644
--- a/source/visualization/management/src/G4VisCommandsSceneInclude.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneInclude.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsSceneInclude.cc,v 1.3.8.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsSceneInclude.cc,v 1.4 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -42,7 +42,7 @@ void G4VisCommandSceneIncludeHits::SetNewValue (G4UIcommand* command,
   G4SceneList& list = fpVisManager -> SetSceneList ();
   if (list.isEmpty ()) {
     G4cout << "No scenes - please create one before adding anything."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -52,7 +52,7 @@ void G4VisCommandSceneIncludeHits::SetNewValue (G4UIcommand* command,
   pCurrentScene -> AddEndOfEventModel (model);
   G4cout << "Hits will be drawn in scene \""
 	 << currentSceneName << "\"."
-	 << endl;
+	 << G4endl;
 }
 
 ////////////// /vis/scene/include/trajectories ///////////////////////////////////////
@@ -81,7 +81,7 @@ void G4VisCommandSceneIncludeTrajectories::SetNewValue (G4UIcommand* command,
   G4SceneList& list = fpVisManager -> SetSceneList ();
   if (list.isEmpty ()) {
     G4cout << "No scenes - please create one before adding anything."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -91,5 +91,5 @@ void G4VisCommandSceneIncludeTrajectories::SetNewValue (G4UIcommand* command,
   pCurrentScene -> AddEndOfEventModel (model);
   G4cout << "Trajectories will be drawn in scene \""
 	 << currentSceneName << "\"."
-	 << endl;
+	 << G4endl;
 }
diff --git a/source/visualization/management/src/G4VisCommandsViewer.cc b/source/visualization/management/src/G4VisCommandsViewer.cc
index 8f5673533d..7b1b1f6945 100644
--- a/source/visualization/management/src/G4VisCommandsViewer.cc
+++ b/source/visualization/management/src/G4VisCommandsViewer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsViewer.cc,v 1.7.4.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisCommandsViewer.cc,v 1.12 2000/01/17 10:29:37 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
@@ -18,11 +18,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4VVisCommandViewer::G4VVisCommandViewer () {}
 
@@ -38,38 +34,26 @@ G4String G4VVisCommandViewer::ShortName (const G4String& name) {
 
 void G4VVisCommandViewer::UpdateCandidateLists () {
 
-  const G4SceneHandlerList& sceneHandlerList = fpVisManager -> GetAvailableSceneHandlers ();
+  const G4SceneHandlerList& sceneHandlerList =
+    fpVisManager -> GetAvailableSceneHandlers ();
   G4int nHandlers = sceneHandlerList.entries ();
 
-  fViewerNameList = G4String ();
+  G4String viewerNameList;
   for (int iHandler = 0; iHandler < nHandlers; iHandler++) {
     G4VSceneHandler* sceneHandler = sceneHandlerList [iHandler];
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
     for (int iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
       const G4String& viewerName = viewerList [iViewer] -> GetName ();
-      fViewerNameList += ShortName (viewerName) + " ";
+      viewerNameList += ShortName (viewerName) + " ";
     }
   }
-  fViewerNameList = fViewerNameList.strip ();
-
-  if (fpCommandViewerRemove) {
-    fpCommandViewerRemove -> GetParameter (0) ->
-      SetParameterCandidates (fViewerNameList);
-  }
-
-  if (fpCommandViewerSelect) {
-    fpCommandViewerSelect -> GetParameter (0) ->
-      SetParameterCandidates (fViewerNameList);
-  }
-
-  if (fpCommandViewerUpdate) {
-    fpCommandViewerUpdate -> GetParameter (0) ->
-      SetParameterCandidates (fViewerNameList);
+  viewerNameList = viewerNameList.strip ();
+  viewerNameCommandsIterator i;
+  for (i = viewerNameCommands.begin (); i != viewerNameCommands.end (); ++i) {
+    (*i)->GetParameter (0) -> SetParameterCandidates (viewerNameList);
   }
 }
 
-G4String G4VVisCommandViewer::fViewerNameList;
-
 ////////////// /vis/viewer/create ///////////////////////////////////////
 
 G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
@@ -95,7 +79,7 @@ G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
   parameter = new G4UIparameter ("viewer-name", 's', omitable = true);
   parameter -> SetCurrentAsDefault (true);
   fpCommand -> SetParameter (parameter);
-  fpCommandViewerCreate = fpCommand;
+  viewerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandViewerCreate::~G4VisCommandViewerCreate () {
@@ -105,7 +89,7 @@ G4VisCommandViewerCreate::~G4VisCommandViewerCreate () {
 G4String G4VisCommandViewerCreate::NextName () {
   const int charLength = 100;
   char nextName [charLength];
-  ostrstream ost (nextName, charLength);
+  G4std::ostrstream ost (nextName, charLength);
   G4VSceneHandler* sceneHandler = fpVisManager -> GetCurrentSceneHandler ();
   ost << "viewer-" << fId << " (";
   if (sceneHandler) {
@@ -114,7 +98,7 @@ G4String G4VisCommandViewerCreate::NextName () {
   else {
     ost << "no_scene_handlers";
   }
-  ost << ")" << ends;
+  ost << ")" << G4std::ends;
   return nextName;
 }
 
@@ -151,7 +135,7 @@ G4String G4VisCommandViewerCreate::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String sceneHandlerName, newName;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> sceneHandlerName;
   // Now need to handle the possibility that the second string
   // contains embedded blanks within quotation marks.
@@ -165,7 +149,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
   if (nHandlers <= 0) {
     G4cout << "G4VisCommandViewerCreate::SetNewValue: no scene handlers."
       "\n  Create a scene handler with \"/vis/sceneHandler/create\""
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -179,7 +163,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
     // This shouldn't happen!!!!!!
     G4cerr << "G4VisCommandViewerCreate::SetNewValue:"
       " invalid scene handler specified."
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -202,7 +186,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
     for (int iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
       if (viewerList [iViewer] -> GetName () == newName ) {
-	G4cout << "Viewer \"" << newName << "\" already exists." << endl;
+	G4cout << "Viewer \"" << newName << "\" already exists." << G4endl;
 	return;
       }
     }
@@ -210,7 +194,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
 
   // Create viewer.
   fpVisManager -> CreateViewer (newName);
-  G4cout << "New viewer \"" << newName << "\" created." << endl;
+  G4cout << "New viewer \"" << newName << "\" created." << G4endl;
 
   UpdateCandidateLists ();
 }
@@ -251,7 +235,7 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
 					 G4String newValue) {
   G4String name;
   G4int verbosity;
-  istrstream is ((char*)newValue.data());
+  G4std::istrstream is ((char*)newValue.data());
   is >> name >> verbosity;
   G4String shortName = ShortName (name);
 
@@ -276,7 +260,7 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
 	   << "\", scene \"" << pScene -> GetName () << "\":";
     G4int nViewers = viewerList.entries ();
     if (nViewers == 0) {
-      G4cout << "\n            No viewers for this scene handler." << endl;
+      G4cout << "\n            No viewers for this scene handler." << G4endl;
     }
     else {
       for (int iViewer = 0; iViewer < nViewers; iViewer++) {
@@ -300,12 +284,12 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
 	  G4cout << "\n  " << *thisViewer << '\n';
 	}
       }
-      G4cout << endl;
+      G4cout << G4endl;
     }
   }
 
   if (!foundCurrent) {
-    G4cout << "No valid current viewer - please create or select one." << endl;
+    G4cout << "No valid current viewer - please create or select one." << G4endl;
   }
 
   if (!found) {
@@ -313,10 +297,87 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
     if (name != "all") {
       G4cout << " of name \"" << name << "\"";
     }
-    G4cout << " found." << endl;
+    G4cout << " found." << G4endl;
   }
 }
 
+////////////// /vis/viewer/refresh ///////////////////////////////////////
+
+G4VisCommandViewerRefresh::G4VisCommandViewerRefresh () {
+  G4bool omitable, currentAsDefault;
+  fpCommand = new G4UIcmdWithAString ("/vis/viewer/refresh", this);
+  fpCommand -> SetGuidance ("/vis/viewer/refresh [<viewer-name>]");
+  fpCommand -> SetGuidance
+    ("Refreshes viewer.");
+  fpCommand -> SetGuidance ("Viewer becomes current.");
+  fpCommand -> SetGuidance
+    ("Specify viewer by name (\"/vis/viewer/list\""
+     "\n  to see possibilities).");
+  fpCommand -> SetParameterName ("viewer-name",
+				 omitable = true,
+				 currentAsDefault = true);
+  viewerNameCommands.push_back (fpCommand);
+}
+
+G4VisCommandViewerRefresh::~G4VisCommandViewerRefresh () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandViewerRefresh::GetCurrentValue 
+(G4UIcommand* command) {
+  G4VViewer* viewer = fpVisManager -> GetCurrentViewer ();
+  if (viewer) {
+    return viewer -> GetName ();
+  }
+  else {
+    return "none";
+  }
+}
+
+void G4VisCommandViewerRefresh::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+  G4String& refreshName = newValue;
+  G4String refreshShortName = ShortName (refreshName);
+
+  G4VViewer* viewer = fpVisManager -> GetCurrentViewer ();
+  G4bool found = false;
+  if (viewer && refreshShortName == ShortName (viewer -> GetName ())) {
+    found = true;
+  }
+  else {
+    const G4SceneHandlerList& sceneHandlerList =
+      fpVisManager -> GetAvailableSceneHandlers ();
+    G4int nHandlers = sceneHandlerList.entries ();
+    for (G4int iHandler = 0; iHandler < nHandlers; iHandler++) {
+      G4VSceneHandler* sceneHandler = sceneHandlerList [iHandler];
+      const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
+      for (G4int iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
+	viewer = viewerList [iViewer];
+	if (refreshShortName == ShortName (viewer -> GetName ())) {
+	  found = true;
+	  fpVisManager -> SetCurrentViewer (viewer);
+	  break;
+	}
+      }
+      if (found) break;
+    }
+  }
+
+  G4cout << "Viewer \"" << refreshName << "\"";
+  if (found) {
+    viewer -> ClearView ();
+    viewer -> SetViewParameters (fpVisManager -> GetCurrentViewParameters ());
+    viewer -> DrawView ();
+    viewer -> ShowView ();
+    G4cout << " refreshed.";
+  }
+  else {
+    G4cout << " not found - \"/vis/viewer/list\""
+      "\n  to see possibilities.";
+  }
+  G4cout << G4endl;
+}
+
 ////////////// /vis/viewer/remove ///////////////////////////////////////
 
 G4VisCommandViewerRemove::G4VisCommandViewerRemove () {
@@ -330,7 +391,7 @@ G4VisCommandViewerRemove::G4VisCommandViewerRemove () {
   fpCommand -> SetParameterName ("viewer-name",
 				 omitable = false,
 				 currentAsDefault = true);
-  fpCommandViewerRemove = fpCommand;
+  viewerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandViewerRemove::~G4VisCommandViewerRemove () {
@@ -383,17 +444,17 @@ void G4VisCommandViewerRemove::SetNewValue (G4UIcommand* command,
   if (!found) {
     G4cout << "Viewer \"" << removeName
 	   << "\" not found - \"/vis/viewer/list\" to see possibilities."
-	   << endl;
+	   << G4endl;
       return;
   }
 
-  G4cout << "Viewer \"" << removeName << "\" removed." << endl;
+  G4cout << "Viewer \"" << removeName << "\" removed." << G4endl;
   if (removeShortName == currentShortName) {
     fpVisManager -> DeleteCurrentViewer ();
   }
   else {
     sceneHandler -> SetViewerList ().remove (viewer);
-    G4cout << "Current viewer unchanged." << endl;
+    G4cout << "Current viewer unchanged." << G4endl;
   }
 
   UpdateCandidateLists ();
@@ -412,7 +473,7 @@ G4VisCommandViewerSelect::G4VisCommandViewerSelect () {
   fpCommand -> SetParameterName ("viewer-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandViewerSelect = fpCommand;
+  viewerNameCommands.push_back (fpCommand);
 }
 
 G4VisCommandViewerSelect::~G4VisCommandViewerSelect () {
@@ -460,28 +521,32 @@ void G4VisCommandViewerSelect::SetNewValue (G4UIcommand* command,
     G4VViewer* currentViewer = fpVisManager -> GetCurrentViewer ();
     if (currentViewer &&
 	ShortName (currentViewer -> GetName ())	== selectShortName) {
-      G4cout << " already selected." << endl;
+      G4cout << " already selected." << G4endl;
     }
     else {
-      G4cout << " being selected." << endl;
+      G4cout << " being selected." << G4endl;
       fpVisManager -> SetCurrentViewer (viewer);
     }
   }
   else {
     G4cout << " not found - \"/vis/viewer/list\""
       "\n  to see possibilities."
-	   << endl;
+	   << G4endl;
   }
 }
 
-////////////// /vis/viewer/update ///////////////////////////////////////
+////////////// /vis/viewer/show ///////////////////////////////////////
+// Synonym (deprecated): /vis/viewer/update ///////////////////////////
 
-G4VisCommandViewerUpdate::G4VisCommandViewerUpdate () {
+G4VisCommandViewerShow::G4VisCommandViewerShow () {
   G4bool omitable, currentAsDefault;
-  fpCommand = new G4UIcmdWithAString ("/vis/viewer/update", this);
-  fpCommand -> SetGuidance ("/vis/viewer/update [<viewer-name>]");
+  fpCommand = new G4UIcmdWithAString ("/vis/viewer/show", this);
+  fpCommand -> SetGuidance ("/vis/viewer/show [<viewer-name>]");
   fpCommand -> SetGuidance
-    ("Updates viewer (necessary for graphical database post-processing.");
+    ("Triggers graphical database post-processing for viewers"
+     " using that technique.");
+  fpCommand -> SetGuidance
+    ("For such viewers the view only becomes visible with this command.");
   fpCommand -> SetGuidance ("Viewer becomes current.");
   fpCommand -> SetGuidance
     ("Specify viewer by name (\"/vis/viewer/list\""
@@ -489,14 +554,22 @@ G4VisCommandViewerUpdate::G4VisCommandViewerUpdate () {
   fpCommand -> SetParameterName ("viewer-name",
 				 omitable = true,
 				 currentAsDefault = true);
-  fpCommandViewerUpdate = fpCommand;
+  viewerNameCommands.push_back (fpCommand);
+  fpCommand1 = new G4UIcmdWithAString ("/vis/viewer/update", this);
+  fpCommand1 -> SetGuidance
+    ("Synonym for \"/vis/viewer/show\" - see that command for guidance.");
+  fpCommand1 -> SetParameterName ("viewer-name",
+				  omitable = true,
+				  currentAsDefault = true);
+  viewerNameCommands.push_back (fpCommand1);
 }
 
-G4VisCommandViewerUpdate::~G4VisCommandViewerUpdate () {
+G4VisCommandViewerShow::~G4VisCommandViewerShow () {
   delete fpCommand;
+  delete fpCommand1;
 }
 
-G4String G4VisCommandViewerUpdate::GetCurrentValue 
+G4String G4VisCommandViewerShow::GetCurrentValue 
 (G4UIcommand* command) {
   G4VViewer* viewer = fpVisManager -> GetCurrentViewer ();
   if (viewer) {
@@ -507,15 +580,17 @@ G4String G4VisCommandViewerUpdate::GetCurrentValue
   }
 }
 
-void G4VisCommandViewerUpdate::SetNewValue (G4UIcommand* command,
+void G4VisCommandViewerShow::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
-  G4String& updateName = newValue;
-  G4String updateShortName = ShortName (updateName);
+  G4String& showName = newValue;
+  G4String showShortName = ShortName (showName);
 
   G4VViewer* viewer = fpVisManager -> GetCurrentViewer ();
-  G4bool found = true;
-  if (updateShortName != ShortName (viewer -> GetName ())) {
-    found = false;
+  G4bool found = false;
+  if (viewer && showShortName == ShortName (viewer -> GetName ())) {
+    found = true;
+  }
+  else {
     const G4SceneHandlerList& sceneHandlerList =
       fpVisManager -> GetAvailableSceneHandlers ();
     G4int nHandlers = sceneHandlerList.entries ();
@@ -524,12 +599,9 @@ void G4VisCommandViewerUpdate::SetNewValue (G4UIcommand* command,
       const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
       for (G4int iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
 	viewer = viewerList [iViewer];
-	if (updateShortName == ShortName (viewer -> GetName ())) {
+	if (showShortName == ShortName (viewer -> GetName ())) {
 	  found = true;
 	  fpVisManager -> SetCurrentViewer (viewer);
-	  fpVisManager -> SetCurrentSceneHandler (sceneHandler);
-	  fpVisManager -> SetCurrentGraphicsSystem
-	    (sceneHandler -> GetGraphicsSystem ());
 	  break;
 	}
       }
@@ -537,14 +609,14 @@ void G4VisCommandViewerUpdate::SetNewValue (G4UIcommand* command,
     }
   }
 
-  G4cout << "Viewer \"" << updateName << "\"";
+  G4cout << "Viewer \"" << showName << "\"";
   if (found) {
     viewer -> ShowView ();
-    G4cout << " updated.";
+    G4cout << " post-processing triggered.";
   }
   else {
     G4cout << " not found - \"/vis/viewer/list\""
       "\n  to see possibilities.";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
diff --git a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
index c534ecde77..41de1b13f6 100644
--- a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.2.8.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4VisFeaturesOfDAWNFILE.hh"
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
index cd68954738..243c2f0671 100644
--- a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.2.8.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
index 50ad2b47cf..fd2f5f8366 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfOpenGL.cc,v 1.2.8.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfOpenGL.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
index 369e34cab3..922253a1f2 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisFeaturesOfOpenInventor.cc,v 1.2.8.1 1999/12/07 20:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisFeaturesOfOpenInventor.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisManMessCamera.cc b/source/visualization/management/src/G4VisManMessCamera.cc
index 74349ce31d..0d57a7be00 100644
--- a/source/visualization/management/src/G4VisManMessCamera.cc
+++ b/source/visualization/management/src/G4VisManMessCamera.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessCamera.cc,v 1.3.8.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessCamera.cc,v 1.4 1999/12/15 14:54:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -190,12 +190,12 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     if (ViewValid ()) {
       G4double in;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> in;
-      G4cout << "Dolly " << in << " in." << endl;
+      G4std::istrstream is((char*) aString) ; is >> in;
+      G4cout << "Dolly " << in << " in." << G4endl;
       fpVMan -> SetCurrentViewParameters ().IncrementDolly (in);
       if (fpVMan -> GetVerboseLevel () > 0) {
 	G4cout << "Dolly distance changed to "
-	     << fpVMan -> GetCurrentViewParameters ().GetDolly () << endl;
+	     << fpVMan -> GetCurrentViewParameters ().GetDolly () << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -210,7 +210,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -220,7 +220,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       G4int nFrames;
       G4double dbeta;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> nFrames >> dbeta;
+      G4std::istrstream is((char*) aString) ; is >> nFrames >> dbeta;
       dbeta = dbeta * deg;
       fpVMan -> SetCurrentViewParameters ().SetLightsMoveWithCamera (false);
       for (int i = 0; i < nFrames; i++) {
@@ -237,13 +237,13 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     if (ViewValid ()) {
       G4double right, up;
       const char* aString = newValues;
-      istrstream is((char*) aString);is >> right >> up;
-      G4cout << "Pan " << right << " right, " << up << " up." << endl;
+      G4std::istrstream is((char*) aString);is >> right >> up;
+      G4cout << "Pan " << right << " right, " << up << " up." << G4endl;
       fpVMan -> SetCurrentViewParameters ().Pan (right, up);
       if (fpVMan -> GetVerboseLevel () > 0) {
 	G4cout << "Current target point changed to "
 	     << fpVMan -> GetCurrentViewParameters ().GetCurrentTargetPoint ()
-	     << endl;
+	     << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -258,7 +258,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -267,14 +267,14 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     G4int iStyle;
     G4double fieldHalfAngleDegrees;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> iStyle >> fieldHalfAngleDegrees;
+    G4std::istrstream is((char*) aString) ; is >> iStyle >> fieldHalfAngleDegrees;
     if (iStyle < 0 || iStyle > 1) {
       G4cout << "Available representation styles:";
       G4cout << "\n  0) orthogonal";
       G4cout << "\n  1) perspective (also specify field half angle in degrees)";
       G4cout << "\nChoose by specifying integer parameter and field half angle"
 	" (if relevant).";
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       switch (iStyle) {
@@ -282,18 +282,18 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       case 0:
 	fpVMan -> SetCurrentViewParameters ().SetFieldHalfAngle (0.);
 	if (fpVMan -> GetVerboseLevel () > 0) {
-	  G4cout << "\nOrthogonal projection set." << endl;
+	  G4cout << "\nOrthogonal projection set." << G4endl;
 	}
 	break;
       case 1:
 	if (fieldHalfAngleDegrees == 0.0) {
 	  fieldHalfAngleDegrees = 30.;
 	  G4cout << "Field half angle defaulted to "
-	       << fieldHalfAngleDegrees << " degrees." << endl;
+	       << fieldHalfAngleDegrees << " degrees." << G4endl;
 	}
 	if (fieldHalfAngleDegrees > 89.5 || fieldHalfAngleDegrees <= 0.0) {
 	  G4cout << "Field half angle should be 0 < angle <= 89.5 degrees.";
-	  G4cout << endl;
+	  G4cout << G4endl;
 	}
 	else {
 	  fpVMan -> SetCurrentViewParameters ().
@@ -303,7 +303,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 	    G4cout << "\nField half angle set to " << fieldHalfAngleDegrees  
 		 << " degrees" << " ("
 		 << fpVMan -> GetCurrentViewParameters ().GetFieldHalfAngle ()
-		 << " radians)." << endl;
+		 << " radians)." << G4endl;
 	    if (fpVMan -> GetVerboseLevel () > 1) {
 	      fpVMan -> PrintCurrentView ();
 	    }
@@ -323,7 +323,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -333,7 +333,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       G4int nFrames;
       G4double dbeta;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> nFrames >> dbeta;
+      G4std::istrstream is((char*) aString) ; is >> nFrames >> dbeta;
       dbeta = dbeta * deg;
       fpVMan -> SetCurrentViewParameters ().SetLightsMoveWithCamera (true);
       for (int i = 0; i < nFrames; i++) {
@@ -349,7 +349,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
   if (commandPath == "/vis~/camera/viewpoint") {
     G4double theta, phi ;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> theta >> phi;
+    G4std::istrstream is((char*) aString) ; is >> theta >> phi;
     theta = theta * deg;
     phi   = phi   * deg;
     G4double x = sin (theta) * cos (phi);
@@ -359,10 +359,10 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     fpVMan -> SetCurrentViewParameters().SetViewAndLights (vp);
     const G4ViewParameters& viewParams = fpVMan -> GetCurrentViewParameters ();
     if (fpVMan -> GetVerboseLevel () > 0) {
-      G4cout << "Viewpoint direction set to " << vp << endl;
+      G4cout << "Viewpoint direction set to " << vp << G4endl;
       if (viewParams.GetLightsMoveWithCamera ()) {
 	G4cout << "Lightpoint direction set to "
-	     << viewParams.GetLightpointDirection () << endl;
+	     << viewParams.GetLightpointDirection () << G4endl;
       }
       if (fpVMan -> GetVerboseLevel () > 1) {
 	fpVMan -> PrintCurrentView ();
@@ -380,17 +380,17 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       // Recalculate projection matrices, etc.
       pView -> SetView ();
     }
-    G4cout << "Issue Draw or refresh to see effect." << endl;
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 
   ///////////////////////////////////////  /vis~/camera/window_size_hint  ////
   if (commandPath == "/vis~/camera/window_size_hint") {
     G4int size;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> size;
+    G4std::istrstream is((char*) aString) ; is >> size;
     fpVMan -> SetCurrentViewParameters ().SetWindowSizeHint (size, size);
     if (fpVMan -> GetVerboseLevel () > 0) {
-      G4cout << "Window size hint set to " << size << " x " << size << endl;
+      G4cout << "Window size hint set to " << size << " x " << size << G4endl;
       if (fpVMan -> GetVerboseLevel () > 1) {
 	fpVMan -> PrintCurrentView ();
       }
@@ -402,11 +402,11 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     if (ViewValid ()) {
       G4double zoomBy;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> zoomBy;
+      G4std::istrstream is((char*) aString) ; is >> zoomBy;
       fpVMan -> SetCurrentViewParameters ().MultiplyZoomFactor (zoomBy);
       if (fpVMan -> GetVerboseLevel () > 0) {
 	G4cout << "Zoom factor changed to "
-	     << fpVMan -> GetCurrentViewParameters ().GetZoomFactor () << endl;
+	     << fpVMan -> GetCurrentViewParameters ().GetZoomFactor () << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -421,7 +421,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 }
diff --git a/source/visualization/management/src/G4VisManMessCreateView.cc b/source/visualization/management/src/G4VisManMessCreateView.cc
index 3835e06c0f..6c9344c4f5 100644
--- a/source/visualization/management/src/G4VisManMessCreateView.cc
+++ b/source/visualization/management/src/G4VisManMessCreateView.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessCreateView.cc,v 1.4.2.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessCreateView.cc,v 1.5 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -65,7 +65,7 @@ void G4VisManMessenger::DoCommandCreateView (const G4String& commandPath,
   if (commandPath == "/vis~/create_view/new_graphics_system") {
     G4String selector;
     const char* aString = newValues;
-    istrstream is ((char*) aString) ; is >> selector;
+    G4std::istrstream is ((char*) aString) ; is >> selector;
     const G4GraphicsSystemList& gsl = fpVMan -> GetAvailableGraphicsSystems ();
     int nSystems = gsl.entries ();
     if (nSystems > 0) {
@@ -135,14 +135,14 @@ void G4VisManMessenger::DoCommandCreateView (const G4String& commandPath,
 	  G4cout <<
 	    "\nChoose by specifying class name or nickname, if any, or help.";
 	}
-	G4cout << endl;
+	G4cout << G4endl;
       }
       if (iGS >=0 && iGS < nSystems) {
 	// Valid index.  Create view.
 	G4VGraphicsSystem* pSystem = gsl [iGS];;
 	fpVMan -> SetCurrentGraphicsSystemAndCreateViewer (pSystem);
 	if (fpVMan -> GetVerboseLevel () > 0) {
-	  G4cout << "Graphics system set to " << pSystem -> GetName () << endl;
+	  G4cout << "Graphics system set to " << pSystem -> GetName () << G4endl;
 	  if (fpVMan -> GetVerboseLevel () > 1) {
 	    fpVMan -> PrintCurrentSystem ();
 	  }
diff --git a/source/visualization/management/src/G4VisManMessDraw.cc b/source/visualization/management/src/G4VisManMessDraw.cc
index b7a2ee41b7..8c0f90315c 100644
--- a/source/visualization/management/src/G4VisManMessDraw.cc
+++ b/source/visualization/management/src/G4VisManMessDraw.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessDraw.cc,v 1.4.8.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessDraw.cc,v 1.5 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -147,7 +147,7 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
       G4double length ;
       G4String unitString;
       const char* aString = newValues;
-      istrstream is((char*) aString);
+      G4std::istrstream is((char*) aString);
       is >> x0 >> y0 >> z0 >> length >> unitString;
 
       G4double unit = G4UnitDefinition::GetValueOf (unitString);
@@ -195,7 +195,7 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
       G4double font_size, x_offset, y_offset;
       G4String unitString, textString;
       const char* aString = newValues;
-      istrstream is((char*) aString);
+      G4std::istrstream is((char*) aString);
       is >> x >> y >> z >> unitString
 	 >> font_size >> x_offset >> y_offset >> textString;
       G4double unit = G4UnitDefinition::GetValueOf (unitString);
@@ -212,24 +212,24 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
     // Find physical_volume.
     G4String name;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> name;
+    G4std::istrstream is((char*) aString) ; is >> name;
 
     G4cout << "/vis~/draw/volume: requested name is " << name;
     G4cout << "\n...but this command is \"UNDER DEVELOPMENT\"!";
-    G4cout << endl;
+    G4cout << G4endl;
   }
   //////////////////////////  /vis~/draw/ghosts  /////
   if (commandPath == "/vis~/draw/ghosts") {
     // preliminaries
     G4VisManager* theVisManager;
     if(!(theVisManager= G4VisManager::GetInstance())) {
-      G4cout<< "grafic system not yet avaliable." << endl;
+      G4cout<< "grafic system not yet avaliable." << G4endl;
       return;
     }
     G4VGlobalFastSimulationManager* theGlobalFastSimulationManager;
     if(!(theGlobalFastSimulationManager = 
 	 G4VGlobalFastSimulationManager::GetConcreteInstance ())){
-      G4cout<< "WARNING: none G4GlobalFastSimulationManager" << endl;
+      G4cout<< "WARNING: none G4GlobalFastSimulationManager" << G4endl;
       return;
     }
     G4ParticleTable* theParticleTable=G4ParticleTable::GetParticleTable();
@@ -246,13 +246,13 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
 	  currentScene -> AddRunDurationModel
 	    (new G4FlavoredParallelWorldModel (CurrentFlavoredWorld));
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
-	     << endl;
+	     << G4endl;
       return;
     }
     G4ParticleDefinition* currentParticle = 
       theParticleTable->FindParticle(newValues);
     if (currentParticle == NULL) {
-      G4cout << newValues << ": not found this particle name!" << endl;
+      G4cout << newValues << ": not found this particle name!" << G4endl;
       return;
     }
     G4VFlavoredParallelWorld* worldForThis;
@@ -261,8 +261,8 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
       currentScene -> AddRunDurationModel
 	(new G4FlavoredParallelWorldModel (worldForThis));
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
-	     << endl;
+	     << G4endl;
     }
-    else G4cout << "There are no ghosts for "<<newValues<<endl;
+    else G4cout << "There are no ghosts for "<<newValues<<G4endl;
   }
 }
diff --git a/source/visualization/management/src/G4VisManMessExpert.cc b/source/visualization/management/src/G4VisManMessExpert.cc
index 17ecb3859f..7124b7bb52 100644
--- a/source/visualization/management/src/G4VisManMessExpert.cc
+++ b/source/visualization/management/src/G4VisManMessExpert.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessExpert.cc,v 1.3.8.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessExpert.cc,v 1.4 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -201,7 +201,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
     if (ViewValid ()) {
       G4double x, y, z, worldSize;
       const char* aString = newValues;
-      istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
+      G4std::istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
       G4Circle circle = G4Circle(G4Point3D(x,y,z));
       circle.SetWorldSize (worldSize);
       G4Colour c(0.0, 1.0, 1.0 );
@@ -217,7 +217,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
       G4double x0, y0, z0;
       G4double x1, y1, z1;
       const char* aString = newValues;
-      istrstream is((char*) aString); is >> x0 >> y0 >> z0 >> x1 >> y1 >> z1 ;
+      G4std::istrstream is((char*) aString); is >> x0 >> y0 >> z0 >> x1 >> y1 >> z1 ;
 
       G4Polyline line;
       G4Colour c(1.0, 0.0, 0.0);
@@ -242,7 +242,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
     if (ViewValid ()) {
       G4double x, y, z, worldSize;
       const char* aString = newValues;
-      istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
+      G4std::istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
 
        // Draw squares
       xx = x ; yy = y; zz = z ;
@@ -331,7 +331,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
     if (ViewValid ()) {
       int nPolyMarkers, type;
       const char* aString = newValues;
-      istrstream is((char*) aString) ;is >> nPolyMarkers >> type;
+      G4std::istrstream is((char*) aString) ;is >> nPolyMarkers >> type;
       G4Polymarker::MarkerType realType;
       switch (type) {
       default:
@@ -388,7 +388,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
     if (ViewValid ()) {
       int nSpirals;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> nSpirals;
+      G4std::istrstream is((char*) aString) ; is >> nSpirals;
       G4int i;
       G4double a, fa, z, dz, t, dt = M_PI / 50.;
       G4Polyline line;
@@ -419,7 +419,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
     if (ViewValid ()) {
       G4double x, y, z, worldSize;
       const char* aString = newValues;
-      istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
+      G4std::istrstream is((char*) aString); is >> x >> y >> z >> worldSize;
       G4Square Square = G4Square (G4Point3D (x, y, z));
       // Set attributes - begin snippet.
       Square.SetWorldSize (worldSize);
diff --git a/source/visualization/management/src/G4VisManMessLights.cc b/source/visualization/management/src/G4VisManMessLights.cc
index 41f8672e00..3c9de91d94 100644
--- a/source/visualization/management/src/G4VisManMessLights.cc
+++ b/source/visualization/management/src/G4VisManMessLights.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessLights.cc,v 1.3.8.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessLights.cc,v 1.4 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -54,7 +54,7 @@ void G4VisManMessenger::DoCommandLights (const G4String& commandPath,
   if (commandPath == "/vis~/lights/direction") {
     G4double theta, phi ;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> theta >> phi;
+    G4std::istrstream is((char*) aString) ; is >> theta >> phi;
     theta = theta * deg;
     phi   = phi   * deg;
     G4double x = sin (theta) * cos (phi);
@@ -64,7 +64,7 @@ void G4VisManMessenger::DoCommandLights (const G4String& commandPath,
     G4ViewParameters& viewParams = fpVMan -> SetCurrentViewParameters();
     viewParams.SetLightpointDirection (lightpointDirection);
     if (fpVMan -> GetVerboseLevel () > 0) {
-      G4cout << "Lightpoint direction set to " << lightpointDirection << endl;
+      G4cout << "Lightpoint direction set to " << lightpointDirection << G4endl;
       if (fpVMan -> GetVerboseLevel () > 1) {
 	fpVMan -> PrintCurrentView ();
       }
diff --git a/source/visualization/management/src/G4VisManMessSet.cc b/source/visualization/management/src/G4VisManMessSet.cc
index e2dfc0f3b1..ae65fd2bf5 100644
--- a/source/visualization/management/src/G4VisManMessSet.cc
+++ b/source/visualization/management/src/G4VisManMessSet.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessSet.cc,v 1.5.2.1 1999/12/07 20:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessSet.cc,v 1.6 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -203,19 +203,19 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
     G4String choice;
     G4double density;  // Units in this section are g / cm3 - WARNING!!!
     const char* t = newValues;
-    istrstream is ((char*)t); is >> choice >> density;
+    G4std::istrstream is ((char*)t); is >> choice >> density;
     G4int iSelector = -1;
     if (choice.compareTo ("off",G4String::ignoreCase) == 0) iSelector = 0;
     if (choice.compareTo ("on",G4String::ignoreCase) == 0) iSelector = 1;
     if (iSelector < 0) {
-      G4cout << "Choice not recognised (on/off)." << endl;
+      G4cout << "Choice not recognised (on/off)." << G4endl;
       const G4ViewParameters& getVP = fpVMan -> GetCurrentViewParameters ();
       G4cout << "Culling by density is currently: ";
       if (getVP.IsDensityCulling ()) G4cout << "on";
       else                             G4cout << "off";
       G4cout << "\nDensity cut is currently: "
 	   << getVP.GetVisibleDensity () * cm3 / g << " g/cm3.";
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       G4ViewParameters& setVP = fpVMan -> SetCurrentViewParameters ();
@@ -235,7 +235,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       else                             G4cout << "off";
       G4cout << "\nDensity cut is now: "
 	   << getVP.GetVisibleDensity () * cm3 / g << " g/cm3.";
-      G4cout << endl;
+      G4cout << G4endl;
       G4VViewer* pView = fpVMan -> GetCurrentViewer ();
       if (pView) {
 	// Copy current view parameters into current view.
@@ -243,7 +243,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -251,7 +251,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
   if (commandPath == "/vis~/set/drawing_style") {
     G4int iStyle;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> iStyle;
+    G4std::istrstream is((char*) aString) ; is >> iStyle;
     if (iStyle < 0 || iStyle > 3) {
       G4cout << "Available drawing styles:";
       G4cout << "\n  0) wireframe";
@@ -284,13 +284,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	  "\n/vis~/set/cull_invisible_objects on/off."
 	  "\nTo reset density culling, /vis~/set/cull_by_density off."
 	  "\nTo set density culling, e.g., /vis~/set/cull_by_density on 0.01."
-	     << endl;
+	     << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
       //}
       G4cout << "\nChoose by specifying integer parameter.";
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       G4ViewParameters& setVP = fpVMan -> SetCurrentViewParameters ();
@@ -335,7 +335,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	  "\n/vis~/set/cull_invisible_objects on/off."
 	  "\nTo reset density culling, /vis~/set/cull_by_density off."
 	  "\nTo set density culling, e.g., /vis~/set/cull_by_density on 0.01."
-	     << endl;
+	     << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -347,7 +347,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -355,7 +355,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
   if (commandPath == "/vis~/set/marker_choices") {
     G4int iChoice;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> iChoice;
+    G4std::istrstream is((char*) aString) ; is >> iChoice;
     if (iChoice < 0 || iChoice > 1) {
       G4cout << "Available marker choices:";
       G4cout << "\n  0) not hidden";
@@ -367,7 +367,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	G4cout << " hidden by surfaces.";
       //}
       G4cout << "\nChoose by specifying integer parameter.";
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       G4ViewParameters& setVP = fpVMan -> SetCurrentViewParameters ();
@@ -384,7 +384,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       //if (fpVMan -> GetVerboseLevel () > 0) {
 	G4cout << "Marker choice is now: ";
 	if (getVP.IsMarkerNotHidden ()) G4cout << "not";
-	G4cout << " hidden by surfaces." << endl;
+	G4cout << " hidden by surfaces." << G4endl;
       //}
       G4VViewer* pView = fpVMan -> GetCurrentViewer ();
       if (pView) {
@@ -393,7 +393,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -403,20 +403,20 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
     G4String choice, unit;
     G4double x, y, z, nx, ny, nz;
     const char* t = newValues;
-    istrstream is ((char*)t); is >> choice >> x >> y >> z >> unit
+    G4std::istrstream is ((char*)t); is >> choice >> x >> y >> z >> unit
 				  >> nx >> ny >> nz;
     G4int iSelector = -1;
     if (choice.compareTo ("off",G4String::ignoreCase) == 0) iSelector = 0;
     if (choice.compareTo ("on",G4String::ignoreCase) == 0) iSelector = 1;
     if (iSelector < 0) {
-      G4cout << "Choice not recognised (on/off)." << endl;
+      G4cout << "Choice not recognised (on/off)." << G4endl;
       const G4ViewParameters& getVP = fpVMan -> GetCurrentViewParameters ();
       G4cout << "Section drawing is currently: ";
       if (getVP.IsSection ()) G4cout << "on";
       else                    G4cout << "off";
       G4cout << "\nSection plane is currently: "
 	   << getVP.GetSectionPlane ();
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       G4ViewParameters& setVP = fpVMan -> SetCurrentViewParameters ();
@@ -440,7 +440,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       else                    G4cout << "off";
       G4cout << "\nSection plane is now: "
 	   << getVP.GetSectionPlane ();
-      G4cout << endl;
+      G4cout << G4endl;
       G4VViewer* pView = fpVMan -> GetCurrentViewer ();
       if (pView) {
 	// Copy current view parameters into current view.
@@ -448,7 +448,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -456,9 +456,9 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
   if (commandPath == "/vis~/set/sides") {
     G4int nSides;
     const char* t = newValues;
-    istrstream is ((char*)t); is >> nSides;
+    G4std::istrstream is ((char*)t); is >> nSides;
     G4cout << "Number of sides per circle in polygon approximation is "
-	 << nSides << endl;
+	 << nSides << G4endl;
     fpVMan -> SetCurrentViewParameters ().SetNoOfSides (nSides);
   }
 
@@ -466,13 +466,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
   if (commandPath == "/vis~/set/rep_style") {
     G4int iStyle;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> iStyle;
+    G4std::istrstream is((char*) aString) ; is >> iStyle;
     if (iStyle < 0 || iStyle > 1) {
       G4cout << "Available representation styles:";
       G4cout << "\n  0) polyhedron";
       G4cout << "\n  1) NURBS";
       G4cout << "\nChoose by specifying integer parameter.";
-      G4cout << endl;
+      G4cout << G4endl;
     }
     else {
       G4ViewParameters::RepStyle repStyle;
@@ -483,7 +483,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       }
       fpVMan -> SetCurrentViewParameters ().SetRepStyle (repStyle);
       if (fpVMan -> GetVerboseLevel () > 0) {
-	G4cout << "Representation style changed to " << repStyle << endl;
+	G4cout << "Representation style changed to " << repStyle << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -495,7 +495,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	// Recalculate projection matrices, etc.
 	pView -> SetView ();
       }
-      G4cout << "Issue Draw or refresh to see effect." << endl;
+      G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
   }
 
@@ -505,7 +505,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
     static G4int nOptions = 2;
     G4int iSelector;
     const char* aString = newValues;
-    istrstream is((char*) aString) ; is >> iSelector;
+    G4std::istrstream is((char*) aString) ; is >> iSelector;
     switch (iState) {
     case 0:
       if (iSelector < 0 || iSelector > nOptions) {
@@ -513,18 +513,18 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	G4cout << "\n  0) reset selection algorithm";
 	G4cout << "\n  1) select physical volume";
 	G4cout << "\nChoose by specifying integer parameter.";
-	G4cout << endl;
+	G4cout << G4endl;
       }
       else {
 	switch (iSelector) {
 	default:
 	case 0:
-	  G4cout << "Resetting from state " << iState << endl;
+	  G4cout << "Resetting from state " << iState << G4endl;
 	  iState = 0; nOptions = 2;
 	  break;
 	case 1:
 	  G4cout << "Option " << iSelector
-	       << " selected from state " << iState << endl;
+	       << " selected from state " << iState << G4endl;
 	  iState = 1; nOptions = 1;
 	  break;
 	}
@@ -535,13 +535,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	G4cout << "Available options:";
 	G4cout << "\n  0) reset selection algorithm";
 	G4cout << "\nChoose by specifying integer parameter.";
-	G4cout << endl;
+	G4cout << G4endl;
       }
       else {
 	switch (iSelector) {
 	default:
 	case 0:
-	  G4cout << "Resetting from state " << iState << endl;
+	  G4cout << "Resetting from state " << iState << G4endl;
 	  iState = 0; nOptions = 2;
 	  break;
 	}
@@ -549,16 +549,16 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       break;
     }
     /****************************************************
-    cin.tie (&G4cout);  // Tie streams together so output is
+    G4cin.tie (&G4cout);  // Tie streams together so output is
                       // flushed before any input.
-    G4cout << "Temporary algorithm..." << endl;
+    G4cout << "Temporary algorithm..." << G4endl;
 
     G4VPhysicalVolume* pVPV =
       fpVMan -> GetCurrentScene ().GetPhysicalVolume ();
     G4VPhysicalVolume* pNewVPV = 0;
 
     if (pVPV) {
-      G4cout << "Current volume is " << pVPV -> GetName () << endl;
+      G4cout << "Current volume is " << pVPV -> GetName () << G4endl;
 
       G4VPhysicalVolume* pMother = pVPV -> GetMother ();
       if (pMother) {
@@ -566,8 +566,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	do {
 	  G4cout << "Its mother is " << pMother -> GetName ()
 	       << ".  Select? [y/n]: ";
-	  c = cin.get ();
-	  if (c != '\n') while (cin.get () != '\n');  // Read on to newline.
+	  c = G4cin.get ();
+	  if (c != '\n') while (G4cin.get () != '\n');  // Read on to newline.
 	} while (c != 'y' && c != 'Y' && 
 		 c != 'n' && c != 'N');
 	if (c == 'y' || c == 'Y') {
@@ -582,8 +582,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	  do {
 	    G4cout << "It has " << nDaughters << " daughters.  Select [0-"
 		 << nDaughters - 1 << "] (<0 to abandon): ";
-	    cin >> iDaughter;
-	    while (cin.get () != '\n');  // Read on to newline.
+	    G4cin >> iDaughter;
+	    while (G4cin.get () != '\n');  // Read on to newline.
 	  } while (iDaughter >= nDaughters);
 	  if (iDaughter >= 0) {
 	    G4VPhysicalVolume* pDaughter =
@@ -601,12 +601,12 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       }
       else {
 	if (fpVMan -> GetVerboseLevel () > 0) {
-	  G4cout << "Nothing selected; nothing changed." << endl;
+	  G4cout << "Nothing selected; nothing changed." << G4endl;
 	}
       }
     }
     else {
-      G4cerr << "No physical volume available." << endl;
+      G4cerr << "No physical volume available." << G4endl;
     }
     if (fpVMan -> GetVerboseLevel () > 1) {
       fpVMan -> PrintCurrentScene ();
@@ -618,13 +618,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
   if (commandPath == "/vis~/set/verbose") {
     G4int vLevel;
     const char* t = newValues;
-    istrstream is ((char*)t); is >> vLevel;
+    G4std::istrstream is ((char*)t); is >> vLevel;
     if (vLevel < 0 ) {
-      G4cout << "Verbosity is " << fpVMan -> GetVerboseLevel () << endl;
+      G4cout << "Verbosity is " << fpVMan -> GetVerboseLevel () << G4endl;
     }
     else {
       fpVMan -> SetVerboseLevel (vLevel);
-      G4cout << "Verbosity set to " << fpVMan -> GetVerboseLevel () << endl;
+      G4cout << "Verbosity set to " << fpVMan -> GetVerboseLevel () << G4endl;
     }
   }
 
@@ -645,13 +645,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       }
     }
     if (nViewTotal == 0) {
-      G4cerr << "No views to select." << endl;
+      G4cerr << "No views to select." << G4endl;
     }
     else {
       // Select view and make it current.
       G4int iSelect;
       const char* aString = newValues;
-      istrstream is((char*) aString) ; is >> iSelect;
+      G4std::istrstream is((char*) aString) ; is >> iSelect;
       if (iSelect < 0 || iSelect >= nViewTotal) {
 	G4cout << "Available views:";
 	for (int iView = 0; iView < nViewTotal; iView++) {
@@ -661,13 +661,13 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	  G4cout << "\n  " << iView << ") " << pView -> GetName ();
 	}
 	G4cout << "\nChoose by specifying integer parameter.";
-	G4cout << endl;
+	G4cout << G4endl;
       }
       else {
 	G4VViewer* pView = vList[iSelect];
 	fpVMan -> SetCurrentViewer (pView);
 	if (fpVMan -> GetVerboseLevel () > 0) {
-	  G4cout << "Current view now " << pView -> GetName () << endl;
+	  G4cout << "Current view now " << pView -> GetName () << G4endl;
 	  if (fpVMan -> GetVerboseLevel () > 1) {
 	    fpVMan -> PrintCurrentView ();
 	  }
diff --git a/source/visualization/management/src/G4VisManMessenger.cc b/source/visualization/management/src/G4VisManMessenger.cc
index 2026e017d4..93b397b76d 100644
--- a/source/visualization/management/src/G4VisManMessenger.cc
+++ b/source/visualization/management/src/G4VisManMessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManMessenger.cc,v 1.2.8.1 1999/12/07 20:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManMessenger.cc,v 1.3 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -113,7 +113,7 @@ G4bool G4VisManMessenger::ViewValid () {
     return true;
   }
   else {
-    G4cerr << "Invalid view (have you selected a graphics system?)" << endl;
+    G4cerr << "Invalid view (have you selected a graphics system?)" << G4endl;
     return false;
   }
 }
diff --git a/source/visualization/management/src/G4VisManager.cc b/source/visualization/management/src/G4VisManager.cc
index 9be5194b24..e540de310a 100644
--- a/source/visualization/management/src/G4VisManager.cc
+++ b/source/visualization/management/src/G4VisManager.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManager.cc,v 1.12.2.1 1999/12/07 20:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManager.cc,v 1.13 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // GEANT4 Visualization Manager - John Allison 02/Jan/1996.
@@ -63,7 +63,7 @@ G4VisManager::G4VisManager ():
     fpStateDependent = new G4VisStateDependent (this);
     // No need to delete this; G4StateManager does this.
 
-    G4cout << "Constructing Visualization Manager...." << endl;
+    G4cout << "Constructing Visualization Manager...." << G4endl;
     // Note: You might think that we could register graphics systems
     // and messengers here but we have to give the subclass time to
     // instantiate.  So the user has to invoke Initialise().
@@ -75,8 +75,8 @@ G4VisManager::~G4VisManager () {
   fSceneList.clearAndDestroy ();    
   fAvailableSceneHandlers.clearAndDestroy ();    
   fAvailableGraphicsSystems.clearAndDestroy ();
-  G4cout << "Graphics systems deleted." << endl;
-  G4cout << "VisManager deleting." << endl;
+  G4cout << "Graphics systems deleted." << G4endl;
+  G4cout << "VisManager deleting." << G4endl;
   fMessengerList.clearAndDestroy ();
   delete fpMessenger;
 }
@@ -91,7 +91,7 @@ G4VisManager* G4VisManager::GetInstance () {
 
 void G4VisManager::Initialise () {
 
-  G4cout << "Initialising Visualization Manager...." << endl;
+  G4cout << "Initialising Visualization Manager...." << G4endl;
 
   if (fVerbose > 0) {
     PrintAllGraphicsSystems ();
@@ -132,10 +132,10 @@ void G4VisManager::Initialise () {
       "\n    G4VisManager* visManager = new MyVisManager;"
       "\n    visManager -> Initialize ();"
       "\n  (Don't forget to delete visManager;)"
-	 << endl;
+	 << G4endl;
   }
    
-  G4cout << "Registering graphics systems...." << endl;
+  G4cout << "Registering graphics systems...." << G4endl;
 
   RegisterGraphicsSystems ();
 
@@ -162,7 +162,7 @@ const G4GraphicsSystemList& G4VisManager::GetAvailableGraphicsSystems () {
       "\n  3) You can register your own graphics system, e.g.,"
       "\n     G4VisManager::GetInstance () ->"
       "\n       RegisterGraphicsSystem (new MyGraphicsSystem);)"
-	 << endl;
+	 << G4endl;
   }
   return fAvailableGraphicsSystems;
 }
@@ -177,7 +177,7 @@ G4bool G4VisManager::RegisterGraphicsSystem (G4VGraphicsSystem* pSystem) {
     if (pSystem -> GetNickname () != "") {
       G4cout << " (" << pSystem -> GetNickname () << ")";
     }
-    G4cout << endl;
+    G4cout << G4endl;
     return false;
   }
   else {
@@ -188,7 +188,7 @@ G4bool G4VisManager::RegisterGraphicsSystem (G4VGraphicsSystem* pSystem) {
       if (pSystem -> GetNickname () != "") {
 	G4cout << " (" << pSystem -> GetNickname () << ")";
       }
-      G4cout << " registered." << endl;
+      G4cout << " registered." << G4endl;
     }
     return true;
   }
@@ -439,7 +439,7 @@ void G4VisManager::CreateSceneHandler (G4String name) {
       G4cout << "Error in G4VisManager::CreateSceneHandler during "
 	   << fpGraphicsSystem -> GetName ()
 	   << " scene creation."
-	   << endl;
+	   << G4endl;
       fpSceneHandler = 0;
       fpViewer  = 0;
       // Make it impossible for user action code to Draw.
@@ -486,7 +486,7 @@ void G4VisManager::CreateViewer (G4String name) {
       }
       if (warnings) {
 	G4cout << "\n  Also see other \"/vis~/set\" commands."
-	     << endl;
+	     << G4endl;
       }
 
     }
@@ -537,7 +537,7 @@ void G4VisManager::DeleteCurrentSceneHandler () {
       "\n  to select a scene handler and /vis/viewer/select to select"
       "\n  a viewer, or maybe you will have to create some.";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VisManager::DeleteCurrentViewer () {
@@ -569,18 +569,18 @@ void G4VisManager::DeleteCurrentViewer () {
       "\n  and /vis/viewer/select to select a viewer, or maybe you will"
       "\n  have to create some.";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VisManager::GeometryHasChanged () {
-  G4cout << "G4VisManager::GeometryHasChanged() called." << endl;
+  G4cout << "G4VisManager::GeometryHasChanged() called." << G4endl;
 
   // Change the world...
   G4VPhysicalVolume* pWorld =
     G4TransportationManager::GetTransportationManager ()
     -> GetNavigatorForTracking () -> GetWorldVolume ();
   if (!pWorld) {
-    G4cout << "  The world has ended!!!  (Is this serious?)" << endl;
+    G4cout << "  The world has ended!!!  (Is this serious?)" << G4endl;
   }
 
   // Check scenes.
@@ -604,7 +604,7 @@ void G4VisManager::GeometryHasChanged () {
 		 <<
 	    "\" is no longer valid - being removed\n  from scene \""
 		 << pScene -> GetName () << "\""
-		 << endl;
+		 << G4endl;
 	  modelList.removeAt (iModel);
 	    break;
 	}
@@ -616,7 +616,7 @@ void G4VisManager::GeometryHasChanged () {
       G4cout << "  No models left in this scene \""
 	     << pScene -> GetName ()
 	     << "\"."
-	     << endl;
+	     << G4endl;
     }
   }
 
@@ -625,7 +625,7 @@ void G4VisManager::GeometryHasChanged () {
     G4cout << "  The current scene \""
 	   << fpScene -> GetName ()
 	   << "\" has no models left."
-	   << endl;
+	   << G4endl;
 	}
 }
 
@@ -641,7 +641,7 @@ void G4VisManager::SetCurrentGraphicsSystemAndCreateViewer
     fSceneList.append (fpScene);
     G4cout << "G4VisManager::SetCurrentGraphicsSystemAndCreateViewer:"
       "\n  Empty scene \"scene-vis~\" created."
-	   << endl;
+	   << G4endl;
   }
   CreateSceneHandler ();
   CreateViewer ();
@@ -683,7 +683,7 @@ void G4VisManager::SetCurrentGraphicsSystem (G4VGraphicsSystem* pSystem) {
     fpConcreteInstance = 0;
     }
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VisManager::SetCurrentSceneHandler (G4VSceneHandler* pSceneHandler) {
@@ -714,14 +714,14 @@ void G4VisManager::SetCurrentSceneHandler (G4VSceneHandler* pSceneHandler) {
     fpConcreteInstance = 0;
     G4cout << "\n  No viewers for this scene handler - please create one.";
   }
-  G4cout << endl; 
+  G4cout << G4endl; 
 }
 
 void G4VisManager::SetCurrentViewer (G4VViewer* pViewer) {
   fpViewer  = pViewer;
   G4cout << "G4VisManager::SetCurrentViewer: viewer now "
 	 << pViewer -> GetName ()
-	 << endl;
+	 << G4endl;
   fpSceneHandler = fpViewer -> GetScene ();
   fpSceneHandler -> SetCurrentViewer (pViewer);
   fpGraphicsSystem = fpSceneHandler -> GetGraphicsSystem ();
@@ -732,7 +732,7 @@ void G4VisManager::PrintCurrentSystems () const {
   if (fpGraphicsSystem && fpSceneHandler && fpViewer) {
     G4int nSystems = fAvailableGraphicsSystems.entries ();
     if (nSystems <= 0) {
-      G4cout << "No graphics systems available yet." << endl;
+      G4cout << "No graphics systems available yet." << G4endl;
     }
     else {
       PrintAvailableGraphicsSystems ();
@@ -744,7 +744,7 @@ void G4VisManager::PrintCurrentSystems () const {
 void G4VisManager::PrintCurrentSystem () const {
   if (fpGraphicsSystem && fpSceneHandler && fpViewer) {
     G4cout << "Current graphics system is: " << *fpGraphicsSystem;
-    G4cout << endl;
+    G4cout << G4endl;
   }
   else PrintInvalidPointers ();
 }
@@ -753,7 +753,7 @@ void G4VisManager::PrintCurrentScene () const {
   if (fpGraphicsSystem && fpSceneHandler && fpViewer) {
     G4cout << "Current Scene is: " << fpSceneHandler -> GetName ();
     G4cout << '\n' << *fpSceneHandler;
-    G4cout << endl;
+    G4cout << G4endl;
   }
   else PrintInvalidPointers ();
 }
@@ -773,7 +773,7 @@ void G4VisManager::PrintCurrentView () const {
     }
     else {
       G4cout << " are same."
-	   << endl;
+	   << G4endl;
     }
   }
   else PrintInvalidPointers ();
@@ -799,7 +799,7 @@ void G4VisManager::PrintAllGraphicsSystems () const {
        << "\n\n  VRML1File (produces VRML 1 file locally    )"
        << "\n\n  VRML2     (produces VRML 2 file over network), in preparation"
        << "\n\n  VRML2File (produces VRML 2 file locally    ), in preparation"
-       << endl;
+       << G4endl;
 }
 
 void G4VisManager::PrintInstalledGraphicsSystems () const {
@@ -836,7 +836,7 @@ void G4VisManager::PrintInstalledGraphicsSystems () const {
        << "\n  VRML1File (produces VRML 1 file locally)"
        << "\n  VRML2File (produces VRML 2 file locally), in preparation"
 #endif
-       << endl;
+       << G4endl;
 }
 
 void G4VisManager::PrintAvailableGraphicsSystems () const {
@@ -854,7 +854,7 @@ void G4VisManager::PrintAvailableGraphicsSystems () const {
   else {
     G4cout << "\n  NONE!!!  None registered - yet!  Mmmmm!";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VisManager::PrintInvalidPointers () const {
@@ -869,7 +869,7 @@ void G4VisManager::PrintInvalidPointers () const {
     if (!fpSceneHandler) G4cout << "\nNull scene handler pointer. ";
     if (!fpViewer ) G4cout << "\nNull viewer pointer. ";
   }
-  G4cout << endl;
+  G4cout << G4endl;
 }
 
 void G4VisManager::RefreshCurrentView  () {  // Soft clear, then redraw.
@@ -911,7 +911,7 @@ G4bool G4VisManager::IsValidView () {
   if ((!fpScene) || (!fpSceneHandler) || (!fpViewer)) {
     G4cout << "G4VisManager::IsValidView ():"
       "\n  Current view is not valid.";
-    G4cout << endl;
+    G4cout << G4endl;
     PrintInvalidPointers ();
     return false;
   }
@@ -937,14 +937,14 @@ G4bool G4VisManager::IsValidView () {
 	"\n  (b) create a new scene handler with "
 	"\n      /vis/sceneHandler/create <graphics-system>,"
 	"\n      in which case it should pick up the the new scene."
-	     << endl;
+	     << G4endl;
     }
     else {
       G4cout << "\n  Scene handler \""
 	     << fpSceneHandler -> GetName ()
 	     << "\" has null scene pointer."
 	"\n  Attach a scene with /vis/sceneHandler/attach [<scene-name>]"
-	     << endl;
+	     << G4endl;
     }
     return false;
   }
@@ -954,7 +954,7 @@ G4bool G4VisManager::IsValidView () {
     G4cout << "G4VisManager::IsValidView (): the current scene handler\n  \""
 	   << fpSceneHandler -> GetName ()
 	   << "\" has no viewers.  Do /vis/viewer/create."
-	   << endl;
+	   << G4endl;
     return false;
   }
 
@@ -968,7 +968,7 @@ G4bool G4VisManager::IsValidView () {
 	"\n  Attempt at some drawing operation when scene is empty."
 	"\n  Maybe the geometry has not yet been defined."
 	"  Try /run/initialize."
-	     << endl;
+	     << G4endl;
       isValid = false;
       fpConcreteInstance = 0;  // Users must not use!
     }
@@ -977,7 +977,7 @@ G4bool G4VisManager::IsValidView () {
       G4cout <<
 	"G4VisManager: the scene was empty, \"world\" has been added"
 	"\n  and the view parameters have been reset.";
-      G4cout << endl;
+      G4cout << G4endl;
     }
   }
   return isValid;
diff --git a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
index c0bbc87f96..d0d31bef77 100644
--- a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
+++ b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManagerRegisterMessengers.cc,v 1.8.4.1 1999/12/07 20:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisManagerRegisterMessengers.cc,v 1.11 2000/01/11 17:22:32 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // G4VisManager::RegisterMessengers - John Allison 30/July/1998.
@@ -106,13 +106,15 @@ clicks, spawn other windows, change viewpoint, etc.).
 /vis/viewer/create [<scene-handler>] [<viewer-name>]
 /vis/viewer/list
 /vis/viewer/select [<viewer-name>]
+/vis/viewer/refresh [<viewer-name>]
 /vis/viewer/remove <viewer-name>
 * /vis/viewer/set/style wireframe|surface|logical
 * /vis/viewer/set/viewpoint
 * /vis/viewer/set/notifyOption immediate|delayed
 * /vis/viewer/notifyHandler
 * /vis/viewer/clone
-/vis/viewer/update [<viewer-name>]
+/vis/viewer/show [<viewer-name>]
+/vis/viewer/update - synonym for /vis/viewer/show.
 
 
 Global Commands
@@ -141,7 +143,7 @@ would be
 
 /vis/scene/add/volume $1
 /vis/scene/notifyHandlers
-/vis/viewer/update
+/vis/viewer/show
 
 or some such.
 
@@ -204,9 +206,10 @@ or some such.
   command -> SetGuidance ("Operations on Geant4 viewers.");
   fMessengerList.append (new G4VisCommandViewerCreate);
   fMessengerList.append (new G4VisCommandViewerList);
-  fMessengerList.append (new G4VisCommandViewerSelect);
+  fMessengerList.append (new G4VisCommandViewerRefresh);
   fMessengerList.append (new G4VisCommandViewerRemove);
-  fMessengerList.append (new G4VisCommandViewerUpdate);
+  fMessengerList.append (new G4VisCommandViewerSelect);
+  fMessengerList.append (new G4VisCommandViewerShow);
 
   // Camera - OLD STYLE!!
   fMessengerList.append
diff --git a/source/visualization/management/src/G4VisStateDependent.cc b/source/visualization/management/src/G4VisStateDependent.cc
index 8c944a5920..22e1d97500 100644
--- a/source/visualization/management/src/G4VisStateDependent.cc
+++ b/source/visualization/management/src/G4VisStateDependent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisStateDependent.cc,v 1.1.2.1 1999/12/07 20:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisStateDependent.cc,v 1.2 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 #include "G4VisStateDependent.hh"
 
diff --git a/source/visualization/management/src/G4VisToOldVisCommands.cc b/source/visualization/management/src/G4VisToOldVisCommands.cc
index fc7b146287..f520d84ebd 100644
--- a/source/visualization/management/src/G4VisToOldVisCommands.cc
+++ b/source/visualization/management/src/G4VisToOldVisCommands.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisToOldVisCommands.cc,v 1.3.8.1 1999/12/07 20:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VisToOldVisCommands.cc,v 1.4 1999/12/15 14:54:27 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
@@ -29,16 +29,16 @@ G4VisToOldVisCommands::G4VisToOldVisCommands () {
     G4String subTreeName = subTree -> GetPathName ();
     G4String newDirectoryName = subTreeName.replace (0, 6, "/vis/");
     newDirectoryName = newDirectoryName (0, newDirectoryName.last ('/') + 1);
-    // G4cout << "NewDirectoryName: " << newDirectoryName << endl;
+    // G4cout << "NewDirectoryName: " << newDirectoryName << G4endl;
     new G4UIdirectory (newDirectoryName);
     G4int nCommands = subTree -> GetCommandEntry ();
     int j;
     for (j = 1; j <= nCommands; j++) {
       G4UIcommand* command = subTree -> GetCommand (j);
       G4String commandPath = command -> GetCommandPath ();
-      // G4cout << "SubCommandPath:   " << commandPath << endl;
+      // G4cout << "SubCommandPath:   " << commandPath << G4endl;
       G4String newCommandPath = commandPath.replace (0, 6, "/vis/");
-      // G4cout << "NewSubCommandPath: " << newCommandPath << endl;
+      // G4cout << "NewSubCommandPath: " << newCommandPath << G4endl;
       G4UIcommand* newCommand = new G4UIcommand (newCommandPath, this);
       newCommand -> SetRange (command -> GetRange ());
       G4int nGuidances = command -> GetGuidanceEntries ();
@@ -69,7 +69,7 @@ void G4VisToOldVisCommands::SetNewValue
       "\n  sub-detector components.  (The command is still available"
       "\n  as \"/vis~/create_view/new_graphics_system " << newValues <<
       "\".)"
-	   << endl;
+	   << G4endl;
   }
   else {
     G4String oldCommandPath = commandPath.replace (0, 5, "/vis~/");
diff --git a/source/visualization/modeling/include/G4BoundingSphereScene.hh b/source/visualization/modeling/include/G4BoundingSphereScene.hh
index 492ec6f928..812a0f718d 100644
--- a/source/visualization/modeling/include/G4BoundingSphereScene.hh
+++ b/source/visualization/modeling/include/G4BoundingSphereScene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BoundingSphereScene.hh,v 1.5.6.1 1999/12/07 20:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BoundingSphereScene.hh,v 1.6 1999/12/15 14:54:28 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  7th June 1997
diff --git a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
index e67748e523..b09a457941 100644
--- a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
+++ b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FlavoredParallelWorldModel.hh,v 1.4.2.1 1999/12/07 20:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FlavoredParallelWorldModel.hh,v 1.5 1999/12/15 14:54:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.
 //
diff --git a/source/visualization/modeling/include/G4HitsModel.hh b/source/visualization/modeling/include/G4HitsModel.hh
index 42beb1eef0..6069564fb9 100644
--- a/source/visualization/modeling/include/G4HitsModel.hh
+++ b/source/visualization/modeling/include/G4HitsModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HitsModel.hh,v 1.3.2.1 1999/12/07 20:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HitsModel.hh,v 1.4 1999/12/15 14:54:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4HitsModel.icc b/source/visualization/modeling/include/G4HitsModel.icc
index 70c5561e85..7a3a105f09 100644
--- a/source/visualization/modeling/include/G4HitsModel.icc
+++ b/source/visualization/modeling/include/G4HitsModel.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HitsModel.icc,v 1.3.8.1 1999/12/07 20:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HitsModel.icc,v 1.4 1999/12/15 14:54:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 inline G4String G4HitsModel::GetCurrentTag () const {
   return fGlobalTag;
diff --git a/source/visualization/modeling/include/G4LogicalVolumeModel.hh b/source/visualization/modeling/include/G4LogicalVolumeModel.hh
index fc6f6df8f6..cd075fdd9e 100644
--- a/source/visualization/modeling/include/G4LogicalVolumeModel.hh
+++ b/source/visualization/modeling/include/G4LogicalVolumeModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolumeModel.hh,v 1.2.2.1 1999/12/07 20:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolumeModel.hh,v 1.3 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th July 1999.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.hh b/source/visualization/modeling/include/G4ModelingParameters.hh
index 5f8783d6a7..582e202b30 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.hh
+++ b/source/visualization/modeling/include/G4ModelingParameters.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ModelingParameters.hh,v 1.4.2.1 1999/12/07 20:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ModelingParameters.hh,v 1.5 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -29,7 +29,7 @@ class G4ModelingParameters {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4ModelingParameters&);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4ModelingParameters&);
 
   enum RepStyle {
     wireframe,  // Use G4Wireframe.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.icc b/source/visualization/modeling/include/G4ModelingParameters.icc
index 9c2a44a7ba..6d7d68e20a 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.icc
+++ b/source/visualization/modeling/include/G4ModelingParameters.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ModelingParameters.icc,v 1.2.8.1 1999/12/07 20:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ModelingParameters.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4NullModel.hh b/source/visualization/modeling/include/G4NullModel.hh
index 161596ef2e..ba3dfd095e 100644
--- a/source/visualization/modeling/include/G4NullModel.hh
+++ b/source/visualization/modeling/include/G4NullModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NullModel.hh,v 1.3.8.1 1999/12/07 20:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NullModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
index 5c594bf290..482a6cffcf 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
+++ b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeModel.hh,v 1.6.2.1 1999/12/07 20:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeModel.hh,v 1.8 2000/01/11 17:19:04 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -93,13 +93,14 @@ protected:
 			   const G4Transform3D&,
 			   G4VGraphicsScene&);
 
-  void DescribeSolids (const G4Transform3D& theAT,
-		       G4VSolid* pSol,
-		       const G4VisAttributes* pVisAttribs,
-		       G4VGraphicsScene& sceneHandler);
+  void DescribeSolid (const G4Transform3D& theAT,
+		      G4VSolid* pSol,
+		      const G4VisAttributes* pVisAttribs,
+		      G4VGraphicsScene& sceneHandler);
+
+  G4bool IsThisCulled (const G4LogicalVolume*,
+		       const G4Material*);
 
-  G4bool IsThisCulled     (const G4LogicalVolume*,
-			   const G4Material*);
   G4bool IsDaughterCulled (const G4LogicalVolume* pMotherLV);
 
   /////////////////////////////////////////////////////////
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
index 0037c24206..b89e652f44 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeSearchScene.hh,v 1.5.6.1 1999/12/07 20:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeSearchScene.hh,v 1.6 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
index b980e87ec4..d3c48688aa 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeSearchScene.icc,v 1.2.8.1 1999/12/07 20:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeSearchScene.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.hh b/source/visualization/modeling/include/G4TrajectoriesModel.hh
index ac0d0ac607..d0a75d27f3 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.hh
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoriesModel.hh,v 1.3.2.1 1999/12/07 20:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoriesModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.icc b/source/visualization/modeling/include/G4TrajectoriesModel.icc
index aacc1ce98f..1e4e3237c4 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.icc
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoriesModel.icc,v 1.3.8.1 1999/12/07 20:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoriesModel.icc,v 1.4 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 
 inline G4String G4TrajectoriesModel::GetCurrentTag () const {
   return fGlobalTag;
diff --git a/source/visualization/modeling/include/G4VModel.hh b/source/visualization/modeling/include/G4VModel.hh
index c4d2c11842..8ec18ecbac 100644
--- a/source/visualization/modeling/include/G4VModel.hh
+++ b/source/visualization/modeling/include/G4VModel.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VModel.hh,v 1.4.2.1 1999/12/07 20:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VModel.hh,v 1.5 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -32,7 +32,7 @@ class G4VModel {
 
 public: // With description
 
-  friend ostream& operator << (ostream& os, const G4VModel&);
+  friend G4std::ostream& operator << (G4std::ostream& os, const G4VModel&);
 
   G4VModel
   (const G4Transform3D& modelTransformation = G4Transform3D::Identity,
diff --git a/source/visualization/modeling/include/G4VModel.icc b/source/visualization/modeling/include/G4VModel.icc
index ca335b8d07..3ff866e15a 100644
--- a/source/visualization/modeling/include/G4VModel.icc
+++ b/source/visualization/modeling/include/G4VModel.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VModel.icc,v 1.3.6.1 1999/12/07 20:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VModel.icc,v 1.4 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/src/G4BoundingSphereScene.cc b/source/visualization/modeling/src/G4BoundingSphereScene.cc
index 0f819671d5..75d9f39bdc 100644
--- a/source/visualization/modeling/src/G4BoundingSphereScene.cc
+++ b/source/visualization/modeling/src/G4BoundingSphereScene.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4BoundingSphereScene.cc,v 1.2.8.1 1999/12/07 20:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4BoundingSphereScene.cc,v 1.3 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  7th June 1997
@@ -38,7 +38,7 @@ void G4BoundingSphereScene::Accrue (const G4VSolid& solid) {
   AccrueBoundingSphere (thisCentre, thisRadius);
   /***********************************************
     G4cout << "G4BoundingSphereScene::Accrue: centre: " << fCentre
-           << ", radius: " << fRadius << endl;
+           << ", radius: " << fRadius << G4endl;
   ***********************************************/
 }
 
diff --git a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
index fcacb00482..19227db092 100644
--- a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
+++ b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FlavoredParallelWorldModel.cc,v 1.3.8.1 1999/12/07 20:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4FlavoredParallelWorldModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.
 // Model for flavored parallel world volumes.
diff --git a/source/visualization/modeling/src/G4HitsModel.cc b/source/visualization/modeling/src/G4HitsModel.cc
index 6901b7ce0b..08249aef9a 100644
--- a/source/visualization/modeling/src/G4HitsModel.cc
+++ b/source/visualization/modeling/src/G4HitsModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HitsModel.cc,v 1.3.8.1 1999/12/07 20:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4HitsModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4LogicalVolumeModel.cc b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
index ea3994a4dc..3dca16de14 100644
--- a/source/visualization/modeling/src/G4LogicalVolumeModel.cc
+++ b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LogicalVolumeModel.cc,v 1.1.6.1 1999/12/07 20:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4LogicalVolumeModel.cc,v 1.4 2000/01/17 10:34:48 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th July 1999.
@@ -18,7 +18,7 @@
 #include "G4PVPlacement.hh"
 #include "G4ModelingParameters.hh"
 #include "G4VGraphicsScene.hh"
-////////////////#include "G4DrawVoxels.hh"
+#include "G4DrawVoxels.hh"
 
 G4LogicalVolumeModel::G4LogicalVolumeModel
 (G4LogicalVolume*            pLV,
@@ -63,23 +63,21 @@ void G4LogicalVolumeModel::DescribeYourselfTo
   G4ModelingParameters nonCulledMP (*fpMP);
   nonCulledMP.SetCulling (false);
   fpMP = &nonCulledMP;    
-
   G4PhysicalVolumeModel::DescribeYourselfTo (sceneHandler);
-
   fpMP = tpMP;
 
-  /*****************************
-  // Add Voxels.
-  G4DrawVoxels dv;
-  G4PlacedPolyhedronList* pPPL =
-    dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ());
-  for (int i = 0; i < pPPL -> entries (); i++) {
-    const G4Transform3D& transform = (*pPPL)[i].GetTransform ();
-    const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
-    sceneHandler.BeginPrimitives (transform);
-    sceneHandler.AddPrimitive (polyhedron);
-    sceneHandler.EndPrimitives ();
+  if (fpTopPV -> GetLogicalVolume () -> GetVoxelHeader ()) {
+    // Add Voxels.
+    G4DrawVoxels dv;
+    G4PlacedPolyhedronList* pPPL =
+      dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ());
+    for (int i = 0; i < pPPL -> entries (); i++) {
+      const G4Transform3D& transform = (*pPPL)[i].GetTransform ();
+      const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
+      sceneHandler.BeginPrimitives (transform);
+      sceneHandler.AddPrimitive (polyhedron);
+      sceneHandler.EndPrimitives ();
+    }
+    delete pPPL;
   }
-  delete pPPL;
-  *********************************/
 }
diff --git a/source/visualization/modeling/src/G4ModelingParameters.cc b/source/visualization/modeling/src/G4ModelingParameters.cc
index acabcad829..cd914017d5 100644
--- a/source/visualization/modeling/src/G4ModelingParameters.cc
+++ b/source/visualization/modeling/src/G4ModelingParameters.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ModelingParameters.cc,v 1.3.8.1 1999/12/07 20:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ModelingParameters.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -86,14 +86,14 @@ void G4ModelingParameters::SetVisibleDensity (G4double visibleDensity) {
   const G4double reasonableMaximum = 10.0 * g / cm3;
   if (visibleDensity < 0) {
     G4cout << "G4ModelingParameters::SetVisibleDensity: attempt to set negative "
-      "density - ignored." << endl;
+      "density - ignored." << G4endl;
   }
   else {
     if (fVisibleDensity > reasonableMaximum) {
       G4cout << "G4ModelingParameters::SetVisibleDensity: density > "
 	   << reasonableMaximum
 	   << " g / cm3 - did you mean this?"
-	   << endl;
+	   << G4endl;
     }
     fVisibleDensity = visibleDensity;
   }
@@ -105,7 +105,7 @@ void G4ModelingParameters::SetNoOfSides (G4int nSides) {
     nSides = nSidesMin;
     G4cout << "G4ModelingParameters::SetNoOfSides: attempt to set the"
       "\nnumber of sides per circle < " << nSidesMin
-	 << "; forced to" << nSides << endl;
+	 << "; forced to" << nSides << G4endl;
   }
   fNoOfSides = nSides;
 }
@@ -125,10 +125,10 @@ void G4ModelingParameters::PrintDifferences
       (fViewGeom              != that.fViewGeom)              ||
       (fViewHits              != that.fViewHits)              ||
       (fViewDigis             != that.fViewDigis))
-    G4cout << "Difference in 1st batch." << endl;
+    G4cout << "Difference in 1st batch." << G4endl;
 }
 
-ostream& operator << (ostream& os, const G4ModelingParameters& mp) {
+G4std::ostream& operator << (G4std::ostream& os, const G4ModelingParameters& mp) {
   os << "Modeling parameters and options:";
 
   os << "\n  Default vis. attributes: " << *mp.fpDefaultVisAttributes;
diff --git a/source/visualization/modeling/src/G4NullModel.cc b/source/visualization/modeling/src/G4NullModel.cc
index 0744617466..f057aabbd3 100644
--- a/source/visualization/modeling/src/G4NullModel.cc
+++ b/source/visualization/modeling/src/G4NullModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NullModel.cc,v 1.2.8.1 1999/12/07 20:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4NullModel.cc,v 1.3 1999/12/15 14:54:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
index 1ab1fec7cd..db98cf8cde 100644
--- a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
+++ b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeModel.cc,v 1.6.2.1 1999/12/07 20:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeModel.cc,v 1.8 2000/01/11 17:19:07 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -28,11 +28,7 @@
 #include "G4PhysicalVolumeSearchScene.hh"
 #include "G4TransportationManager.hh"
 
-#ifdef WIN32
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4PhysicalVolumeModel::G4PhysicalVolumeModel
 (G4VPhysicalVolume*          pVPV,
@@ -53,8 +49,8 @@ G4PhysicalVolumeModel::G4PhysicalVolumeModel
   fppCurrentLV   (0)
 {
   const int len = 8; char a [len];
-  ostrstream o (a, len); o.seekp (ios::beg);
-  o << fpTopPV -> GetCopyNo () << ends;
+  G4std::ostrstream o (a, len); o.seekp (G4std::ios::beg);
+  o << fpTopPV -> GetCopyNo () << G4std::ends;
   fGlobalTag = fpTopPV -> GetName () + "." + a;
   fGlobalDescription = "G4PhysicalVolumeModel " + fGlobalTag;
 
@@ -123,9 +119,9 @@ void G4PhysicalVolumeModel::DescribeYourselfTo
 
 G4String G4PhysicalVolumeModel::GetCurrentTag () const {
   const int len = 8; char a [len];
-  ostrstream o (a, len); o.seekp (ios::beg);
+  G4std::ostrstream o (a, len); o.seekp (G4std::ios::beg);
   if (fpCurrentPV) {
-    o << fpCurrentPV -> GetCopyNo () << ends;
+    o << fpCurrentPV -> GetCopyNo () << G4std::ends;
     return fpCurrentPV -> GetName () + "." + a;
   }
   else {
@@ -242,7 +238,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 	    "G4PhysicalVolumeModel::VisitGeometryAndGetVisReps: WARNING:"
 	    "\n  built-in replicated volumes replicated in radius are not yet"
 	    "\n  properly visualizable."
-	       << endl;
+	       << G4endl;
 	  break;
 	case kPhi:
 	  rotation.rotateZ (-(offset+n*width));
@@ -302,7 +298,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend
 	 << rotation.thetaZ() << ", "
 	 << rotation.phiZ();
   G4cout << "\n    Translation: " << theNewAT.getTranslation();
-  G4cout << endl;
+  G4cout << G4endl;
   **********************************************************/
 
   // Make decision to Draw.
@@ -310,7 +306,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend
   if (thisToBeDrawn) {
     const G4VisAttributes* pVisAttribs = pLV -> GetVisAttributes ();
     if (!pVisAttribs) pVisAttribs = fpMP -> GetDefaultVisAttributes ();
-    DescribeSolids (theNewAT, pSol, pVisAttribs, sceneHandler);
+    DescribeSolid (theNewAT, pSol, pVisAttribs, sceneHandler);
   }
 
   // First check if mother covers...
@@ -337,32 +333,36 @@ void G4PhysicalVolumeModel::DescribeAndDescend
   }
 }
 
-void G4PhysicalVolumeModel::DescribeSolids
+void G4PhysicalVolumeModel::DescribeSolid
 (const G4Transform3D& theAT,
  G4VSolid* pSol,
  const G4VisAttributes* pVisAttribs,
  G4VGraphicsScene& sceneHandler) {
   // Look for "constituents".  Could be a Boolean solid.
-  G4VSolid* pBoolSolA = pSol -> GetConstituentSolid (0);
-  if (pBoolSolA) {
-    // Boolean solid - display components...
-    DescribeSolids (theAT, pBoolSolA, pVisAttribs, sceneHandler);
-    G4VSolid* pBoolSolB = pSol -> GetConstituentSolid (1);
-    if (!pBoolSolB) {
+  G4VSolid* pSol0 = pSol -> GetConstituentSolid (0);
+  if (pSol0) {
+    // Composite solid - describe components...
+    DescribeSolid (theAT, pSol0, pVisAttribs, sceneHandler);
+    G4VSolid* pSol1 = pSol -> GetConstituentSolid (1);
+    if (!pSol1) {
       G4Exception
-	("G4PhysicalVolumeModel::DescribeSolids:"
+	("G4PhysicalVolumeModel::DescribeSolid:"
 	 " 2nd component solid is missing.");
     }
-    G4Transform3D theBT (theAT);
-    G4DisplacedSolid* pDisSol = pBoolSolB -> GetDisplacedSolidPtr ();
-    if (pDisSol) {
-      theBT = theBT * G4Transform3D (pDisSol -> GetObjectRotation ().inverse (),
-				     pDisSol -> GetObjectTranslation ());
-    }
-    DescribeSolids (theBT, pBoolSolB, pVisAttribs, sceneHandler);
+    DescribeSolid (theAT, pSol1, pVisAttribs, sceneHandler);
   }
-  else { // Non-boolean solid.
-    sceneHandler.PreAddThis (theAT, *pVisAttribs);
+  else { // Non-composite solid.
+    G4DisplacedSolid* pDisSol = pSol -> GetDisplacedSolidPtr ();
+    if (pDisSol) {
+      sceneHandler.PreAddThis
+	(theAT *
+	 G4Transform3D (pDisSol -> GetObjectRotation ().inverse (),
+			pDisSol -> GetObjectTranslation ()),
+	 *pVisAttribs);
+    }
+    else {
+      sceneHandler.PreAddThis (theAT, *pVisAttribs);
+    }
     pSol -> DescribeYourselfTo (sceneHandler);
     sceneHandler.PostAddThis ();
   }
@@ -431,7 +431,7 @@ G4bool G4PhysicalVolumeModel::Validate () {
     -> GetNavigatorForTracking () -> GetWorldVolume ();
   // The idea now is to seek a PV with the same name and copy no
   // in the hope it's the same one!!
-  G4cout << "G4PhysicalVolumeModel::Validate() called." << endl;
+  G4cout << "G4PhysicalVolumeModel::Validate() called." << G4endl;
   G4PhysicalVolumeSearchScene searchScene (fTopPVName, fTopPVCopyNo);
   G4PhysicalVolumeModel searchModel (world);
   searchModel.DescribeYourselfTo (searchScene);
@@ -442,7 +442,7 @@ G4bool G4PhysicalVolumeModel::Validate () {
 	   << ") still exists and is being used."
       "\n  Be warned that this does not necessarily guarantee it's the same"
       "\n  volume you originally specified in /vis/scene/add/."
-	   << endl;
+	   << G4endl;
     fpTopPV = foundVolume;
     return true;
   }
@@ -450,7 +450,7 @@ G4bool G4PhysicalVolumeModel::Validate () {
     G4cout << "  A volume of the same name and copy number (\""
 	   << fTopPVName << "\", copy " << fTopPVCopyNo
 	   << ") no longer exists."
-	   << endl;
+	   << G4endl;
     return false;
   }
 }
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
index a03ccaaad3..2d0d650f12 100644
--- a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
+++ b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicalVolumeSearchScene.cc,v 1.3.8.1 1999/12/07 20:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4PhysicalVolumeSearchScene.cc,v 1.4 1999/12/15 14:54:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  10th August 1998.
@@ -45,16 +45,16 @@ void G4PhysicalVolumeSearchScene::FindVolume (const G4VSolid& solid) {
 
   /**************************************************
   G4cout << "Required volume: \"" << fRequiredPhysicalVolumeName
-	 << "\", copy no. " << fRequiredCopyNo << endl;
+	 << "\", copy no. " << fRequiredCopyNo << G4endl;
   G4cout << "PhysicalVolume:  \"" << fpCurrentPV -> GetName ()
-	 << "\", copy no. " << fpCurrentPV -> GetCopyNo () << endl;
+	 << "\", copy no. " << fpCurrentPV -> GetCopyNo () << G4endl;
   *******************************************/
 
   if (fRequiredPhysicalVolumeName == "list") {
     for (G4int i = 0; i < fCurrentDepth; i++ ) G4cout << "  ";
     G4cout << "\"" << fpCurrentPV -> GetName ()
 	   << "\", copy no. " << fpCurrentPV -> GetCopyNo ()
-	   << endl;
+	   << G4endl;
     return;
   }
 
@@ -78,7 +78,7 @@ void G4PhysicalVolumeSearchScene::FindVolume (const G4VSolid& solid) {
 	  "\n  physical volumes which have different parentage.  Besides,"
 	  "\n  it's tricky to specify in general; we plan a GUI to do this."
 	  "\n  This function gives you access to the first occurrence only."
-	       << endl;
+	       << G4endl;
       }
     }
   }      
diff --git a/source/visualization/modeling/src/G4TrajectoriesModel.cc b/source/visualization/modeling/src/G4TrajectoriesModel.cc
index aa0683418b..a846a149d4 100644
--- a/source/visualization/modeling/src/G4TrajectoriesModel.cc
+++ b/source/visualization/modeling/src/G4TrajectoriesModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoriesModel.cc,v 1.5.8.1 1999/12/07 20:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4TrajectoriesModel.cc,v 1.6 1999/12/15 14:54:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4VModel.cc b/source/visualization/modeling/src/G4VModel.cc
index bcf17f85fe..889dcb96ec 100644
--- a/source/visualization/modeling/src/G4VModel.cc
+++ b/source/visualization/modeling/src/G4VModel.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VModel.cc,v 1.3.6.1 1999/12/07 20:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VModel.cc,v 1.4 1999/12/15 14:54:32 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -27,7 +27,7 @@ G4VModel::G4VModel (const G4Transform3D& modelTransformation,
 
 G4VModel::~G4VModel () {}
 
-ostream& operator << (ostream& os, const G4VModel& m) {
+G4std::ostream& operator << (G4std::ostream& os, const G4VModel& m) {
   os << m.fGlobalDescription;
   os << "\n  Modeling parameters:";
   if (m.fpMP) {